You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by fi...@apache.org on 2001/04/11 08:42:26 UTC

cvs commit: apr-util/xml/expat/lib Makefile.in

fielding    01/04/10 23:42:25

  Modified:    .        CHANGES Makefile.in
               xml/expat Makefile.in
               xml/expat/lib Makefile.in
  Log:
  Make clean, distclean, and extraclean consistently according to the
  Gnu makefile guidelines.
  
  Submitted by:	Justin Erenkrantz <je...@ebuilt.com>
  Reviewed by:	Roy Fielding
  
  Revision  Changes    Path
  1.10      +3 -0      apr-util/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apr-util/CHANGES,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- CHANGES	2001/04/09 16:34:04	1.9
  +++ CHANGES	2001/04/11 06:42:22	1.10
  @@ -1,5 +1,8 @@
   Changes with APR-util b1  
   
  +  *) Make clean, distclean, and extraclean consistently according to the
  +     Gnu makefile guidelines.  [Justin Erenkrantz <je...@ebuilt.com>]
  +
     *) Migrate the --disable-libtool changes from APR to APR-util.
        This cleans things up, and allows more flexibility when building
        programs.  [Ryan Bloom]
  
  
  
  1.29      +3 -3      apr-util/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/Makefile.in,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- Makefile.in	2001/04/09 04:56:20	1.28
  +++ Makefile.in	2001/04/11 06:42:22	1.29
  @@ -16,9 +16,9 @@
   CLEAN_TARGETS = $(TARGET_EXPORTS)
   DISTCLEAN_TARGETS = config.cache config.log config.status \
   	include/private/apu_config.h include/private/apu_private.h \
  -	include/apu.h export_vars.sh
  -EXTRACLEAN_TARGETS = configure libtool aclocal.m4 \
  -	include/private/apu_config.h.in
  +	include/private/apu_select_dbm.h include/apu.h export_vars.sh \
  +	libtool build/Makefile build/rules.mk
  +EXTRACLEAN_TARGETS = configure aclocal.m4 include/private/apu_config.h.in
   
   prefix=@prefix@
   exec_prefix=@exec_prefix@
  
  
  
  1.4       +1 -1      apr-util/xml/expat/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/xml/expat/Makefile.in,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Makefile.in	2001/03/13 11:09:16	1.3
  +++ Makefile.in	2001/04/11 06:42:24	1.4
  @@ -121,7 +121,7 @@
   	@list='$(SUBDIRS)'; for dir in $$list; do \
   	  cd $$dir; $(MAKE) distclean; cd ..; \
   	done
  -	rm -f config.h config.status config.log libtool examples/Makefile xmlwf/Makefile
  +	rm -f config.h config.status config.log libtool examples/Makefile xmlwf/Makefile Makefile
   
   maintainer-clean: distclean
   	rm -f $(DISTRIBUTION)
  
  
  
  1.3       +1 -1      apr-util/xml/expat/lib/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/xml/expat/lib/Makefile.in,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Makefile.in	2001/03/09 23:02:36	1.2
  +++ Makefile.in	2001/04/11 06:42:25	1.3
  @@ -127,7 +127,7 @@
   	rm -rf .libs _libs
   
   distclean: clean
  -	rm -f Makefile
  +	rm -f Makefile expat.h
   
   maintainer-clean: distclean
   
  
  
  

Re: cvs commit: apr-util/xml/expat/lib Makefile.in

Posted by Justin Erenkrantz <je...@ebuilt.com>.
On Wed, Apr 11, 2001 at 01:54:48AM -0700, Greg Stein wrote:
> As mentioned in a previous commentary on these paches,
> apr-util/build/Makefile already has "clean" rules in it. The
> DISTCLEAN_TARGETS above should not clean stuff out of the build dir.

That slipped through.  Sorry.  -- justin

Index: Makefile.in
===================================================================
RCS file: /home/cvspublic/apr-util/Makefile.in,v
retrieving revision 1.29
diff -u -r1.29 Makefile.in
--- Makefile.in	2001/04/11 06:42:22	1.29
+++ Makefile.in	2001/04/12 00:46:27
@@ -17,7 +17,7 @@
 DISTCLEAN_TARGETS = config.cache config.log config.status \
 	include/private/apu_config.h include/private/apu_private.h \
 	include/private/apu_select_dbm.h include/apu.h export_vars.sh \
-	libtool build/Makefile build/rules.mk
+	libtool
 EXTRACLEAN_TARGETS = configure aclocal.m4 include/private/apu_config.h.in
 
 prefix=@prefix@


Re: cvs commit: apr-util/xml/expat/lib Makefile.in

Posted by Greg Stein <gs...@lyra.org>.
On Wed, Apr 11, 2001 at 06:42:26AM -0000, fielding@apache.org wrote:
>...
>   RCS file: /home/cvs/apr-util/Makefile.in,v
>   retrieving revision 1.28
>   retrieving revision 1.29
>   diff -u -r1.28 -r1.29
>   --- Makefile.in	2001/04/09 04:56:20	1.28
>   +++ Makefile.in	2001/04/11 06:42:22	1.29
>   @@ -16,9 +16,9 @@
>    CLEAN_TARGETS = $(TARGET_EXPORTS)
>    DISTCLEAN_TARGETS = config.cache config.log config.status \
>    	include/private/apu_config.h include/private/apu_private.h \
>   -	include/apu.h export_vars.sh
>   -EXTRACLEAN_TARGETS = configure libtool aclocal.m4 \
>   -	include/private/apu_config.h.in
>   +	include/private/apu_select_dbm.h include/apu.h export_vars.sh \
>   +	libtool build/Makefile build/rules.mk
>   +EXTRACLEAN_TARGETS = configure aclocal.m4 include/private/apu_config.h.in

As mentioned in a previous commentary on these paches,
apr-util/build/Makefile already has "clean" rules in it. The
DISTCLEAN_TARGETS above should not clean stuff out of the build dir.

(or, alternatively, keep the above and fix build/Makefile; the duplication
 is the "badness")

Cheers,
-g

-- 
Greg Stein, http://www.lyra.org/