summaryrefslogtreecommitdiff
path: root/helpers
diff options
context:
space:
mode:
authorgstein <gstein@13f79535-47bb-0310-9956-ffa450edef68>2001-01-19 21:48:37 +0000
committergstein <gstein@13f79535-47bb-0310-9956-ffa450edef68>2001-01-19 21:48:37 +0000
commitf488189b1dc4d97d57886c41a30f990b04589b84 (patch)
tree119420da3a3bf5fba3887686cfb38d265b9432b8 /helpers
parente61a6468e3e8363436e0afeccc6d85a06f46658d (diff)
downloadlibapr-f488189b1dc4d97d57886c41a30f990b04589b84.tar.gz
keep the recursive logic simple (it's quite hairy already), and deal with
dependency logic within the local-depend rule. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@61081 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'helpers')
-rw-r--r--helpers/rules.mk.in9
1 files changed, 5 insertions, 4 deletions
diff --git a/helpers/rules.mk.in b/helpers/rules.mk.in
index 0f230d375..097c1c34d 100644
--- a/helpers/rules.mk.in
+++ b/helpers/rules.mk.in
@@ -118,9 +118,7 @@ all-recursive depend-recursive clean-recursive distclean-recursive \
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-extraclean: local-distclean
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: