mirror of
https://github.com/rkd77/elinks.git
synced 2024-12-04 14:46:47 -05:00
Implicit recursiveness and clean rule
All objects defining $(OBJS) will get them and *.a deleted during make clean. The all, clean and install rules now implicitly imply their -recursive counterparts - those will just do nothing in case of $(SUBDIRS) not defined, so that's ok.
This commit is contained in:
parent
6aea3df7ac
commit
833770a5f7
6
Makefile
6
Makefile
@ -8,11 +8,7 @@ path_to_top = ..
|
|||||||
SUBDIRS = doc po src
|
SUBDIRS = doc po src
|
||||||
|
|
||||||
|
|
||||||
all: all-recursive
|
clean:
|
||||||
|
|
||||||
clean: clean-recursive
|
|
||||||
rm -rf features.log
|
rm -rf features.log
|
||||||
|
|
||||||
install: install-recursive
|
|
||||||
|
|
||||||
-include Makefile.lib
|
-include Makefile.lib
|
||||||
|
@ -103,3 +103,11 @@ LIBS = @LIBS@
|
|||||||
INCLUDES = -I$(top_builddir) -I$(top_srcdir)/src
|
INCLUDES = -I$(top_builddir) -I$(top_srcdir)/src
|
||||||
|
|
||||||
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
|
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
|
||||||
|
|
||||||
|
|
||||||
|
### This is here because Makefile.config is usually the first thing
|
||||||
|
### we get and sometimes the all rule can be implicit, yet we want
|
||||||
|
### it always as the default one. So this should make sure it always
|
||||||
|
### comes first.
|
||||||
|
all:
|
||||||
|
|
||||||
|
@ -58,6 +58,11 @@ endif
|
|||||||
%.a:
|
%.a:
|
||||||
$(call cmd,archive)
|
$(call cmd,archive)
|
||||||
|
|
||||||
|
ifdef $(OBJS)
|
||||||
|
clean:
|
||||||
|
rm -f $(OBJS) *.a
|
||||||
|
endif
|
||||||
|
|
||||||
|
|
||||||
# Recursion:
|
# Recursion:
|
||||||
|
|
||||||
@ -68,5 +73,9 @@ all-recursive install-recursive clean-recursive:
|
|||||||
$(call ncmd,recmake) || exit 1; \
|
$(call ncmd,recmake) || exit 1; \
|
||||||
done
|
done
|
||||||
|
|
||||||
|
all: all-recursive
|
||||||
|
install: install-recursive
|
||||||
|
clean: clean-recursive
|
||||||
|
|
||||||
|
|
||||||
# vim:syntax=make
|
# vim:syntax=make
|
||||||
|
3
src/cache/Makefile
vendored
3
src/cache/Makefile
vendored
@ -5,7 +5,4 @@ OBJS = cache.o dialogs.o
|
|||||||
all: libcache.a
|
all: libcache.a
|
||||||
libcache.a: $(OBJS)
|
libcache.a: $(OBJS)
|
||||||
|
|
||||||
clean:
|
|
||||||
rm -f *.o *.a
|
|
||||||
|
|
||||||
-include ../../Makefile.lib
|
-include ../../Makefile.lib
|
||||||
|
@ -5,7 +5,4 @@ OBJS = cmdline.o conf.o dialogs.o home.o kbdbind.o options.o opttypes.o timer.o
|
|||||||
all: libconfig.a
|
all: libconfig.a
|
||||||
libconfig.a: $(OBJS)
|
libconfig.a: $(OBJS)
|
||||||
|
|
||||||
clean:
|
|
||||||
rm -f *.o *.a
|
|
||||||
|
|
||||||
-include ../../Makefile.lib
|
-include ../../Makefile.lib
|
||||||
|
@ -2,13 +2,11 @@
|
|||||||
INCLUDES += $(SPIDERMONKEY_CFLAGS)
|
INCLUDES += $(SPIDERMONKEY_CFLAGS)
|
||||||
|
|
||||||
SUBDIRS = spidermonkey
|
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: all-recursive libecmascript.a
|
all: libecmascript.a
|
||||||
libecmascript.a: $(OBJS)
|
libecmascript.a: $(OBJS)
|
||||||
|
|
||||||
clean:
|
|
||||||
rm -f *.o *.a
|
|
||||||
|
|
||||||
-include ../../Makefile.lib
|
-include ../../Makefile.lib
|
||||||
|
@ -6,7 +6,4 @@ OBJS = document.o form.o location.o navigator.o unibar.o window.o
|
|||||||
|
|
||||||
all: $(OBJS)
|
all: $(OBJS)
|
||||||
|
|
||||||
clean:
|
|
||||||
rm -f *.o *.a
|
|
||||||
|
|
||||||
-include ../../../Makefile.lib
|
-include ../../../Makefile.lib
|
||||||
|
@ -5,7 +5,4 @@ OBJS = formhist.o dialogs.o
|
|||||||
all: libformhist.a
|
all: libformhist.a
|
||||||
libformhist.a: $(OBJS)
|
libformhist.a: $(OBJS)
|
||||||
|
|
||||||
clean:
|
|
||||||
rm -f *.o *.a
|
|
||||||
|
|
||||||
-include ../../Makefile.lib
|
-include ../../Makefile.lib
|
||||||
|
@ -5,7 +5,4 @@ OBJS = globhist.o dialogs.o
|
|||||||
all: libglobhist.a
|
all: libglobhist.a
|
||||||
libglobhist.a: $(OBJS)
|
libglobhist.a: $(OBJS)
|
||||||
|
|
||||||
clean:
|
|
||||||
rm -f *.o *.a
|
|
||||||
|
|
||||||
-include ../../Makefile.lib
|
-include ../../Makefile.lib
|
||||||
|
@ -5,7 +5,4 @@ OBJS = download.o history.o location.o session.o task.o
|
|||||||
all: libsession.a
|
all: libsession.a
|
||||||
libsession.a: $(OBJS)
|
libsession.a: $(OBJS)
|
||||||
|
|
||||||
clean:
|
|
||||||
rm -f *.o *.a
|
|
||||||
|
|
||||||
-include ../../Makefile.lib
|
-include ../../Makefile.lib
|
||||||
|
Loading…
Reference in New Issue
Block a user