gstein 01/01/19 13:48:37
Modified: helpers rules.mk.in
Log:
keep the recursive logic simple (it's quite hairy already), and deal with
dependency logic within the local-depend rule.
Revision Changes Path
1.3 +5 -4 apr/helpers/rules.mk.in
Index: rules.mk.in
===================================================================
RCS file: /home/cvs/apr/helpers/rules.mk.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- rules.mk.in 2001/01/19 20:44:46 1.2
+++ rules.mk.in 2001/01/19 21:48:37 1.3
@@ -118,9 +118,7 @@
made_local=n/a; \
fi; \
if test -z "$$made_local"; then \
- if test "$$otarget" != "depend" || test `pwd` != "$(top_builddir)";
then \
- $(MAKE) "local-$$otarget" || exit 1; \
- fi; \
+ $(MAKE) "local-$$otarget" || exit 1; \
fi
local-clean: x-local-clean
@@ -139,7 +137,10 @@
local-all: $(TARGETS)
local-depend:
- $(MKDEP) $(INCLUDES) $(CFLAGS) *.c
+ @if test -n "`ls *.c 2> /dev/null`"; then \
+ echo $(MKDEP) $(INCLUDES) $(CFLAGS) *.c ; \
+ $(MKDEP) $(INCLUDES) $(CFLAGS) *.c ; \
+ fi
# to be filled in by the actual Makefile
x-local-clean x-local-distclean:
