apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gst...@apache.org
Subject cvs commit: apr-util/build rules.mk.in
Date Sun, 07 Jan 2001 00:27:28 GMT
gstein      01/01/06 16:27:28

  Modified:    .        configure.in
               build    rules.mk.in
  Log:
  - with the re-addition of "test" to the SUBDIRS in the top-level Makefile,
    we need to back it out, or deal with it. This patch allows subdirs to not
    exist during the recursive make. Thus, when we release without a "test"
    directory, we won't see errors trying to build the test (missing) dir.
  
  - clean $(PROGRAMS) automatically
  
  - some config magic to attempt to not build test/Makefile when the test dir
    doesn't exist.
  
  Revision  Changes    Path
  1.8       +5 -1      apr-util/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr-util/configure.in,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -u -r1.7 -r1.8
  --- configure.in	2001/01/04 20:07:31	1.7
  +++ configure.in	2001/01/07 00:27:28	1.8
  @@ -67,6 +67,10 @@
   esac
   AC_SUBST(INCLUDE_RULES)
   
  +if test -d ./test; then
  +    test_Makefile="test/Makefile"
  +fi
  +
   dnl
   dnl everthing is done. 
   AC_OUTPUT([
  @@ -85,5 +89,5 @@
   	src/hooks/Makefile
   	src/uri/Makefile
   	src/xml/Makefile
  -	test/Makefile
  +	$test_Makefile
   	])
  
  
  
  1.6       +12 -9     apr-util/build/rules.mk.in
  
  Index: rules.mk.in
  ===================================================================
  RCS file: /home/cvs/apr-util/build/rules.mk.in,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -u -r1.5 -r1.6
  --- rules.mk.in	2000/12/21 00:30:23	1.5
  +++ rules.mk.in	2001/01/07 00:27:28	1.6
  @@ -98,15 +98,18 @@
   
   all-recursive depend-recursive clean-recursive distclean-recursive \
     extraclean-recursive:
  -	@otarget=`echo $@|sed s/-recursive//`; \
  -	list='$(SUBDIRS)'; for i in $$list; do \
  -	    target="$$otarget"; \
  -	    echo "Making $$target in $$i"; \
  -	    if test "$$i" = "."; then \
  -		made_local=yes; \
  -		target="local-$$target"; \
  +	@otarget=`echo $@ | sed s/-recursive//`; \
  +	list='$(SUBDIRS)'; \
  +	for i in $$list; do \
  +	    if test -d "$$i"; then \
  +		target="$$otarget"; \
  +		echo "Making $$target in $$i"; \
  +		if test "$$i" = "."; then \
  +		    made_local=yes; \
  +		    target="local-$$target"; \
  +		fi; \
  +		(cd $$i && $(MAKE) $$target) || exit 1; \
   	    fi; \
  -	    (cd $$i && $(MAKE) $$target) || exit 1; \
   	done; \
           if test "$$otarget" = "all" && test -z "$(TARGETS)"; then \
   	    made_local=n/a; \
  @@ -116,7 +119,7 @@
   	fi
   
   local-clean:
  -	$(RM) -f *.o *.lo *.a *.la *.so $(CLEAN_TARGETS)
  +	$(RM) -f *.o *.lo *.a *.la *.so $(CLEAN_TARGETS) $(PROGRAMS)
   	$(RM) -rf .libs
   
   local-distclean: local-clean
  
  
  

Mime
View raw message