mirror of
https://github.com/rkd77/elinks.git
synced 2024-12-04 14:46:47 -05:00
Use all-l,install-l,clean-l targets in individual makefiles and let
Makefile.lib multiplex the real ones. That's so that the -recursive ones always come first.
This commit is contained in:
parent
953c772863
commit
fffc573769
2
Makefile
2
Makefile
@ -8,7 +8,7 @@ path_to_top = ..
|
|||||||
SUBDIRS = doc po src
|
SUBDIRS = doc po src
|
||||||
|
|
||||||
|
|
||||||
clean:
|
clean-l:
|
||||||
rm -rf features.log
|
rm -rf features.log
|
||||||
|
|
||||||
-include Makefile.lib
|
-include Makefile.lib
|
||||||
|
12
Makefile.lib
12
Makefile.lib
@ -59,7 +59,7 @@ endif
|
|||||||
$(call cmd,archive)
|
$(call cmd,archive)
|
||||||
|
|
||||||
ifdef $(OBJS)
|
ifdef $(OBJS)
|
||||||
clean:
|
clean-l:
|
||||||
rm -f $(OBJS) *.a
|
rm -f $(OBJS) *.a
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@ -73,9 +73,13 @@ all-recursive install-recursive clean-recursive:
|
|||||||
$(call ncmd,recmake) || exit 1; \
|
$(call ncmd,recmake) || exit 1; \
|
||||||
done
|
done
|
||||||
|
|
||||||
all: all-recursive
|
all: all-recursive all-l
|
||||||
install: install-recursive
|
install: install-recursive install-l
|
||||||
clean: clean-recursive
|
clean: clean-recursive clean-l
|
||||||
|
|
||||||
|
all-l:
|
||||||
|
install-l:
|
||||||
|
clean-l:
|
||||||
|
|
||||||
|
|
||||||
# vim:syntax=make
|
# vim:syntax=make
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
-include ../../../Makefile.config
|
-include ../../../Makefile.config
|
||||||
|
|
||||||
install:
|
install-l:
|
||||||
$(INSTALL_DATA) elinks.1 $(DESTDIR)$(mandir)/man1
|
$(INSTALL_DATA) elinks.1 $(DESTDIR)$(mandir)/man1
|
||||||
|
|
||||||
-include ../../../Makefile.lib
|
-include ../../../Makefile.lib
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
-include ../../../Makefile.config
|
-include ../../../Makefile.config
|
||||||
|
|
||||||
install:
|
install-l:
|
||||||
$(INSTALL_DATA) elinks.conf.5 $(DESTDIR)$(mandir)/man5
|
$(INSTALL_DATA) elinks.conf.5 $(DESTDIR)$(mandir)/man5
|
||||||
$(INSTALL_DATA) elinkskeys.5 $(DESTDIR)$(mandir)/man5
|
$(INSTALL_DATA) elinkskeys.5 $(DESTDIR)$(mandir)/man5
|
||||||
|
|
||||||
|
2
src/cache/Makefile
vendored
2
src/cache/Makefile
vendored
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
OBJS = cache.o dialogs.o
|
OBJS = cache.o dialogs.o
|
||||||
|
|
||||||
all: libcache.a
|
all-l: libcache.a
|
||||||
libcache.a: $(OBJS)
|
libcache.a: $(OBJS)
|
||||||
|
|
||||||
-include ../../Makefile.lib
|
-include ../../Makefile.lib
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
OBJS = cmdline.o conf.o dialogs.o home.o kbdbind.o options.o opttypes.o timer.o urlhist.o
|
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)
|
libconfig.a: $(OBJS)
|
||||||
|
|
||||||
-include ../../Makefile.lib
|
-include ../../Makefile.lib
|
||||||
|
@ -6,7 +6,7 @@ SUBDIRS = spidermonkey
|
|||||||
SM_OBJS = document.o form.o location.o navigator.o unibar.o window.o
|
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))
|
OBJS = ecmascript.o spidermonkey.o $(foreach obj,$(SM_OBJS),spidermonkey/$(obj))
|
||||||
|
|
||||||
all: libecmascript.a
|
all-l: libecmascript.a
|
||||||
libecmascript.a: $(OBJS)
|
libecmascript.a: $(OBJS)
|
||||||
|
|
||||||
-include ../../Makefile.lib
|
-include ../../Makefile.lib
|
||||||
|
@ -4,6 +4,6 @@ INCLUDES += $(SPIDERMONKEY_CFLAGS)
|
|||||||
# Do not forget to also add the .o to ../Makefile. Yes, it sucks.
|
# 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
|
OBJS = document.o form.o location.o navigator.o unibar.o window.o
|
||||||
|
|
||||||
all: $(OBJS)
|
all-l: $(OBJS)
|
||||||
|
|
||||||
-include ../../../Makefile.lib
|
-include ../../../Makefile.lib
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
OBJS = formhist.o dialogs.o
|
OBJS = formhist.o dialogs.o
|
||||||
|
|
||||||
all: libformhist.a
|
all-l: libformhist.a
|
||||||
libformhist.a: $(OBJS)
|
libformhist.a: $(OBJS)
|
||||||
|
|
||||||
-include ../../Makefile.lib
|
-include ../../Makefile.lib
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
OBJS = globhist.o dialogs.o
|
OBJS = globhist.o dialogs.o
|
||||||
|
|
||||||
all: libglobhist.a
|
all-l: libglobhist.a
|
||||||
libglobhist.a: $(OBJS)
|
libglobhist.a: $(OBJS)
|
||||||
|
|
||||||
-include ../../Makefile.lib
|
-include ../../Makefile.lib
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
OBJS = download.o history.o location.o session.o task.o
|
OBJS = download.o history.o location.o session.o task.o
|
||||||
|
|
||||||
all: libsession.a
|
all-l: libsession.a
|
||||||
libsession.a: $(OBJS)
|
libsession.a: $(OBJS)
|
||||||
|
|
||||||
-include ../../Makefile.lib
|
-include ../../Makefile.lib
|
||||||
|
Loading…
Reference in New Issue
Block a user