apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From field...@apache.org
Subject cvs commit: apr/build Makefile.in rules.mk.in
Date Thu, 17 May 2001 22:26:00 GMT
fielding    01/05/17 15:25:59

  Modified:    .        Makefile.in
               build    Makefile.in rules.mk.in
  Log:
  Do the cleans in test and build the right way, like apr-util.
  
  Revision  Changes    Path
  1.50      +1 -0      apr/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr/Makefile.in,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- Makefile.in	2001/05/01 04:52:00	1.49
  +++ Makefile.in	2001/05/17 22:25:53	1.50
  @@ -13,6 +13,7 @@
   # Macros for target determination
   #
   SUBDIRS=@SUBDIRS@
  +CLEAN_SUBDIRS= . test build
   
   TARGET_LIB = libapr.la
   TARGET_EXPORTS = apr.exports
  
  
  
  1.3       +0 -3      apr/build/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr/build/Makefile.in,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Makefile.in	2001/05/04 02:39:44	1.2
  +++ Makefile.in	2001/05/17 22:25:56	1.3
  @@ -5,7 +5,4 @@
   # bring in rules.mk for standard functionality
   @INCLUDE_RULES@
   
  -x-local-all x-local-depend x-local-clean:
  -	@echo "Congratulations -- make has successfully completed"
  -
   # DO NOT REMOVE
  
  
  
  1.15      +6 -13     apr/build/rules.mk.in
  
  Index: rules.mk.in
  ===================================================================
  RCS file: /home/cvs/apr/build/rules.mk.in,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- rules.mk.in	2001/05/12 03:41:53	1.14
  +++ rules.mk.in	2001/05/17 22:25:57	1.15
  @@ -138,7 +138,10 @@
   all-recursive depend-recursive clean-recursive distclean-recursive \
     extraclean-recursive:
   	@otarget=`echo $@ | sed s/-recursive//`; \
  -	list='$(SUBDIRS)'; \
  +	case $$otarget in \
  +	    *clean) list='$(SUBDIRS) $(CLEAN_SUBDIRS)';; \
  +	    *)      list='$(SUBDIRS)';; \
  +	esac; \
   	for i in $$list; do \
   	    if test -d "$$i"; then \
   		target="$$otarget"; \
  @@ -151,20 +154,10 @@
   	    fi; \
   	done; \
           if test "$$otarget" = "all" && test -z "$(TARGETS)"; then \
  -	    made_local=n/a; \
  +	    made_local=yes; \
   	fi; \
  -	if test -z "$$made_local"; then \
  +	if test "$$made_local" != "yes"; then \
   	    $(MAKE) "local-$$otarget" || exit 1; \
  -	fi; \
  -	case $$otarget in *clean) \
  -	    if test -d "test"; then \
  -	        echo "Making local-$$otarget in test"; \
  -	        (cd test && $(MAKE) local-$$otarget) || exit 1; \
  -	    fi ;; \
  -	esac; \
  -	if test -d "build"; then \
  -	    echo "Making local-$$otarget in build"; \
  -	    (cd build && $(MAKE) local-$$otarget) || exit 1; \
   	fi
   
   local-clean: x-local-clean
  
  
  

Mime
View raw message