cvs commit: apache-1.3/src/os/unix Makefile.tmpl
dgaudet 98/03/01 23:06:05 Modified:src Makefile.tmpl src/main Makefile.tmpl src/modules/proxy Makefile.tmpl src/modules/standard Makefile.tmpl src/modules/test Makefile.tmpl src/os/unix Makefile.tmpl Log: update depend Revision ChangesPath 1.81 +5 -3 apache-1.3/src/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/src/Makefile.tmpl,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- Makefile.tmpl 1998/02/28 15:39:29 1.80 +++ Makefile.tmpl 1998/03/02 07:05:53 1.81 @@ -64,7 +64,7 @@ # We really don't expect end users to use this rule. It builds a # httpd binary with all modules built in and then updates the -# include/hide.h file according to the exported symbols of this +# $(INCDIR)/hide.h file according to the exported symbols of this # binary. So run this target once after a new function was added # to the source. updatehide: @@ -74,7 +74,7 @@ $(MAKE) clean ./Configure -file Configuration.for-hide $(MAKE) httpd - ./helpers/UpdateHide httpd include/hide.h + ./helpers/UpdateHide httpd $(INCDIR)/hide.h $(MAKE) clean rm -f Configuration.for-hide @@ -83,7 +83,9 @@ $(OBJS): Makefile # DO NOT REMOVE -buildmark.o: buildmark.c +buildmark.o: buildmark.c $(INCDIR)/conf.h os/unix/os.h $(INCDIR)/hsregex.h modules.o: modules.c $(INCDIR)/httpd.h $(INCDIR)/conf.h os/unix/os.h \ $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h +t.o: t.c +tt.o: tt.c 1.16 +2 -1 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.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- Makefile.tmpl 1998/02/28 10:31:56 1.15 +++ Makefile.tmpl 1998/03/02 07:05:55 1.16 @@ -57,7 +57,8 @@ $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \ $(INCDIR)/ap.h $(INCDIR)/util_uri.h $(INCDIR)/http_main.h \ $(INCDIR)/http_log.h -fnmatch.o: fnmatch.c $(INCDIR)/fnmatch.h +fnmatch.o: fnmatch.c $(INCDIR)/conf.h ../os/unix/os.h \ + $(INCDIR)/hsregex.h $(INCDIR)/fnmatch.h http_bprintf.o: http_bprintf.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ ../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h 1.5 +1 -1 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.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Makefile.tmpl 1998/02/28 10:32:01 1.4 +++ Makefile.tmpl 1998/03/02 07:05:56 1.5 @@ -37,7 +37,7 @@ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ $(INCDIR)/http_protocol.h $(INCDIR)/explain.h \ - $(INCDIR)/http_log.h + $(INCDIR)/http_log.h $(INCDIR)/http_vhost.h proxy_cache.o: proxy_cache.c mod_proxy.h $(INCDIR)/httpd.h \ $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ 1.9 +1 -1 apache-1.3/src/modules/standard/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/src/modules/standard/Makefile.tmpl,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Makefile.tmpl 1998/02/28 10:32:02 1.8 +++ Makefile.tmpl 1998/03/02 07:05:58 1.9 @@ -162,7 +162,7 @@ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \ $(INCDIR)/http_request.h $(INCDIR)/http_core.h \ - $(INCDIR)/http_log.h mod_rewrite.h + $(INCDIR)/http_log.h $(INCDIR)/http_vhost.h mod_rewrite.h mod_setenvif.o: mod_setenvif.c $(INCDIR)/httpd.h \ $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ 1.4 +10 -5 apache-1.3/src/modules/test/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/src/modules/test/Makefile.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile.tmpl 1998/02/22 04:37:18 1.3 +++ Makefile.tmpl 1998/03/02 07:06:03 1.4 @@ -17,8 +17,13 @@ $(OBJS): Makefile # DO NOT REMOVE -mod_rndchunk.o: mod_rndchunk.c ../../include/h
cvs commit: apache-1.3/src/os/unix Makefile.tmpl
dgaudet 98/03/17 00:28:03 Modified:src/ap Makefile.tmpl src/main Makefile.tmpl src Makefile.tmpl src/modules/experimental Makefile.tmpl src/modules/proxy Makefile.tmpl src/modules/standard Makefile.tmpl src/modules/test Makefile.tmpl src/os/unix Makefile.tmpl Log: update Revision ChangesPath 1.16 +16 -12apache-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.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- Makefile.tmpl 1998/03/13 12:44:47 1.15 +++ Makefile.tmpl 1998/03/17 08:27:55 1.16 @@ -37,20 +37,24 @@ # DO NOT REMOVE ap_cpystrn.o: ap_cpystrn.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ - ../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h + ../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \ + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ + $(INCDIR)/util_uri.h ap_execve.o: ap_execve.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ - ../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h + ../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \ + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ + $(INCDIR)/util_uri.h ap_signal.o: ap_signal.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ - ../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h + ../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \ + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ + $(INCDIR)/util_uri.h ap_slack.o: ap_slack.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ - ../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \ - $(INCDIR)/http_log.h + ../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \ + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ + $(INCDIR)/util_uri.h $(INCDIR)/http_log.h ap_snprintf.o: ap_snprintf.c $(INCDIR)/conf.h ../os/unix/os.h \ - $(INCDIR)/hsregex.h + $(INCDIR)/hide.h $(INCDIR)/hsregex.h ap_strings.o: ap_strings.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ - ../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h + ../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \ + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ + $(INCDIR)/util_uri.h 1.18 +69 -64apache-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.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- Makefile.tmpl 1998/03/13 12:44:46 1.17 +++ Makefile.tmpl 1998/03/17 08:27:56 1.18 @@ -51,92 +51,97 @@ # DO NOT REMOVE alloc.o: alloc.c $(INCDIR)/httpd.h $(INCDIR)/conf.h ../os/unix/os.h \ - $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \ - $(INCDIR)/ap.h $(INCDIR)/util_uri.h $(INCDIR)/multithread.h \ - $(INCDIR)/http_log.h + $(INCDIR)/hide.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \ + $(INCDIR)/multithread.h $(INCDIR)/http_log.h buff.o: buff.c $(INCDIR)/httpd.h $(INCDIR)/conf.h ../os/unix/os.h \ - $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \ - $(INCDIR)/ap.h $(INCDIR)/util_uri.h $(INCDIR)/http_main.h \ - $(INCDIR)/http_log.h + $(INCDIR)/hide.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \ + $(INCDIR)/http_main.h $(INCDIR)/http_log.h fnmatch.o: fnmatch.c $(INCDIR)/conf.h ../os/unix/os.h \ - $(INCDIR)/hsregex.h $(INCDIR)/fnmatch.h + $(INCDIR)/hide.h $(INCDIR)/hsregex.h $(INCDIR)/fnmatch.h http_bprintf.o: http_bprintf.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ - ../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h + ../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \ + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ + $(INCDIR)/util_uri.h http_config.o: http_config.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ - ../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \ - $(INCDIR)/http_config.h $(INCDIR)/http_core.h $(INCDIR)/http_log.h \ - $(INCDIR)/http_request.h $(INCDIR)/http_conf_globals.h \ - $(INCDIR)/http_vhost.h $(INCDIR)/explain.h + ../os/unix/os.h $(INCDIR)/hide.h $(INCDIR)/hsregex.h \ + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ + $(INCDIR)/util_uri.h $(INCDIR)/http_config.h $(INCDIR)/http_core.h \ + $(INCDIR)/http_log.h $(INCDIR)/http_request
cvs commit: apache-1.3/src/os/unix Makefile.tmpl
rse 98/05/10 06:04:38 Modified:.Makefile.tmpl src CHANGES Configure Makefile.tmpl src/ap Makefile.tmpl src/main Makefile.tmpl src/modules/example .cvsignore Makefile.tmpl src/modules/experimental .cvsignore Makefile.tmpl src/modules/extra .cvsignore Makefile.tmpl src/modules/proxy .cvsignore Makefile.tmpl src/modules/standard .cvsignore Makefile.tmpl src/modules/test .cvsignore Makefile.tmpl src/os/bs2000 Makefile.tmpl src/os/emx Makefile.tmpl src/os/unix Makefile.tmpl Log: The second part of the consistency cleanups for the Makefiles. Now we are clean enough for a release... ;-) Revision ChangesPath 1.35 +1 -1 apache-1.3/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- Makefile.tmpl 1998/05/08 07:50:21 1.34 +++ Makefile.tmpl 1998/05/10 13:04:25 1.35 @@ -322,7 +322,7 @@ install-include: @echo "===> [include: Installing Apache C header files]" $(UMASK) 022; $(CP) $(TOP)/$(SRC)/include/*.h $(root)$(includedir)/ - @osdir=`grep '^OSDIR' $(TOP)/$(SRC)/Makefile.config | sed -e 's:^OSDIR=::'`; \ + @osdir=`grep '^OSDIR=' $(TOP)/$(SRC)/Makefile.config | sed -e 's:^OSDIR=.*/os:os:'`; \ echo "$(UMASK) 022; $(CP) $(TOP)/$(SRC)/$${osdir}/os.h $(includedir)/"; \ $(UMASK) 022; $(CP) $(TOP)/$(SRC)/$${osdir}/os.h $(root)$(includedir)/ @echo "<=== [include]" 1.842 +17 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.841 retrieving revision 1.842 diff -u -r1.841 -r1.842 --- CHANGES 1998/05/09 18:28:29 1.841 +++ CHANGES 1998/05/10 13:04:25 1.842 @@ -9,6 +9,23 @@ CFLAGS for SCO 5. - update the "depend" targets in Makefile.tmpl files to use $(OSDIR), too. - updated the dependencies theirself + - removed not existing SHLIB variable from "clean" targets + - replaced SHLIB_OBJS/SHLIBS_OBJ consistently with OBJS_PIC because OBJS + already exists and OBJS_PIC are also just plain objects and have not + directly to do with "shared" things. The only difference is that they + contain PIC. So OBJS_PIC is the more canonical name. + - Updated the Makefile-dependency lines for OBJS_PIC + - Removed the Makefile-dependency line in Configure to avoid double + definitions + - replaced ugly xx-so.o/xx.so-o hack with a clean and consistent usage + of xxx.lo as GNU libtool does with its PIC objects + - reduce local complexity in modules Makefile.tmpl by moving the last + existing target "depend" to the generation section in Configure, too. + - removed the historical $(SPACER) which was used in the past together + with BROKEN_BPRINTF_FLAGS to avoid zig-zags in the build process. This + is no longer needed. + - force the build and run of the gen_xxx programs under main/ as the + first step before building the objects because it looks cleaner [Ralf S. Engelschall] *) WIN32: Make Win32 work again after the /dev/null DoS fix. 1.258 +15 -7 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.257 retrieving revision 1.258 diff -u -r1.257 -r1.258 --- Configure 1998/05/09 18:28:30 1.257 +++ Configure 1998/05/10 13:04:26 1.258 @@ -1698,11 +1698,11 @@ so=pp[3] split(pp[3], parts, ".") base=parts[1] - shlibsobj=shlibsobj " " base "-so.o" + objspic=objspic " " base ".lo" } END { printf "SHLIBS=%s\n", shlibs; - printf "SHLIBS_OBJ=%s\n", shlibsobj; + printf "OBJS_PIC=%s\n", objspic; }' $CAT << 'EOF' >> $moddir/Makefile @@ -1721,19 +1721,27 @@ .SUFFIXES: .o .so .c.o: - $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $< + $(CC) -c $(INCLUDES) $(CFLAGS) $< .c.so: - $(CC) -c $(INCLUDES) $(CFLAGS) $(CFLAGS_SHLIB) $(SPACER) $< && mv $*.o $*-so.o - $(LD) $(LDFLAGS_SHLIB) -o $@ $*-so.o + $(CC) -c $(INCLUDES) $(CFLAGS) $(CFLAGS_SHLIB) $< && mv $*.o $*.lo + $(LD) $(LDFLAGS_SHLIB) -o $@ $*.lo clean: - rm -f $(OBJS) $(SHLIBS) $(SHLIBS_OBJ) $(LIB) $(SHLIB) + rm -f $(LIB) $(OBJS) $(SHLIBS) $(OBJS_PIC)
cvs commit: apache-1.3/src/os/unix Makefile.tmpl
dgaudet 98/07/08 17:08:48 Modified:src Makefile.tmpl src/ap Makefile.tmpl src/main Makefile.tmpl src/modules/proxy Makefile.tmpl src/modules/standard Makefile.tmpl src/modules/test Makefile.tmpl src/os/unix Makefile.tmpl Log: update dependencies Revision ChangesPath 1.98 +5 -4 apache-1.3/src/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/src/Makefile.tmpl,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- Makefile.tmpl 1998/06/16 03:49:57 1.97 +++ Makefile.tmpl 1998/07/09 00:08:43 1.98 @@ -111,8 +111,9 @@ $(OBJS): Makefile # DO NOT REMOVE -buildmark.o: buildmark.c include/conf.h os/unix/os.h include/httpd.h \ - include/alloc.h include/buff.h include/ap.h include/util_uri.h +buildmark.o: buildmark.c include/conf.h os/unix/os.h include/apctype.h \ + include/hsregex.h include/httpd.h include/alloc.h include/buff.h \ + include/ap.h include/util_uri.h modules.o: modules.c include/httpd.h include/conf.h os/unix/os.h \ - include/alloc.h include/buff.h include/ap.h include/util_uri.h \ - include/http_config.h + include/apctype.h include/hsregex.h include/alloc.h include/buff.h \ + include/ap.h include/util_uri.h include/http_config.h 1.25 +10 -5 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.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- Makefile.tmpl 1998/06/19 21:02:33 1.24 +++ Makefile.tmpl 1998/07/09 00:08:43 1.25 @@ -40,17 +40,22 @@ # DO NOT REMOVE ap_cpystrn.o: ap_cpystrn.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ - $(OSDIR)/os.h $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ + $(OSDIR)/os.h $(INCDIR)/apctype.h $(INCDIR)/hsregex.h \ + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ $(INCDIR)/util_uri.h ap_execve.o: ap_execve.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ - $(OSDIR)/os.h $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ + $(OSDIR)/os.h $(INCDIR)/apctype.h $(INCDIR)/hsregex.h \ + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ $(INCDIR)/util_uri.h ap_signal.o: ap_signal.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ - $(OSDIR)/os.h $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ + $(OSDIR)/os.h $(INCDIR)/apctype.h $(INCDIR)/hsregex.h \ + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ $(INCDIR)/util_uri.h ap_slack.o: ap_slack.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ - $(OSDIR)/os.h $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ + $(OSDIR)/os.h $(INCDIR)/apctype.h $(INCDIR)/hsregex.h \ + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ $(INCDIR)/util_uri.h $(INCDIR)/http_log.h ap_snprintf.o: ap_snprintf.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ - $(OSDIR)/os.h $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ + $(OSDIR)/os.h $(INCDIR)/apctype.h $(INCDIR)/hsregex.h \ + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ $(INCDIR)/util_uri.h 1.29 +37 -22apache-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.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- Makefile.tmpl 1998/05/29 18:20:54 1.28 +++ Makefile.tmpl 1998/07/09 00:08:44 1.29 @@ -59,25 +59,30 @@ # DO NOT REMOVE alloc.o: alloc.c $(INCDIR)/httpd.h $(INCDIR)/conf.h $(OSDIR)/os.h \ - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ - $(INCDIR)/util_uri.h $(INCDIR)/multithread.h $(INCDIR)/http_log.h + $(INCDIR)/apctype.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \ + $(INCDIR)/multithread.h $(INCDIR)/http_log.h buff.o: buff.c $(INCDIR)/httpd.h $(INCDIR)/conf.h $(OSDIR)/os.h \ - $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ - $(INCDIR)/util_uri.h $(INCDIR)/http_main.h $(INCDIR)/http_log.h + $(INCDIR)/apctype.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \ + $(INCDIR)/http_main.h $(INCDIR)/http_log.h fnmatch.o: fnmatch.c $(INCDIR)/conf.h $(OSDIR)/os.h \ - $(INCDIR)/fnmatch.h + $(INCDIR)/apctype.h $(INCDIR)/hsregex.h $(INCDIR)/fnmatch.h gen_test_char.o: gen_test_char.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ - $(OSDIR)/os.h $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ + $(OSDIR)/os.h $(INCDIR)/apctype.h $(INCDIR)/hsregex.h \ + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ $(INCDIR)/util_uri.h gen_uri_delims.o: gen_uri_delims.c http_config.o: ht
cvs commit: apache-1.3/src/os/unix Makefile.tmpl
rse 98/07/12 02:19:26 Modified:src Makefile.tmpl src/ap Makefile.tmpl src/main Makefile.tmpl src/modules/example Makefile.tmpl src/modules/experimental Makefile.tmpl src/modules/proxy Makefile.tmpl src/modules/standard Makefile.tmpl src/os/unix Makefile.tmpl Log: Update dependencies after adding the new conf_auto.h header. Revision ChangesPath 1.100 +6 -6 apache-1.3/src/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/src/Makefile.tmpl,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- Makefile.tmpl 1998/07/11 11:41:06 1.99 +++ Makefile.tmpl 1998/07/12 09:19:09 1.100 @@ -112,9 +112,9 @@ $(OBJS): Makefile # DO NOT REMOVE -buildmark.o: buildmark.c include/conf.h os/unix/os.h include/apctype.h \ - include/hsregex.h include/httpd.h include/alloc.h include/buff.h \ - include/ap.h include/util_uri.h -modules.o: modules.c include/httpd.h include/conf.h os/unix/os.h \ - include/apctype.h include/hsregex.h include/alloc.h include/buff.h \ - include/ap.h include/util_uri.h include/http_config.h +buildmark.o: buildmark.c include/conf.h include/conf_auto.h \ + os/unix/os.h include/apctype.h include/httpd.h include/alloc.h \ + include/buff.h include/ap.h include/util_uri.h +modules.o: modules.c include/httpd.h include/conf.h \ + include/conf_auto.h os/unix/os.h include/apctype.h include/alloc.h \ + include/buff.h include/ap.h include/util_uri.h include/http_config.h 1.26 +5 -5 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.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- Makefile.tmpl 1998/07/09 00:08:43 1.25 +++ Makefile.tmpl 1998/07/12 09:19:13 1.26 @@ -40,22 +40,22 @@ # DO NOT REMOVE ap_cpystrn.o: ap_cpystrn.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ - $(OSDIR)/os.h $(INCDIR)/apctype.h $(INCDIR)/hsregex.h \ + $(INCDIR)/conf_auto.h $(OSDIR)/os.h $(INCDIR)/apctype.h \ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ $(INCDIR)/util_uri.h ap_execve.o: ap_execve.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ - $(OSDIR)/os.h $(INCDIR)/apctype.h $(INCDIR)/hsregex.h \ + $(INCDIR)/conf_auto.h $(OSDIR)/os.h $(INCDIR)/apctype.h \ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ $(INCDIR)/util_uri.h ap_signal.o: ap_signal.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ - $(OSDIR)/os.h $(INCDIR)/apctype.h $(INCDIR)/hsregex.h \ + $(INCDIR)/conf_auto.h $(OSDIR)/os.h $(INCDIR)/apctype.h \ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ $(INCDIR)/util_uri.h ap_slack.o: ap_slack.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ - $(OSDIR)/os.h $(INCDIR)/apctype.h $(INCDIR)/hsregex.h \ + $(INCDIR)/conf_auto.h $(OSDIR)/os.h $(INCDIR)/apctype.h \ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ $(INCDIR)/util_uri.h $(INCDIR)/http_log.h ap_snprintf.o: ap_snprintf.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ - $(OSDIR)/os.h $(INCDIR)/apctype.h $(INCDIR)/hsregex.h \ + $(INCDIR)/conf_auto.h $(OSDIR)/os.h $(INCDIR)/apctype.h \ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ $(INCDIR)/util_uri.h 1.30 +31 -30apache-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.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- Makefile.tmpl 1998/07/09 00:08:44 1.29 +++ Makefile.tmpl 1998/07/12 09:19:15 1.30 @@ -58,30 +58,30 @@ $(OBJS): Makefile # DO NOT REMOVE -alloc.o: alloc.c $(INCDIR)/httpd.h $(INCDIR)/conf.h $(OSDIR)/os.h \ - $(INCDIR)/apctype.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \ - $(INCDIR)/multithread.h $(INCDIR)/http_log.h -buff.o: buff.c $(INCDIR)/httpd.h $(INCDIR)/conf.h $(OSDIR)/os.h \ - $(INCDIR)/apctype.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ - $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \ - $(INCDIR)/http_main.h $(INCDIR)/http_log.h -fnmatch.o: fnmatch.c $(INCDIR)/conf.h $(OSDIR)/os.h \ - $(INCDIR)/apctype.h $(INCDIR)/hsregex.h $(INCDIR)/fnmatch.h +alloc.o: alloc.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ + $(INCDIR)/conf_auto.h $(OSDIR)/os.h $(INCDIR)/apctype.h \ + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \ + $(INCDIR)/util_uri.h $(INCDIR)/multithread.h $(INCDIR)/http_log.h +buff.o: buff.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \ + $(INCDIR)/conf_auto.h $(OSDIR)/os.h $(INCDIR)/apctype.h \ + $(INCDIR)/alloc.
cvs commit: apache-1.3/src/os/unix Makefile.tmpl
ben 98/09/06 12:24:28 Modified:src Makefile.tmpl src/ap Makefile.tmpl src/main Makefile.tmpl src/modules/standard Makefile.tmpl src/os/unix Makefile.tmpl Log: Update dependencies. Revision ChangesPath 1.104 +6 -5 apache-1.3/src/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/src/Makefile.tmpl,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- Makefile.tmpl 1998/07/25 11:30:18 1.103 +++ Makefile.tmpl 1998/09/06 19:24:25 1.104 @@ -111,10 +111,11 @@ $(OBJS): Makefile subdirs # DO NOT REMOVE -buildmark.o: buildmark.c include/ap_config.h include/ap_config_auto.h \ - os/unix/os.h include/ap_ctype.h include/hsregex.h include/httpd.h \ - include/alloc.h include/buff.h include/ap.h include/util_uri.h -modules.o: modules.c include/httpd.h include/ap_config.h \ +buildmark.o: buildmark.c include/ap_config.h include/ap_mmn.h \ include/ap_config_auto.h os/unix/os.h include/ap_ctype.h \ - include/hsregex.h include/alloc.h include/buff.h include/ap.h \ + include/httpd.h include/alloc.h include/buff.h include/ap.h \ + include/util_uri.h +modules.o: modules.c include/httpd.h include/ap_config.h \ + include/ap_mmn.h include/ap_config_auto.h os/unix/os.h \ + include/ap_ctype.h include/alloc.h include/buff.h include/ap.h \ include/util_uri.h include/http_config.h 1.29 +13 -13apache-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.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- Makefile.tmpl 1998/08/04 13:32:19 1.28 +++ Makefile.tmpl 1998/09/06 19:24:26 1.29 @@ -40,25 +40,25 @@ # DO NOT REMOVE ap_cpystrn.o: ap_cpystrn.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ - $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \ - $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \ + $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ + $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \ $(INCDIR)/ap.h $(INCDIR)/util_uri.h ap_execve.o: ap_execve.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ - $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \ - $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \ + $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ + $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \ $(INCDIR)/ap.h $(INCDIR)/util_uri.h -ap_signal.o: ap_signal.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ +ap_fnmatch.o: ap_fnmatch.c $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \ - $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \ + $(INCDIR)/fnmatch.h +ap_signal.o: ap_signal.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ + $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ + $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \ $(INCDIR)/ap.h $(INCDIR)/util_uri.h ap_slack.o: ap_slack.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ - $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \ - $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \ + $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ + $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \ $(INCDIR)/ap.h $(INCDIR)/util_uri.h $(INCDIR)/http_log.h ap_snprintf.o: ap_snprintf.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ - $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \ - $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \ + $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ + $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \ $(INCDIR)/ap.h $(INCDIR)/util_uri.h -ap_fnmatch.o: ap_fnmatch.c $(INCDIR)/ap_config.h \ - $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \ - $(INCDIR)/hsregex.h $(INCDIR)/fnmatch.h 1.33 +42 -40apache-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.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- Makefile.tmpl 1998/08/04 13:32:20 1.32 +++ Makefile.tmpl 1998/09/06 19:24:27 1.33 @@ -59,30 +59,31 @@ # DO NOT REMOVE alloc.o: alloc.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ - $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \ - $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \ + $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ + $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \ $(IN
cvs commit: apache-1.3/src/os/unix Makefile.tmpl
rse 98/09/06 23:59:36 Modified:src Makefile.tmpl src/ap Makefile.tmpl src/main Makefile.tmpl src/modules/example Makefile.tmpl src/modules/experimental Makefile.tmpl src/modules/proxy Makefile.tmpl src/modules/standard Makefile.tmpl src/os/unix Makefile.tmpl Log: Fix dependecies again, because Ben forgot to built with WANTHSREGEX, so we lost the regex.h deps we always had in the past. Revision ChangesPath 1.105 +4 -4 apache-1.3/src/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/src/Makefile.tmpl,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- Makefile.tmpl 1998/09/06 19:24:25 1.104 +++ Makefile.tmpl 1998/09/07 06:59:31 1.105 @@ -113,9 +113,9 @@ # DO NOT REMOVE buildmark.o: buildmark.c include/ap_config.h include/ap_mmn.h \ include/ap_config_auto.h os/unix/os.h include/ap_ctype.h \ - include/httpd.h include/alloc.h include/buff.h include/ap.h \ - include/util_uri.h + include/hsregex.h include/httpd.h include/alloc.h include/buff.h \ + include/ap.h include/util_uri.h modules.o: modules.c include/httpd.h include/ap_config.h \ include/ap_mmn.h include/ap_config_auto.h os/unix/os.h \ - include/ap_ctype.h include/alloc.h include/buff.h include/ap.h \ - include/util_uri.h include/http_config.h + include/ap_ctype.h include/hsregex.h include/alloc.h include/buff.h \ + include/ap.h include/util_uri.h include/http_config.h 1.30 +12 -11apache-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.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- Makefile.tmpl 1998/09/06 19:24:26 1.29 +++ Makefile.tmpl 1998/09/07 06:59:32 1.30 @@ -41,24 +41,25 @@ # DO NOT REMOVE ap_cpystrn.o: ap_cpystrn.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ - $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \ - $(INCDIR)/ap.h $(INCDIR)/util_uri.h + $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h ap_execve.o: ap_execve.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ - $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \ - $(INCDIR)/ap.h $(INCDIR)/util_uri.h + $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h ap_fnmatch.o: ap_fnmatch.c $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \ $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(INCDIR)/ap_ctype.h \ - $(INCDIR)/fnmatch.h + $(INCDIR)/hsregex.h $(INCDIR)/fnmatch.h ap_signal.o: ap_signal.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ - $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \ - $(INCDIR)/ap.h $(INCDIR)/util_uri.h + $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h ap_slack.o: ap_slack.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ - $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \ - $(INCDIR)/ap.h $(INCDIR)/util_uri.h $(INCDIR)/http_log.h + $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \ + $(INCDIR)/http_log.h ap_snprintf.o: ap_snprintf.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ - $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \ - $(INCDIR)/ap.h $(INCDIR)/util_uri.h + $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h 1.34 +59 -55apache-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.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- Makefile.tmpl 1998/09/06 19:24:27 1.33 +++ Makefile.tmpl 1998/09/07 06:59:33 1.34 @@ -60,46 +60,48 @@ # DO NOT REMOVE alloc.o: alloc.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \ $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \ - $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \ - $(INCDIR)/ap.h $(INCDIR)/util_uri.h $(INCDIR)/multithread.h \ - $(INCDIR)/http_log.h + $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \ + $(