httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@locus.apache.org
Subject cvs commit: apache-2.0/src/build rules.mk
Date Mon, 27 Nov 2000 18:15:06 GMT
trawick     00/11/27 10:15:04

  Modified:    src/build rules.mk
  Log:
  Change Apache's distclean rule to rely on APR to clean up APR as
  appropriate.
  
  Revision  Changes    Path
  1.28      +10 -5     apache-2.0/src/build/rules.mk
  
  Index: rules.mk
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/build/rules.mk,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- rules.mk	2000/10/05 17:28:45	1.27
  +++ rules.mk	2000/11/27 18:15:00	1.28
  @@ -131,6 +131,8 @@
   # 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 @@
   		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
   
  
  
  

Mime
View raw message