From a7105350cb66e7a35c34a2385603e5e756a5d152 Mon Sep 17 00:00:00 2001 From: Jeff Trawick Date: Mon, 27 Nov 2000 18:15:00 +0000 Subject: [PATCH] Change Apache's distclean rule to rely on APR to clean up APR as appropriate. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87091 13f79535-47bb-0310-9956-ffa450edef68 --- build/rules.mk | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/build/rules.mk b/build/rules.mk index ea0117a561..a6458a5587 100644 --- a/build/rules.mk +++ b/build/rules.mk @@ -131,6 +131,8 @@ install: install-recursive # directory that has ever been configured. To do this, we just do a quick # find for all the leftover Makefiles, and then run make distclean in those # directories. +# Exception: Skip APR directories (other than the base APR directory), +# because APR knows how to do these tasks better than we do. distclean-recursive clean-recursive depend-recursive all-recursive install-recursive: @otarget=`echo $@|sed s/-recursive//`; \ list='$(SUBDIRS)'; for i in $$list; do \ @@ -148,12 +150,15 @@ distclean-recursive clean-recursive depend-recursive all-recursive install-recur for d in `find . -name Makefile`; do \ i=`dirname "$$d"`; \ target="$$otarget"; \ - echo "Making $$target in $$i"; \ - if test "$$i" = "."; then \ - ok=yes; \ - target="$$target-p"; \ + in_apr=`echo $$i|grep 'apr/.'`; \ + if test "x$$in_apr" = "x"; then \ + echo "Making $$target in $$i"; \ + if test "$$i" = "."; then \ + ok=yes; \ + target="$$target-p"; \ + fi; \ + (cd $$i && $(MAKE) $$target) || exit 1; \ fi; \ - (cd $$i && $(MAKE) $$target) || exit 1; \ done; \ fi -- 2.40.0