httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From field...@apache.org
Subject cvs commit: httpd-2.0/test Makefile.in
Date Fri, 18 May 2001 00:48:57 GMT
fielding    01/05/17 17:48:57

  Modified:    .        CHANGES Makefile.in acinclude.m4 configure.in
               build    ltlib.mk rules.mk special.mk
               modules  Makefile.in
               server   Makefile.in
               support  Makefile.in
               test     Makefile.in
  Log:
  Change the make targets and rules to be consistent in all of the
  Apache-owned source trees.  Sanity is a good thing.
  
  Revision  Changes    Path
  1.203     +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.202
  retrieving revision 1.203
  diff -u -r1.202 -r1.203
  --- CHANGES	2001/05/17 18:04:14	1.202
  +++ CHANGES	2001/05/18 00:48:56	1.203
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0.18-dev
   
  +  *) Change the make targets and rules to be consistent in all of the
  +     Apache-owned source trees.  [Roy Fielding]
  +     
     *) Fix processing of the TRACE method.  Previously we passed bogus
        parms to form_header_field() and it overlaid some vhost structures,
        resulting in a segfault in check_hostalias(). 
  
  
  
  1.71      +7 -6      httpd-2.0/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/Makefile.in,v
  retrieving revision 1.70
  retrieving revision 1.71
  diff -u -r1.70 -r1.71
  --- Makefile.in	2001/05/02 19:09:21	1.70
  +++ Makefile.in	2001/05/18 00:48:56	1.71
  @@ -1,5 +1,6 @@
   
   SUBDIRS = srclib os server modules support
  +CLEAN_SUBDIRS = test
   
   PROGRAM_NAME         = $(progname)
   PROGRAM_SOURCES      = modules.c
  @@ -13,14 +14,14 @@
     $(AP_LIBS)
   
   PROGRAMS        = $(PROGRAM_NAME)
  -targets         = $(PROGRAMS) $(shared_build) $(other_targets)
  -phony_targets   = $(srcdir)/buildmark.c
  -install_targets = install-conf install-htdocs install-icons install-other \
  +TARGETS         = $(PROGRAMS) $(shared_build) $(other_targets)
  +PHONY_TARGETS   = $(srcdir)/buildmark.c
  +INSTALL_TARGETS = install-conf install-htdocs install-icons install-other \
   	install-cgi install-include install-suexec
  +
   DISTCLEAN_TARGETS  = include/ap_config_auto.h include/ap_config_path.h \
  -	modules.c libtool
  -EXTRACLEAN_TARGETS = configure include/ap_config_auto.h.in \
  -	generated_lists
  +	modules.c config.cache config.log config.status config_vars.mk
  +EXTRACLEAN_TARGETS = configure include/ap_config_auto.h.in generated_lists
   
   include $(top_srcdir)/build/rules.mk
   include $(top_srcdir)/build/program.mk
  
  
  
  1.88      +3 -0      httpd-2.0/acinclude.m4
  
  Index: acinclude.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/acinclude.m4,v
  retrieving revision 1.87
  retrieving revision 1.88
  diff -u -r1.87 -r1.88
  --- acinclude.m4	2001/05/12 03:48:30	1.87
  +++ acinclude.m4	2001/05/18 00:48:56	1.88
  @@ -76,6 +76,7 @@
     APACHE_SUBST(LIBTOOL)
     APACHE_SUBST(SHELL)
     APACHE_SUBST(MODULE_DIRS)
  +  APACHE_SUBST(MODULE_CLEANDIRS)
     APACHE_SUBST(PORT)
     APACHE_SUBST(CORE_IMPLIB_FILE)
     APACHE_SUBST(CORE_IMPLIB)
  @@ -144,6 +145,8 @@
     echo "shared = $modpath_shared" >> $modpath_current/modules.mk
     if test ! -z "$modpath_static" -o ! -z "$modpath_shared"; then
       MODULE_DIRS="$MODULE_DIRS $current_dir"
  +  else
  +    MODULE_CLEANDIRS="$MODULE_CLEANDIRS $current_dir"
     fi
     APACHE_FAST_OUTPUT($modpath_current/Makefile)
   ])dnl
  
  
  
  1.158     +1 -1      httpd-2.0/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/configure.in,v
  retrieving revision 1.157
  retrieving revision 1.158
  diff -u -r1.157 -r1.158
  --- configure.in	2001/05/15 17:30:44	1.157
  +++ configure.in	2001/05/18 00:48:56	1.158
  @@ -246,7 +246,7 @@
         HTTPD_LDFLAGS="$HTTPD_LDFLAGS --main=$abs_srcdir/server/main.o --core-dll=$abs_srcdir/apachecore.dll"
         SH_LDFLAGS="$SH_LDFLAGS --core-dll=$abs_srcdir/apachecore.dll"
     esac
  -  shared_build="shared-modules"
  +  shared_build="shared-build"
   fi
   
   APACHE_SUBST(PRE_SHARED_CMDS)
  
  
  
  1.6       +1 -1      httpd-2.0/build/ltlib.mk
  
  Index: ltlib.mk
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/ltlib.mk,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ltlib.mk	2001/02/16 04:26:27	1.5
  +++ ltlib.mk	2001/05/18 00:48:56	1.6
  @@ -54,7 +54,7 @@
   # The build environment was provided by Sascha Schumann.
   #
   
  -targets = $(LTLIBRARY_NAME)
  +TARGETS = $(LTLIBRARY_NAME)
   
   include $(top_srcdir)/build/rules.mk
   include $(top_srcdir)/build/library.mk
  
  
  
  1.57      +127 -110  httpd-2.0/build/rules.mk
  
  Index: rules.mk
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/rules.mk,v
  retrieving revision 1.56
  retrieving revision 1.57
  diff -u -r1.56 -r1.57
  --- rules.mk	2001/05/12 03:48:30	1.56
  +++ rules.mk	2001/05/18 00:48:56	1.57
  @@ -51,7 +51,7 @@
   # information on the Apache Software Foundation, please see
   # <http://www.apache.org/>.
   #
  -# The build environment was provided by Sascha Schumann.
  +# The build environment was originally provided by Sascha Schumann.
   #
   
   include $(top_builddir)/config_vars.mk
  @@ -94,8 +94,122 @@
   INSTALL_DATA = $(INSTALL) -m 644
   INSTALL_PROGRAM = $(INSTALL) -m 755 $(INSTALL_PROG_FLAGS)
   
  -# Suffixes
  +#
  +# Standard build rules
  +#
  +all: all-recursive
  +depend: depend-recursive
  +clean: clean-recursive
  +distclean: distclean-recursive
  +extraclean: extraclean-recursive
  +
  +install: all-recursive local-install
  +shared-build: shared-build-recursive
  +
  +all-recursive depend-recursive:
  +	@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; \
  +	done; \
  +	if test "$$otarget" = "all" && test -z '$(TARGETS)'; then \
  +	    made_local=yes; \
  +	fi; \
  +	if test "$$made_local" != "yes"; then \
  +	    $(MAKE) "local-$$otarget" || exit 1; \
  +	fi
  +
  +clean-recursive distclean-recursive extraclean-recursive:
  +	@otarget=`echo $@|sed s/-recursive//`; \
  +	list='$(SUBDIRS) $(CLEAN_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); \
  +	    fi; \
  +	done; \
  +	if test "$$otarget" = "all" && test -z '$(TARGETS)'; then \
  +	    made_local=yes; \
  +	fi; \
  +	if test "$$made_local" != "yes"; then \
  +	    $(MAKE) "local-$$otarget"; \
  +	fi
  +
  +shared-build-recursive:
  +	@if test `pwd` = "$(top_builddir)"; then \
  +	    $(PRE_SHARED_CMDS) ; \
  +	fi; \
  +	list='$(SUBDIRS)'; for i in $$list; do \
  +	    target="shared-build"; \
  +	    if test "$$i" = "."; then \
  +		made_local=yes; \
  +		target="local-shared-build"; \
  +	    fi; \
  +	    if test "$$i" != "srclib"; then \
  +		(cd $$i && $(MAKE) $$target) || exit 1; \
  +	    fi; \
  +	done; \
  +	if test -f 'modules.mk'; then \
  +	    if test -n '$(SHARED_TARGETS)'; then \
  +		echo "Building shared: $(SHARED_TARGETS)"; \
  +		if test "$$made_local" != "yes"; then \
  +			$(MAKE) "local-shared-build" || exit 1; \
  +		fi; \
  +	    fi; \
  +	fi; \
  +	if test `pwd` = "$(top_builddir)"; then \
  +		$(POST_SHARED_CMDS) ; \
  +	fi
  +
  +local-all: $(TARGETS)
  +
  +local-shared-build: $(SHARED_TARGETS)
  +
  +local-depend: x-local-depend
  +	if test "`echo $(srcdir)/*.c`" != "$(srcdir)'/*.c'"; then \
  +		$(CC) -MM $(ALL_CPPFLAGS) $(ALL_INCLUDES) $(srcdir)/*.c | sed 's/\.o:/.lo:/' > $(builddir)/.deps
|| true;           \
  +	fi
  +
  +local-clean: x-local-clean
  +	rm -f *.o *.lo *.slo *.obj *.a *.la $(CLEAN_TARGETS) $(TARGETS)
  +	rm -rf .libs
  +
  +local-distclean: local-clean x-local-distclean
  +	rm -f .deps Makefile $(DISTCLEAN_TARGETS)
  +
  +local-extraclean: local-distclean x-local-extraclean
  +	@if test -n "$(EXTRACLEAN_TARGETS)"; then \
  +	    echo "rm -f $(EXTRACLEAN_TARGETS)"; \
  +	    rm -f $(EXTRACLEAN_TARGETS) ; \
  +	fi
  +
  +local-install: $(TARGETS) $(SHARED_TARGETS) $(INSTALL_TARGETS)
  +	@if test -n '$(PROGRAMS)'; then \
  +	    test -d $(bindir) || $(MKINSTALLDIRS) $(bindir); \
  +	    list='$(PROGRAMS)'; for i in $$list; do \
  +	        $(INSTALL_PROGRAM) $$i $(bindir); \
  +	    done; \
  +	fi
   
  +# to be filled in by the actual Makefile if extra commands are needed
  +x-local-depend x-local-clean x-local-distclean x-local-extraclean:
  +
  +#
  +# Implicit rules for creating outputs from input files
  +#
   CXX_SUFFIX = cpp
   SHLIB_SUFFIX = so
   
  @@ -132,117 +246,20 @@
   .l.c:
   	$(LEX) $(LFLAGS) $< && mv $(LEX_OUTPUT_ROOT).c $@
   
  -
  -all: all-recursive
  -shared-modules: shared-modules-recursive
  -install: install-recursive
  -
  -
   # Makes an import library from a def file
   .def.la:
   	$(LIBTOOL) --mode=compile $(MK_IMPLIB) -o $@ $<
  -
  -
  -# if we are doing a distclean, we actually want to hit every 
  -# 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 \
  -		target="$$otarget"; \
  -		echo "Making $$target in $$i"; \
  -		if test "$$i" = "."; then \
  -			ok=yes; \
  -			target="$$target-p"; \
  -		fi; \
  -		(cd $$i && $(MAKE) $$target) || exit 1; \
  -	done; \
  -	if test "$$otarget" = "all" && test -z '$(targets)'; then ok=yes; fi;\
  -	if test "$$ok" != "yes"; then $(MAKE) "$$otarget-p" || exit 1; fi; \
  -	if test "$$otarget" = "distclean" ; then\
  -		for d in `find . -name Makefile`; do \
  -			i=`dirname "$$d"`; \
  -			target="$$otarget"; \
  -			in_apr=`echo $$i|sed 's%^.*apr/.*$$%ignore_apr_subdirs%'`; \
  -			in_apr=`echo $$in_apr|sed 's%^.*apr-util/.*$$%ignore_apr_subdirs%'`; \
  -			if test "x$$in_apr" != "xignore_apr_subdirs"; then \
  -				echo "Making $$target in $$i"; \
  -				if test "$$i" = "."; then \
  -					ok=yes; \
  -					target="$$target-p"; \
  -				fi; \
  -				(cd $$i && $(MAKE) $$target) || exit 1; \
  -			fi; \
  -		done; \
  -	fi
  -
  -shared-modules-recursive:
  -	@if test `pwd` = "$(top_builddir)"; then \
  -		$(PRE_SHARED_CMDS) ; \
  -	fi; \
  -	list='$(SUBDIRS)'; for i in $$list; do \
  -		target="shared-modules"; \
  -		if test "$$i" = "."; then \
  -			ok = yes; \
  -			target="shared-modules-p"; \
  -		fi; \
  -		if test "$$i" != "srclib"; then \
  -			(cd $$i && $(MAKE) $$target) || exit 1; \
  -		fi; \
  -	done; \
  -	if test -f 'modules.mk'; then \
  -		if test -n '$(shared_targets)'; then \
  -			echo "Building shared modules: $(shared_targets)"; \
  -			if test -z '$(shared_targets)'; then ok=yes; fi; \
  -			if test "$$ok" != "yes"; then \
  -				$(MAKE) "shared-modules-p" || exit 1; \
  -			fi; \
  -		fi; \
  -	fi; \
  -	if test `pwd` = "$(top_builddir)"; then \
  -		$(POST_SHARED_CMDS) ; \
  -	fi
   
  -all-p: $(targets)
  -shared-modules-p: $(shared_targets)
  -
  -install-p: $(targets) $(shared_targets) $(install_targets)
  -	@if test -n '$(PROGRAMS)'; then \
  -		test -d $(bindir) || $(MKINSTALLDIRS) $(bindir); \
  -		for i in $(PROGRAMS) ""; do \
  -		    if test "x$$i" != "x"; then \
  -			$(INSTALL_PROGRAM) $$i $(bindir); \
  -		    fi; \
  -		done; \
  -	fi
  -
  -distclean-p depend-p clean-p:
  -
  -depend: depend-recursive
  -	if test "`echo $(srcdir)/*.c`" != "$(srcdir)'/*.c'"; then \
  -		$(CC) -MM $(ALL_CPPFLAGS) $(ALL_INCLUDES) $(srcdir)/*.c | sed 's/\.o:/.lo:/' > $(builddir)/.deps
|| true;           \
  -	fi
  -#	    test "`echo *.c`" = '*.c' || perl $(top_srcdir)/build/mkdep.perl $(CPP) $(ALL_CPPFLAGS)
$(ALL_INCLUDES) *.c > .deps
  -
  -clean: clean-recursive clean-x
  -
  -clean-x:
  -	rm -f $(targets) *.slo *.lo *.la *.o *.obj $(CLEAN_TARGETS)
  -	rm -rf .libs
  -
  -distclean: distclean-recursive clean-x
  -	rm -f config.cache config.log config.status config_vars.mk \
  -	stamp-h Makefile shlibtool .deps $(DISTCLEAN_TARGETS)
  -
  -extraclean: distclean
  -	rm -f $(EXTRACLEAN_TARGETS)
  -
  +#
  +# Dependencies
  +#
   include $(builddir)/.deps
  +
  +.PHONY: all all-recursive local-all $(PHONY_TARGETS) \
  +	shared-build shared-build-recursive local-shared-build \
  +	depend depend-recursive local-depend x-local-depend \
  +	clean clean-recursive local-clean x-local-clean \
  +	distclean distclean-recursive local-distclean x-local-distclean \
  +	extraclean extraclean-recursive local-extraclean x-local-extraclean \
  +	install local-install $(INSTALL_TARGETS)
   
  -.PHONY: all-recursive clean-recursive install-recursive \
  -$(install_targets) install all clean depend depend-recursive shared \
  -distclean-recursive distclean clean-x all-p install-p distclean-p \
  -depend-p clean-p $(phony_targets)
  
  
  
  1.13      +6 -6      httpd-2.0/build/special.mk
  
  Index: special.mk
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/special.mk,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- special.mk	2001/04/18 20:51:35	1.12
  +++ special.mk	2001/05/18 00:48:56	1.13
  @@ -57,17 +57,17 @@
   all: all-recursive
   
   include $(builddir)/modules.mk
  -targets = $(static)
  -shared_targets = $(shared)
  -install_targets = install-modules
  +TARGETS = $(static)
  +SHARED_TARGETS = $(shared)
  +INSTALL_TARGETS = install-modules
   
   install-modules:
  -	@shared='$(shared)'; \
  -	builtin='$(BUILTIN_LIBS)'; \
  +	@builtin='$(BUILTIN_LIBS)'; \
   	has_mod_so=`echo $$builtin|sed 's/^.*mod_so.*$$/has_mod_so/'`; \
   	if [ "x$$has_mod_so" = "xhas_mod_so" ]; then \
   		$(MKINSTALLDIRS) $(libexecdir); \
  -		for i in $$shared; do \
  +		@list='$(shared)'; \
  +		for i in $$list; do \
   			$(SH_LIBTOOL) --mode=install cp $$i $(libexecdir); \
   		done; \
   	fi	
  
  
  
  1.5       +1 -0      httpd-2.0/modules/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/Makefile.in,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Makefile.in	2000/12/04 22:33:41	1.4
  +++ Makefile.in	2001/05/18 00:48:57	1.5
  @@ -1,5 +1,6 @@
   
   SUBDIRS = $(MODULE_DIRS)
  +CLEAN_SUBDIRS = $(MODULE_CLEANDIRS)
   
   include $(top_srcdir)/build/rules.mk
   
  
  
  
  1.43      +1 -1      httpd-2.0/server/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/Makefile.in,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- Makefile.in	2001/04/29 05:24:10	1.42
  +++ Makefile.in	2001/05/18 00:48:57	1.43
  @@ -16,7 +16,7 @@
   	util_filter.c exports.c buildmark.c scoreboard.c \
   	error_bucket.c protocol.c core.c request.c
   
  -targets = delete-exports $(LTLIBRARY_NAME) $(CORE_IMPLIB_FILE)
  +TARGETS = delete-exports $(LTLIBRARY_NAME) $(CORE_IMPLIB_FILE)
   
   include $(top_srcdir)/build/rules.mk
   include $(top_srcdir)/build/library.mk
  
  
  
  1.15      +1 -1      httpd-2.0/support/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/Makefile.in,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- Makefile.in	2001/04/13 00:46:22	1.14
  +++ Makefile.in	2001/05/18 00:48:57	1.15
  @@ -2,7 +2,7 @@
   	phf_abuse_log.cgi split-logfile
   
   PROGRAMS = htpasswd htdigest rotatelogs logresolve ab
  -targets  = $(PROGRAMS)
  +TARGETS  = $(PROGRAMS)
   
   PROGRAM_LDADD        = $(EXTRA_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS)
   PROGRAM_DEPENDENCIES = \
  
  
  
  1.7       +1 -1      httpd-2.0/test/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/test/Makefile.in,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Makefile.in	2001/01/10 01:04:53	1.6
  +++ Makefile.in	2001/05/18 00:48:57	1.7
  @@ -1,7 +1,7 @@
   
   # no targets: we don't want to build anything by default. if you want the
   # test programs, then "make test"
  -targets =
  +TARGETS =
   
   PROGRAMS =
   
  
  
  

Mime
View raw message