httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@hyperreal.org
Subject cvs commit: apache-1.3/src/support Makefile.tmpl
Date Thu, 09 Apr 1998 10:22:56 GMT
rse         98/04/09 03:22:55

  Modified:    .        STATUS Makefile.tmpl
               src      CHANGES Configure Makefile.tmpl
               src/ap   Makefile.tmpl
               src/main Makefile.tmpl
               src/modules/proxy Makefile.tmpl
               src/os/bs2000 Makefile.tmpl
               src/os/emx Makefile.tmpl
               src/os/unix Makefile.tmpl
               src/regex Makefile.tmpl
               src/support Makefile.tmpl
  Log:
  More consistency cleanups for 1.3b6:
  "distclean" targets for all Makefiles under src/, too.
  
  Revision  Changes    Path
  1.285     +1 -0      apache-1.3/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.284
  retrieving revision 1.285
  diff -u -r1.284 -r1.285
  --- STATUS	1998/04/09 08:34:46	1.284
  +++ STATUS	1998/04/09 10:22:47	1.285
  @@ -151,6 +151,7 @@
       * OS/2 tweak to deal with multiple .exe targets. [Brian Havard]
       * Fixed ordering of argument checks for RewriteBase directive, PR#2045
       * Ralf's cleanup of subdir movement to again allow correct breaks on error
  +    * Ralf's consistent add of "distclean" targets for the src/-Makefiles
   
   Available Patches:
   
  
  
  
  1.12      +17 -20    apache-1.3/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Makefile.tmpl	1998/04/08 16:16:42	1.11
  +++ Makefile.tmpl	1998/04/09 10:22:48	1.12
  @@ -346,8 +346,8 @@
   clean:
   	@echo "===> $(SRC)"
   	@$(MAKE) -f $(MKF) $(MFLAGS) clean-std $(clean-support)
  -	@rm -f $(SRC)/.apaci.build.ok
   	@echo "<=== $(SRC)"
  +	@rm -f $(SRC)/.apaci.build.ok
   
   #   clean the standard stuff
   clean-std:
  @@ -363,10 +363,9 @@
   	    fi; \
   	echo "<=== $(SRC)/support"
   
  -#   first cleanup with the clean target and then additionally
  -#   remove anything the "configure" script has created, i.e.
  -#   create a really vanially source tree. When --shadow is used
  -#   we just remove the complete shadow tree.
  +#   cleanup the source tree by removing anything which was
  +#   created by the configure step and the build target.
  +#   When --shadow is used we just remove the complete shadow tree.
   distclean:
   	@if [ ".$(SRC)" = .src ]; then \
   		$(MAKE) -f $(MKF) $(MFLAGS) distclean-normal; \
  @@ -375,28 +374,26 @@
   	fi
   
   distclean-normal:
  -	@$(MAKE) -f $(MKF) $(MFLAGS) clean distclean-std $(distclean-support)
  +	@echo "===> $(SRC)"
  +	@$(MAKE) -f $(MKF) $(MFLAGS) distclean-std $(distclean-support)
  +	@echo "<=== $(SRC)"
   	-rm -f $(SRC)/Configuration.apaci
   	-rm -f $(SRC)/apaci
  +	@rm -f $(SRC)/.apaci.build.ok
   	-rm -f Makefile
   
  +#   clean the standard stuff
   distclean-std:
  -	-rm -f $(SRC)/main/Makefile
  -	-rm -f $(SRC)/ap/Makefile
  -	-rm -f $(SRC)/regex/Makefile
  -	-rm -f $(SRC)/os/unix/Makefile
  -	-rm -f $(SRC)/modules/experimental/Makefile
  -	-rm -f $(SRC)/modules/extra/Makefile
  -	-rm -f $(SRC)/modules/standard/Makefile
  -	-rm -f $(SRC)/modules/proxy/Makefile
  -	-rm -f $(SRC)/modules/Makefile
  -	-rm -f $(SRC)/modules.c
  -	-rm -f $(SRC)/include/ap_config.h
  -	-rm -f $(SRC)/Makefile.config
  -	-rm -f $(SRC)/Makefile
  +	@cd $(SRC); $(MAKE) $(MFLAGS) SDP=$(SRC)/ distclean
   
   distclean-support:
  -	-rm -f $(SRC)/support/Makefile
  +	@echo "===> $(SRC)/support"; \
  +	cd $(SRC)/support; $(MAKE) $(MFLAGS) distclean; \
  +	if [ ".$(suexec)" = .1 ]; then \
  +	    echo "rm -f suexec"; \
  +	    rm -f suexec; \
  +	fi; \
  +	echo "<=== $(SRC)/support"
   
   distclean-shadow:
   	rm -rf $(SRC)
  
  
  
  1.762     +8 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.761
  retrieving revision 1.762
  diff -u -r1.761 -r1.762
  --- CHANGES	1998/04/09 08:20:19	1.761
  +++ CHANGES	1998/04/09 10:22:49	1.762
  @@ -1,5 +1,13 @@
   Changes with Apache 1.3b6
   
  +  *) Add "distclean" target to src/-Makefiles to provide "make distclean" also
  +     inside the src subtree (i.e. for non-APACI users). Following GNU Makefile
  +     conventions while "clean" removes only stuff created by "all" targets,
  +     "distclean" additionally removes the stuff from the configuration
  +     process. This way "make distclean" (hence the name) provides a fresh
  +     source tree as it was for distribution.
  +     [Ralf S. Engelschall]
  +
     *) Allow top-level (APACI) Makefile to break on build errors
        the same way the src/ subtree Makefiles breaks on them by replacing the
        initial APACI sed-subdir-display-kludge with a more clean
  
  
  
  1.231     +4 -1      apache-1.3/src/Configure
  
  Index: Configure
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/Configure,v
  retrieving revision 1.230
  retrieving revision 1.231
  diff -u -r1.230 -r1.231
  --- Configure	1998/04/09 08:20:19	1.230
  +++ Configure	1998/04/09 10:22:49	1.231
  @@ -1379,7 +1379,7 @@
   
   default: all
   
  -all clean depend :: 
  +all clean distclean depend :: 
   	@for i in \$(MODULES); do \\
   	    echo "===> \$(SDP)modules/\$\$i"; \\
   		(cd \$\$i && \$(MAKE) \$(MFLAGS_STATIC) SDP='\$(SDP)' CC='\$(CC)' AUX_CFLAGS='\$(CFLAGS)'
RANLIB='\$(RANLIB)' \$@) || exit 1; \\
  @@ -1473,6 +1473,9 @@
   
   clean:
   	rm -f $(OBJS) $(SHLIBS) $(SHLIBS_OBJ) $(LIB) $(SHLIB)
  +
  +distclean: clean
  +	rm -f Makefile
   
   $(OBJS) $(SHLIBS) $(SHLIBS_OBJ): Makefile
   
  
  
  
  1.90      +14 -0     apache-1.3/src/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/Makefile.tmpl,v
  retrieving revision 1.89
  retrieving revision 1.90
  diff -u -r1.89 -r1.90
  --- Makefile.tmpl	1998/04/09 08:20:20	1.89
  +++ Makefile.tmpl	1998/04/09 10:22:50	1.90
  @@ -49,6 +49,20 @@
   		echo "<=== $(SDP)$$i"; \
   	done
   
  +distclean:
  +	-rm -f $(TARGET) *.o
  +	@for i in $(SUBDIRS); do \
  +		echo "===> $(SDP)$$i"; \
  +		( cd $$i && $(MAKE) $(MFLAGS_STATIC) SDP='$(SDP)' $@ ) || exit 1; \
  +		echo "<=== $(SDP)$$i"; \
  +	done
  +	-rm -f include/ap_config.h
  +	-rm -f modules.c
  +	-rm -f modules/Makefile
  +	-rm -f regex/Makefile
  +	-rm -f Makefile.config
  +	-rm -f Makefile
  +
   # We really don't expect end users to use this rule.  It works only with
   # gcc, and rebuilds Makefile.tmpl.  You have to re-run Configure after
   # using it.
  
  
  
  1.20      +3 -0      apache-1.3/src/ap/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/ap/Makefile.tmpl,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- Makefile.tmpl	1998/04/09 08:20:23	1.19
  +++ Makefile.tmpl	1998/04/09 10:22:51	1.20
  @@ -16,6 +16,9 @@
   clean:
   	rm -f *.o *.a
   
  +distclean: clean
  +	-rm -f Makefile
  +
   $(OBJS): Makefile
   
   $(LIB): $(OBJS)
  
  
  
  1.24      +3 -0      apache-1.3/src/main/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/main/Makefile.tmpl,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- Makefile.tmpl	1998/04/09 08:20:26	1.23
  +++ Makefile.tmpl	1998/04/09 10:22:52	1.24
  @@ -29,6 +29,9 @@
   clean:
   	rm -f *.o $(LIB) uri_delims.h gen_uri_delims test_char.h gen_test_char
   
  +distclean: clean
  +	-rm -f Makefile
  +
   uri_delims.h: gen_uri_delims
   	./gen_uri_delims >uri_delims.h
   
  
  
  
  1.12      +3 -0      apache-1.3/src/modules/proxy/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/Makefile.tmpl,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Makefile.tmpl	1998/04/09 08:20:28	1.11
  +++ Makefile.tmpl	1998/04/09 10:22:52	1.12
  @@ -40,6 +40,9 @@
   clean:
   	rm -f $(OBJS) $(SHLIB_OBJS) $(LIB)
   
  +distclean: clean
  +	-rm -f Makefile
  +
   # We really don't expect end users to use this rule.  It works only with
   # gcc, and rebuilds Makefile.tmpl.  You have to re-run Configure after
   # using it.
  
  
  
  1.6       +3 -0      apache-1.3/src/os/bs2000/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/os/bs2000/Makefile.tmpl,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Makefile.tmpl	1998/03/26 23:58:09	1.5
  +++ Makefile.tmpl	1998/04/09 10:22:53	1.6
  @@ -20,6 +20,9 @@
   clean:
   	rm -f $(OBJS) $(LIB)
   
  +distclean: clean
  +	-rm -f Makefile
  +
   # We really don't expect end users to use this rule.  It works only with
   # gcc, and rebuilds Makefile.tmpl.  You have to re-run Configure after
   # using it.
  
  
  
  1.6       +3 -0      apache-1.3/src/os/emx/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/os/emx/Makefile.tmpl,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Makefile.tmpl	1998/03/26 23:58:07	1.5
  +++ Makefile.tmpl	1998/04/09 10:22:53	1.6
  @@ -28,6 +28,9 @@
   	for i in $(COPY); do  rm -f $(INCDIR)/$$i ; done
   	rm -f $(OBJS) $(LIB)
   
  +distclean: clean
  +	-rm -f Makefile
  +
   $(OBJS): Makefile
   
   # We really don't expect end users to use this rule.  It works only with
  
  
  
  1.18      +3 -0      apache-1.3/src/os/unix/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/os/unix/Makefile.tmpl,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- Makefile.tmpl	1998/04/09 08:20:30	1.17
  +++ Makefile.tmpl	1998/04/09 10:22:54	1.18
  @@ -20,6 +20,9 @@
   clean:
   	rm -f $(OBJS) $(LIB)
   
  +distclean: clean
  +	-rm -f Makefile
  +
   # We really don't expect end users to use this rule.  It works only with
   # gcc, and rebuilds Makefile.tmpl.  You have to re-run Configure after
   # using it.
  
  
  
  1.7       +3 -0      apache-1.3/src/regex/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/regex/Makefile.tmpl,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Makefile.tmpl	1998/03/17 15:42:41	1.6
  +++ Makefile.tmpl	1998/04/09 10:22:54	1.7
  @@ -135,6 +135,9 @@
   clean:	tidy
   	rm -f *.o *.s re libregex.a
   
  +distclean: clean
  +	-rm -f Makefile
  +
   # don't do this one unless you know what you're doing
   spotless:	clean
   	rm -f mkh ../include/hsregex.h
  
  
  
  1.15      +3 -0      apache-1.3/src/support/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/support/Makefile.tmpl,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- Makefile.tmpl	1998/04/01 11:45:20	1.14
  +++ Makefile.tmpl	1998/04/09 10:22:55	1.15
  @@ -39,6 +39,9 @@
   clean:
   	rm -f $(TARGETS) *.o
   
  +distclean: clean
  +	-rm -f Makefile
  +
   # We really don't expect end users to use this rule.  It works only with
   # gcc, and rebuilds Makefile.tmpl.  You have to re-run Configure after
   # using it.
  
  
  

Mime
View raw message