diff --git a/Makefile b/Makefile index 164fbfd5a..4ab954ecb 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ path_to_top = .. SUBDIRS = doc po src -clean: +clean-l: rm -rf features.log -include Makefile.lib diff --git a/Makefile.lib b/Makefile.lib index 94a3d0af5..aec1def47 100644 --- a/Makefile.lib +++ b/Makefile.lib @@ -59,7 +59,7 @@ endif $(call cmd,archive) ifdef $(OBJS) -clean: +clean-l: rm -f $(OBJS) *.a endif @@ -73,9 +73,13 @@ all-recursive install-recursive clean-recursive: $(call ncmd,recmake) || exit 1; \ done -all: all-recursive -install: install-recursive -clean: clean-recursive +all: all-recursive all-l +install: install-recursive install-l +clean: clean-recursive clean-l + +all-l: +install-l: +clean-l: # vim:syntax=make diff --git a/doc/man/man1/Makefile b/doc/man/man1/Makefile index 4fd2d13bf..0e4c9911e 100644 --- a/doc/man/man1/Makefile +++ b/doc/man/man1/Makefile @@ -1,6 +1,6 @@ -include ../../../Makefile.config -install: +install-l: $(INSTALL_DATA) elinks.1 $(DESTDIR)$(mandir)/man1 -include ../../../Makefile.lib diff --git a/doc/man/man5/Makefile b/doc/man/man5/Makefile index 776d21633..9cdc61e0f 100644 --- a/doc/man/man5/Makefile +++ b/doc/man/man5/Makefile @@ -1,6 +1,6 @@ -include ../../../Makefile.config -install: +install-l: $(INSTALL_DATA) elinks.conf.5 $(DESTDIR)$(mandir)/man5 $(INSTALL_DATA) elinkskeys.5 $(DESTDIR)$(mandir)/man5 diff --git a/src/cache/Makefile b/src/cache/Makefile index e70eebd0c..56a447563 100644 --- a/src/cache/Makefile +++ b/src/cache/Makefile @@ -2,7 +2,7 @@ OBJS = cache.o dialogs.o -all: libcache.a +all-l: libcache.a libcache.a: $(OBJS) -include ../../Makefile.lib diff --git a/src/config/Makefile b/src/config/Makefile index 55c9d35b6..d17e857ac 100644 --- a/src/config/Makefile +++ b/src/config/Makefile @@ -2,7 +2,7 @@ OBJS = cmdline.o conf.o dialogs.o home.o kbdbind.o options.o opttypes.o timer.o urlhist.o -all: libconfig.a +all-l: libconfig.a libconfig.a: $(OBJS) -include ../../Makefile.lib diff --git a/src/ecmascript/Makefile b/src/ecmascript/Makefile index 9e8e76008..85d2ced6b 100644 --- a/src/ecmascript/Makefile +++ b/src/ecmascript/Makefile @@ -6,7 +6,7 @@ SUBDIRS = spidermonkey SM_OBJS = document.o form.o location.o navigator.o unibar.o window.o OBJS = ecmascript.o spidermonkey.o $(foreach obj,$(SM_OBJS),spidermonkey/$(obj)) -all: libecmascript.a +all-l: libecmascript.a libecmascript.a: $(OBJS) -include ../../Makefile.lib diff --git a/src/ecmascript/spidermonkey/Makefile b/src/ecmascript/spidermonkey/Makefile index d337a7de0..9f97b98a6 100644 --- a/src/ecmascript/spidermonkey/Makefile +++ b/src/ecmascript/spidermonkey/Makefile @@ -4,6 +4,6 @@ INCLUDES += $(SPIDERMONKEY_CFLAGS) # Do not forget to also add the .o to ../Makefile. Yes, it sucks. OBJS = document.o form.o location.o navigator.o unibar.o window.o -all: $(OBJS) +all-l: $(OBJS) -include ../../../Makefile.lib diff --git a/src/formhist/Makefile b/src/formhist/Makefile index 280ab3170..bbbe29a96 100644 --- a/src/formhist/Makefile +++ b/src/formhist/Makefile @@ -2,7 +2,7 @@ OBJS = formhist.o dialogs.o -all: libformhist.a +all-l: libformhist.a libformhist.a: $(OBJS) -include ../../Makefile.lib diff --git a/src/globhist/Makefile b/src/globhist/Makefile index 1b208406e..cfdf18049 100644 --- a/src/globhist/Makefile +++ b/src/globhist/Makefile @@ -2,7 +2,7 @@ OBJS = globhist.o dialogs.o -all: libglobhist.a +all-l: libglobhist.a libglobhist.a: $(OBJS) -include ../../Makefile.lib diff --git a/src/session/Makefile b/src/session/Makefile index 3d06faf37..9d7475086 100644 --- a/src/session/Makefile +++ b/src/session/Makefile @@ -2,7 +2,7 @@ OBJS = download.o history.o location.o session.o task.o -all: libsession.a +all-l: libsession.a libsession.a: $(OBJS) -include ../../Makefile.lib