httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@hyperreal.org
Subject cvs commit: apache-1.3/src/support Makefile.tmpl
Date Sun, 22 Feb 1998 04:37:20 GMT
coar        98/02/21 20:37:20

  Modified:    src      Makefile.tmpl
               src/ap   Makefile.tmpl
               src/main Makefile.tmpl
               src/modules/example Makefile.tmpl
               src/modules/experimental Makefile.tmpl
               src/modules/extra Makefile.tmpl
               src/modules/proxy Makefile.tmpl
               src/modules/standard Makefile.tmpl
               src/modules/test Makefile.tmpl
               src/os/unix Makefile.tmpl
               src/support Makefile.tmpl
  Log:
  	Somewhat reworked "make depend" rules, which result in
  	dependencies that use "$(INCDIR)" for the src/include
  	directory.  Why?  Because it makes it a lot easier to
  	spot exceptions (like the proxy's outbound includes of
  	mod_mime.h, et cetera).
  
  Revision  Changes    Path
  1.78      +11 -9     apache-1.3/src/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/Makefile.tmpl,v
  retrieving revision 1.77
  retrieving revision 1.78
  diff -u -r1.77 -r1.78
  --- Makefile.tmpl	1998/02/18 08:50:58	1.77
  +++ Makefile.tmpl	1998/02/22 04:37:08	1.78
  @@ -6,6 +6,7 @@
   CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
   LIBS=$(EXTRA_LIBS) $(LIBS1)
   INCLUDES=$(INCLUDES1) $(INCLUDES_DEPTH0) $(EXTRA_INCLUDES)
  +INCDIR=include
   LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
   
   OBJS= \
  @@ -51,12 +52,14 @@
   # gcc, and rebuilds Makefile.tmpl.  You have to re-run Configure after
   # using it.
   depend:
  -	sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \
  -	    && $(CC) -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
  -	    && mv Makefile.tmpl Makefile.tmpl.bak \
  -	    && mv Makefile.new Makefile.tmpl
  +	cp Makefile.tmpl Makefile.tmpl.bak \
  +	    && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \
  +	    && gcc -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
  +	    && sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' Makefile.new \
  +		> Makefile.tmpl \
  +	    && rm Makefile.new
   	for i in $(SUBDIRS); do \
  -	    ( cd $$i && $(MAKE) CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)' depend)
|| exit 1; \
  +	    ( cd $$i && $(MAKE) CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)' depend
) || exit 1; \
   	done
   
   #Dependencies
  @@ -65,7 +68,6 @@
   
   # DO NOT REMOVE
   buildmark.o: buildmark.c
  -modules.o: modules.c include/httpd.h include/conf.h os/unix/os.h \
  - include/hsregex.h include/alloc.h include/buff.h include/ap.h \
  - include/http_config.h
  -tt.o: tt.c
  +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)/http_config.h
  
  
  
  1.13      +23 -21    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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Makefile.tmpl	1998/02/12 10:15:18	1.12
  +++ Makefile.tmpl	1998/02/22 04:37:09	1.13
  @@ -28,26 +28,28 @@
   # gcc, and rebuilds Makefile.tmpl.  You have to re-run Configure after
   # using it.
   depend:
  -	sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \
  -	    && $(CC) -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
  -	    && mv Makefile.tmpl Makefile.tmpl.bak \
  -	    && mv Makefile.new Makefile.tmpl
  +	cp Makefile.tmpl Makefile.tmpl.bak \
  +	    && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \
  +	    && gcc -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
  +	    && sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' Makefile.new \
  +		> Makefile.tmpl \
  +	    && rm Makefile.new
   
   # DO NOT REMOVE
  -ap_cpystrn.o: ap_cpystrn.c ../include/httpd.h ../include/conf.h \
  - ../os/unix/os.h ../include/hsregex.h ../include/alloc.h \
  - ../include/buff.h ../include/ap.h
  -ap_execve.o: ap_execve.c ../include/httpd.h ../include/conf.h \
  - ../os/unix/os.h ../include/hsregex.h ../include/alloc.h \
  - ../include/buff.h ../include/ap.h ../include/http_log.h
  -ap_signal.o: ap_signal.c ../include/httpd.h ../include/conf.h \
  - ../os/unix/os.h ../include/hsregex.h ../include/alloc.h \
  - ../include/buff.h ../include/ap.h
  -ap_slack.o: ap_slack.c ../include/httpd.h ../include/conf.h \
  - ../os/unix/os.h ../include/hsregex.h ../include/alloc.h \
  - ../include/buff.h ../include/ap.h ../include/http_log.h
  -ap_snprintf.o: ap_snprintf.c ../include/conf.h ../os/unix/os.h \
  - ../include/hsregex.h
  -ap_strings.o: ap_strings.c ../include/httpd.h ../include/conf.h \
  - ../os/unix/os.h ../include/hsregex.h ../include/alloc.h \
  - ../include/buff.h ../include/ap.h
  +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
  +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
  +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
  +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)/http_log.h
  +ap_snprintf.o: ap_snprintf.c $(INCDIR)/conf.h ../os/unix/os.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
  
  
  
  1.11      +85 -83    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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Makefile.tmpl	1998/02/12 10:15:19	1.10
  +++ Makefile.tmpl	1998/02/22 04:37:10	1.11
  @@ -37,92 +37,94 @@
   # gcc, and rebuilds Makefile.tmpl.  You have to re-run Configure after
   # using it.
   depend:
  -	sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \
  -	    && $(CC) -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
  -	    && mv Makefile.tmpl Makefile.tmpl.bak \
  -	    && mv Makefile.new Makefile.tmpl
  +	cp Makefile.tmpl Makefile.tmpl.bak \
  +	    && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \
  +	    && gcc -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
  +	    && sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' Makefile.new \
  +		> Makefile.tmpl \
  +	    && rm Makefile.new
   
   #Dependencies
   
   $(OBJS): Makefile
   
   # DO NOT REMOVE
  -alloc.o: alloc.c ../include/httpd.h ../include/conf.h ../os/unix/os.h \
  - ../include/hsregex.h ../include/alloc.h ../include/buff.h \
  - ../include/ap.h ../include/multithread.h ../include/http_log.h
  -buff.o: buff.c ../include/httpd.h ../include/conf.h ../os/unix/os.h \
  - ../include/hsregex.h ../include/alloc.h ../include/buff.h \
  - ../include/ap.h ../include/http_main.h ../include/http_log.h
  -explain.o: explain.c ../include/httpd.h ../include/conf.h \
  - ../os/unix/os.h ../include/hsregex.h ../include/alloc.h \
  - ../include/buff.h ../include/ap.h ../include/explain.h
  -fnmatch.o: fnmatch.c ../include/fnmatch.h
  -http_bprintf.o: http_bprintf.c ../include/httpd.h ../include/conf.h \
  - ../os/unix/os.h ../include/hsregex.h ../include/alloc.h \
  - ../include/buff.h ../include/ap.h
  -http_config.o: http_config.c ../include/httpd.h ../include/conf.h \
  - ../os/unix/os.h ../include/hsregex.h ../include/alloc.h \
  - ../include/buff.h ../include/ap.h ../include/http_config.h \
  - ../include/http_core.h ../include/http_log.h \
  - ../include/http_request.h ../include/http_conf_globals.h \
  - ../include/http_vhost.h ../include/explain.h
  -http_core.o: http_core.c ../include/httpd.h ../include/conf.h \
  - ../os/unix/os.h ../include/hsregex.h ../include/alloc.h \
  - ../include/buff.h ../include/ap.h ../include/http_config.h \
  - ../include/http_core.h ../include/http_protocol.h \
  - ../include/http_request.h ../include/http_conf_globals.h \
  - ../include/http_vhost.h ../include/http_main.h ../include/http_log.h \
  - ../include/rfc1413.h ../include/util_md5.h ../include/md5.h \
  - ../include/scoreboard.h ../include/fnmatch.h
  -http_log.o: http_log.c ../include/httpd.h ../include/conf.h \
  - ../os/unix/os.h ../include/hsregex.h ../include/alloc.h \
  - ../include/buff.h ../include/ap.h ../include/http_config.h \
  - ../include/http_core.h ../include/http_log.h ../include/http_main.h
  -http_main.o: http_main.c ../include/httpd.h ../include/conf.h \
  - ../os/unix/os.h ../include/hsregex.h ../include/alloc.h \
  - ../include/buff.h ../include/ap.h ../include/http_main.h \
  - ../include/http_log.h ../include/http_config.h \
  - ../include/http_protocol.h ../include/http_request.h \
  - ../include/http_conf_globals.h ../include/http_core.h \
  - ../include/http_vhost.h ../include/util_script.h \
  - ../include/scoreboard.h ../include/multithread.h ../include/explain.h
  -http_protocol.o: http_protocol.c ../include/httpd.h ../include/conf.h \
  - ../os/unix/os.h ../include/hsregex.h ../include/alloc.h \
  - ../include/buff.h ../include/ap.h ../include/http_config.h \
  - ../include/http_core.h ../include/http_protocol.h \
  - ../include/http_main.h ../include/http_request.h \
  - ../include/http_vhost.h ../include/http_log.h ../include/util_date.h \
  - ../include/http_conf_globals.h
  -http_request.o: http_request.c ../include/httpd.h ../include/conf.h \
  - ../os/unix/os.h ../include/hsregex.h ../include/alloc.h \
  - ../include/buff.h ../include/ap.h ../include/http_config.h \
  - ../include/http_request.h ../include/http_core.h \
  - ../include/http_protocol.h ../include/http_log.h \
  - ../include/http_main.h ../include/scoreboard.h ../include/fnmatch.h
  -http_vhost.o: http_vhost.c ../include/httpd.h ../include/conf.h \
  - ../os/unix/os.h ../include/hsregex.h ../include/alloc.h \
  - ../include/buff.h ../include/ap.h ../include/http_config.h \
  - ../include/http_conf_globals.h ../include/http_log.h \
  - ../include/http_vhost.h ../include/http_protocol.h
  -md5c.o: md5c.c ../include/conf.h ../os/unix/os.h ../include/hsregex.h \
  - ../include/md5.h
  -rfc1413.o: rfc1413.c ../include/httpd.h ../include/conf.h \
  - ../os/unix/os.h ../include/hsregex.h ../include/alloc.h \
  - ../include/buff.h ../include/ap.h ../include/http_log.h \
  - ../include/rfc1413.h ../include/http_main.h
  -util.o: util.c ../include/httpd.h ../include/conf.h ../os/unix/os.h \
  - ../include/hsregex.h ../include/alloc.h ../include/buff.h \
  - ../include/ap.h ../include/http_conf_globals.h ../include/http_log.h
  -util_date.o: util_date.c ../include/conf.h ../os/unix/os.h \
  - ../include/hsregex.h ../include/util_date.h
  -util_md5.o: util_md5.c ../include/httpd.h ../include/conf.h \
  - ../os/unix/os.h ../include/hsregex.h ../include/alloc.h \
  - ../include/buff.h ../include/ap.h ../include/util_md5.h \
  - ../include/md5.h
  -util_script.o: util_script.c ../include/httpd.h ../include/conf.h \
  - ../os/unix/os.h ../include/hsregex.h ../include/alloc.h \
  - ../include/buff.h ../include/ap.h ../include/http_config.h \
  - ../include/http_conf_globals.h ../include/http_main.h \
  - ../include/http_log.h ../include/http_protocol.h \
  - ../include/http_core.h ../include/http_request.h \
  - ../include/util_script.h ../include/util_date.h
  +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)/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)/http_main.h $(INCDIR)/http_log.h
  +explain.o: explain.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
  + ../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
  + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/explain.h
  +fnmatch.o: fnmatch.c $(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
  +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)/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
  +http_core.o: http_core.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
  + ../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
  + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/http_config.h \
  + $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \
  + $(INCDIR)/http_request.h $(INCDIR)/http_conf_globals.h \
  + $(INCDIR)/http_vhost.h $(INCDIR)/http_main.h $(INCDIR)/http_log.h \
  + $(INCDIR)/rfc1413.h $(INCDIR)/util_md5.h $(INCDIR)/md5.h \
  + $(INCDIR)/scoreboard.h $(INCDIR)/fnmatch.h
  +http_log.o: http_log.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
  + ../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
  + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/http_config.h \
  + $(INCDIR)/http_core.h $(INCDIR)/http_log.h $(INCDIR)/http_main.h
  +http_main.o: http_main.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
  + ../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
  + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/http_main.h \
  + $(INCDIR)/http_log.h $(INCDIR)/http_config.h \
  + $(INCDIR)/http_protocol.h $(INCDIR)/http_request.h \
  + $(INCDIR)/http_conf_globals.h $(INCDIR)/http_core.h \
  + $(INCDIR)/http_vhost.h $(INCDIR)/util_script.h \
  + $(INCDIR)/scoreboard.h $(INCDIR)/multithread.h $(INCDIR)/explain.h
  +http_protocol.o: http_protocol.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
  + ../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
  + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/http_config.h \
  + $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \
  + $(INCDIR)/http_main.h $(INCDIR)/http_request.h \
  + $(INCDIR)/http_vhost.h $(INCDIR)/http_log.h $(INCDIR)/util_date.h \
  + $(INCDIR)/http_conf_globals.h
  +http_request.o: http_request.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
  + ../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
  + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/http_config.h \
  + $(INCDIR)/http_request.h $(INCDIR)/http_core.h \
  + $(INCDIR)/http_protocol.h $(INCDIR)/http_log.h \
  + $(INCDIR)/http_main.h $(INCDIR)/scoreboard.h $(INCDIR)/fnmatch.h
  +http_vhost.o: http_vhost.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
  + ../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
  + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/http_config.h \
  + $(INCDIR)/http_conf_globals.h $(INCDIR)/http_log.h \
  + $(INCDIR)/http_vhost.h $(INCDIR)/http_protocol.h
  +md5c.o: md5c.c $(INCDIR)/conf.h ../os/unix/os.h $(INCDIR)/hsregex.h \
  + $(INCDIR)/md5.h
  +rfc1413.o: rfc1413.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
  + ../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
  + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/http_log.h \
  + $(INCDIR)/rfc1413.h $(INCDIR)/http_main.h
  +util.o: util.c $(INCDIR)/httpd.h $(INCDIR)/conf.h ../os/unix/os.h \
  + $(INCDIR)/hsregex.h $(INCDIR)/alloc.h $(INCDIR)/buff.h \
  + $(INCDIR)/ap.h $(INCDIR)/http_conf_globals.h $(INCDIR)/http_log.h
  +util_date.o: util_date.c $(INCDIR)/conf.h ../os/unix/os.h \
  + $(INCDIR)/hsregex.h $(INCDIR)/util_date.h
  +util_md5.o: util_md5.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_md5.h \
  + $(INCDIR)/md5.h
  +util_script.o: util_script.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
  + ../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
  + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/http_config.h \
  + $(INCDIR)/http_conf_globals.h $(INCDIR)/http_main.h \
  + $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \
  + $(INCDIR)/http_core.h $(INCDIR)/http_request.h \
  + $(INCDIR)/util_script.h $(INCDIR)/util_date.h
  
  
  
  1.3       +7 -4      apache-1.3/src/modules/example/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/example/Makefile.tmpl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Makefile.tmpl	1998/02/12 10:15:20	1.2
  +++ Makefile.tmpl	1998/02/22 04:37:13	1.3
  @@ -1,13 +1,16 @@
   # default Makefile.tmpl to force Configure to create a Makefile
  +INCDIR=../../include
   
   # 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.
   depend:
  -	sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \
  -	    && $(CC) -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
  -	    && mv Makefile.tmpl Makefile.tmpl.bak \
  -	    && mv Makefile.new Makefile.tmpl
  +	cp Makefile.tmpl Makefile.tmpl.bak \
  +	    && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \
  +	    && gcc -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
  +	    && sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' Makefile.new \
  +		> Makefile.tmpl \
  +	    && rm Makefile.new
   
   #Dependencies
   
  
  
  
  1.3       +7 -4      apache-1.3/src/modules/experimental/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/experimental/Makefile.tmpl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Makefile.tmpl	1998/02/12 10:15:21	1.2
  +++ Makefile.tmpl	1998/02/22 04:37:14	1.3
  @@ -1,13 +1,16 @@
   # default Makefile.tmpl to force Configure to create a Makefile
  +INCDIR=../../include
   
   # 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.
   depend:
  -	sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \
  -	    && $(CC) -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
  -	    && mv Makefile.tmpl Makefile.tmpl.bak \
  -	    && mv Makefile.new Makefile.tmpl
  +	cp Makefile.tmpl Makefile.tmpl.bak \
  +	    && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \
  +	    && gcc -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
  +	    && sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' Makefile.new \
  +		> Makefile.tmpl \
  +	    && rm Makefile.new
   
   #Dependencies
   
  
  
  
  1.3       +7 -4      apache-1.3/src/modules/extra/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/extra/Makefile.tmpl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Makefile.tmpl	1998/02/12 10:15:22	1.2
  +++ Makefile.tmpl	1998/02/22 04:37:15	1.3
  @@ -1,13 +1,16 @@
   # default Makefile.tmpl to force Configure to create a Makefile
  +INCDIR=../../include
   
   # 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.
   depend:
  -	sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \
  -	    && $(CC) -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
  -	    && mv Makefile.tmpl Makefile.tmpl.bak \
  -	    && mv Makefile.new Makefile.tmpl
  +	cp Makefile.tmpl Makefile.tmpl.bak \
  +	    && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \
  +	    && gcc -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
  +	    && sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' Makefile.new \
  +		> Makefile.tmpl \
  +	    && rm Makefile.new
   
   #Dependencies
   
  
  
  
  1.3       +8 -5      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Makefile.tmpl	1998/02/12 10:15:24	1.2
  +++ Makefile.tmpl	1998/02/22 04:37:16	1.3
  @@ -1,6 +1,7 @@
   LIB=libproxy.a
   OBJS=mod_proxy.o proxy_cache.o proxy_connect.o proxy_ftp.o proxy_http.o \
  -proxy_util.o
  +	proxy_util.o
  +INCDIR=../../include
   
   all:	$(LIB)
   
  @@ -19,10 +20,12 @@
   # gcc, and rebuilds Makefile.tmpl.  You have to re-run Configure after
   # using it.
   depend:
  -	sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \
  -	    && $(CC) -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
  -	    && mv Makefile.tmpl Makefile.tmpl.bak \
  -	    && mv Makefile.new Makefile.tmpl
  +	cp Makefile.tmpl Makefile.tmpl.bak \
  +	    && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \
  +	    && gcc -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
  +	    && sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' Makefile.new \
  +		> Makefile.tmpl \
  +	    && rm Makefile.new
   
   #Dependencies
   
  
  
  
  1.7       +177 -173  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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Makefile.tmpl	1998/02/12 10:15:25	1.6
  +++ Makefile.tmpl	1998/02/22 04:37:17	1.7
  @@ -1,184 +1,188 @@
  +INCDIR=../../include
  +
   # 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.
   depend:
  -	sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \
  -	    && $(CC) -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
  -	    && mv Makefile.tmpl Makefile.tmpl.bak \
  -	    && mv Makefile.new Makefile.tmpl
  +	cp Makefile.tmpl Makefile.tmpl.bak \
  +	    && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \
  +	    && gcc -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
  +	    && sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' Makefile.new \
  +		> Makefile.tmpl \
  +	    && rm Makefile.new
   
   #Dependencies
   
   $(OBJS): Makefile
   
   # DO NOT REMOVE
  -mod_access.o: mod_access.c ../../include/httpd.h ../../include/conf.h \
  - ../../os/unix/os.h ../../include/hsregex.h ../../include/alloc.h \
  - ../../include/buff.h ../../include/ap.h ../../include/http_core.h \
  - ../../include/http_config.h ../../include/http_log.h \
  - ../../include/http_request.h
  -mod_actions.o: mod_actions.c ../../include/httpd.h \
  - ../../include/conf.h ../../os/unix/os.h ../../include/hsregex.h \
  - ../../include/alloc.h ../../include/buff.h ../../include/ap.h \
  - ../../include/http_config.h ../../include/http_request.h \
  - ../../include/http_core.h ../../include/http_protocol.h \
  - ../../include/http_main.h ../../include/http_log.h \
  - ../../include/util_script.h
  -mod_alias.o: mod_alias.c ../../include/httpd.h ../../include/conf.h \
  - ../../os/unix/os.h ../../include/hsregex.h ../../include/alloc.h \
  - ../../include/buff.h ../../include/ap.h ../../include/http_config.h
  -mod_asis.o: mod_asis.c ../../include/httpd.h ../../include/conf.h \
  - ../../os/unix/os.h ../../include/hsregex.h ../../include/alloc.h \
  - ../../include/buff.h ../../include/ap.h ../../include/http_config.h \
  - ../../include/http_protocol.h ../../include/http_log.h \
  - ../../include/util_script.h ../../include/http_main.h \
  - ../../include/http_request.h
  -mod_auth.o: mod_auth.c ../../include/httpd.h ../../include/conf.h \
  - ../../os/unix/os.h ../../include/hsregex.h ../../include/alloc.h \
  - ../../include/buff.h ../../include/ap.h ../../include/http_config.h \
  - ../../include/http_core.h ../../include/http_log.h \
  - ../../include/http_protocol.h
  -mod_auth_anon.o: mod_auth_anon.c ../../include/httpd.h \
  - ../../include/conf.h ../../os/unix/os.h ../../include/hsregex.h \
  - ../../include/alloc.h ../../include/buff.h ../../include/ap.h \
  - ../../include/http_config.h ../../include/http_core.h \
  - ../../include/http_log.h ../../include/http_protocol.h \
  - ../../include/http_request.h
  -mod_auth_db.o: mod_auth_db.c ../../include/httpd.h \
  - ../../include/conf.h ../../os/unix/os.h ../../include/hsregex.h \
  - ../../include/alloc.h ../../include/buff.h ../../include/ap.h \
  - ../../include/http_config.h ../../include/http_core.h \
  - ../../include/http_log.h ../../include/http_protocol.h
  -mod_auth_dbm.o: mod_auth_dbm.c ../../include/httpd.h \
  - ../../include/conf.h ../../os/unix/os.h ../../include/hsregex.h \
  - ../../include/alloc.h ../../include/buff.h ../../include/ap.h \
  - ../../include/http_config.h ../../include/http_core.h \
  - ../../include/http_log.h ../../include/http_protocol.h
  -mod_autoindex.o: mod_autoindex.c ../../include/httpd.h \
  - ../../include/conf.h ../../os/unix/os.h ../../include/hsregex.h \
  - ../../include/alloc.h ../../include/buff.h ../../include/ap.h \
  - ../../include/http_config.h ../../include/http_core.h \
  - ../../include/http_request.h ../../include/http_protocol.h \
  - ../../include/http_log.h ../../include/http_main.h \
  - ../../include/util_script.h
  -mod_cern_meta.o: mod_cern_meta.c ../../include/httpd.h \
  - ../../include/conf.h ../../os/unix/os.h ../../include/hsregex.h \
  - ../../include/alloc.h ../../include/buff.h ../../include/ap.h \
  - ../../include/http_config.h ../../include/util_script.h \
  - ../../include/http_log.h ../../include/http_request.h
  -mod_cgi.o: mod_cgi.c ../../include/httpd.h ../../include/conf.h \
  - ../../os/unix/os.h ../../include/hsregex.h ../../include/alloc.h \
  - ../../include/buff.h ../../include/ap.h ../../include/http_config.h \
  - ../../include/http_request.h ../../include/http_core.h \
  - ../../include/http_protocol.h ../../include/http_main.h \
  - ../../include/http_log.h ../../include/util_script.h \
  - ../../include/http_conf_globals.h
  -mod_digest.o: mod_digest.c ../../include/httpd.h ../../include/conf.h \
  - ../../os/unix/os.h ../../include/hsregex.h ../../include/alloc.h \
  - ../../include/buff.h ../../include/ap.h ../../include/http_config.h \
  - ../../include/http_core.h ../../include/http_log.h \
  - ../../include/http_protocol.h ../../include/util_md5.h \
  - ../../include/md5.h
  -mod_dir.o: mod_dir.c ../../include/httpd.h ../../include/conf.h \
  - ../../os/unix/os.h ../../include/hsregex.h ../../include/alloc.h \
  - ../../include/buff.h ../../include/ap.h ../../include/http_config.h \
  - ../../include/http_core.h ../../include/http_request.h \
  - ../../include/http_protocol.h ../../include/http_log.h \
  - ../../include/http_main.h ../../include/util_script.h
  -mod_env.o: mod_env.c ../../include/httpd.h ../../include/conf.h \
  - ../../os/unix/os.h ../../include/hsregex.h ../../include/alloc.h \
  - ../../include/buff.h ../../include/ap.h ../../include/http_config.h
  -mod_expires.o: mod_expires.c ../../include/httpd.h \
  - ../../include/conf.h ../../os/unix/os.h ../../include/hsregex.h \
  - ../../include/alloc.h ../../include/buff.h ../../include/ap.h \
  - ../../include/http_config.h ../../include/http_log.h
  -mod_headers.o: mod_headers.c ../../include/httpd.h \
  - ../../include/conf.h ../../os/unix/os.h ../../include/hsregex.h \
  - ../../include/alloc.h ../../include/buff.h ../../include/ap.h \
  - ../../include/http_config.h
  -mod_imap.o: mod_imap.c ../../include/httpd.h ../../include/conf.h \
  - ../../os/unix/os.h ../../include/hsregex.h ../../include/alloc.h \
  - ../../include/buff.h ../../include/ap.h ../../include/http_config.h \
  - ../../include/http_request.h ../../include/http_core.h \
  - ../../include/http_protocol.h ../../include/http_main.h \
  - ../../include/http_log.h ../../include/util_script.h
  -mod_include.o: mod_include.c ../../include/httpd.h \
  - ../../include/conf.h ../../os/unix/os.h ../../include/hsregex.h \
  - ../../include/alloc.h ../../include/buff.h ../../include/ap.h \
  - ../../include/http_config.h ../../include/http_request.h \
  - ../../include/http_core.h ../../include/http_protocol.h \
  - ../../include/http_log.h ../../include/http_main.h \
  - ../../include/util_script.h
  -mod_info.o: mod_info.c ../../include/httpd.h ../../include/conf.h \
  - ../../os/unix/os.h ../../include/hsregex.h ../../include/alloc.h \
  - ../../include/buff.h ../../include/ap.h ../../include/http_config.h \
  - ../../include/http_core.h ../../include/http_log.h \
  - ../../include/http_main.h ../../include/http_protocol.h \
  - ../../include/util_script.h ../../include/http_conf_globals.h
  -mod_log_agent.o: mod_log_agent.c ../../include/httpd.h \
  - ../../include/conf.h ../../os/unix/os.h ../../include/hsregex.h \
  - ../../include/alloc.h ../../include/buff.h ../../include/ap.h \
  - ../../include/http_config.h
  -mod_log_config.o: mod_log_config.c ../../include/httpd.h \
  - ../../include/conf.h ../../os/unix/os.h ../../include/hsregex.h \
  - ../../include/alloc.h ../../include/buff.h ../../include/ap.h \
  - ../../include/http_config.h ../../include/http_core.h \
  - ../../include/http_log.h
  -mod_log_referer.o: mod_log_referer.c ../../include/httpd.h \
  - ../../include/conf.h ../../os/unix/os.h ../../include/hsregex.h \
  - ../../include/alloc.h ../../include/buff.h ../../include/ap.h \
  - ../../include/http_config.h
  -mod_mime.o: mod_mime.c ../../include/httpd.h ../../include/conf.h \
  - ../../os/unix/os.h ../../include/hsregex.h ../../include/alloc.h \
  - ../../include/buff.h ../../include/ap.h ../../include/http_config.h \
  +mod_access.o: mod_access.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
  + ../../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
  + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/http_core.h \
  + $(INCDIR)/http_config.h $(INCDIR)/http_log.h \
  + $(INCDIR)/http_request.h
  +mod_actions.o: mod_actions.c $(INCDIR)/httpd.h \
  + $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/http_config.h $(INCDIR)/http_request.h \
  + $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \
  + $(INCDIR)/http_main.h $(INCDIR)/http_log.h \
  + $(INCDIR)/util_script.h
  +mod_alias.o: mod_alias.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
  + ../../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
  + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/http_config.h
  +mod_asis.o: mod_asis.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
  + ../../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
  + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/http_config.h \
  + $(INCDIR)/http_protocol.h $(INCDIR)/http_log.h \
  + $(INCDIR)/util_script.h $(INCDIR)/http_main.h \
  + $(INCDIR)/http_request.h
  +mod_auth.o: mod_auth.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
  + ../../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
  + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/http_config.h \
  + $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
  + $(INCDIR)/http_protocol.h
  +mod_auth_anon.o: mod_auth_anon.c $(INCDIR)/httpd.h \
  + $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/http_config.h $(INCDIR)/http_core.h \
  + $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \
  + $(INCDIR)/http_request.h
  +mod_auth_db.o: mod_auth_db.c $(INCDIR)/httpd.h \
  + $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/http_config.h $(INCDIR)/http_core.h \
  + $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h
  +mod_auth_dbm.o: mod_auth_dbm.c $(INCDIR)/httpd.h \
  + $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/http_config.h $(INCDIR)/http_core.h \
  + $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h
  +mod_autoindex.o: mod_autoindex.c $(INCDIR)/httpd.h \
  + $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/http_config.h $(INCDIR)/http_core.h \
  + $(INCDIR)/http_request.h $(INCDIR)/http_protocol.h \
  + $(INCDIR)/http_log.h $(INCDIR)/http_main.h \
  + $(INCDIR)/util_script.h
  +mod_cern_meta.o: mod_cern_meta.c $(INCDIR)/httpd.h \
  + $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/http_config.h $(INCDIR)/util_script.h \
  + $(INCDIR)/http_log.h $(INCDIR)/http_request.h
  +mod_cgi.o: mod_cgi.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
  + ../../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
  + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/http_config.h \
  + $(INCDIR)/http_request.h $(INCDIR)/http_core.h \
  + $(INCDIR)/http_protocol.h $(INCDIR)/http_main.h \
  + $(INCDIR)/http_log.h $(INCDIR)/util_script.h \
  + $(INCDIR)/http_conf_globals.h
  +mod_digest.o: mod_digest.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
  + ../../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
  + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/http_config.h \
  + $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
  + $(INCDIR)/http_protocol.h $(INCDIR)/util_md5.h \
  + $(INCDIR)/md5.h
  +mod_dir.o: mod_dir.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
  + ../../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
  + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/http_config.h \
  + $(INCDIR)/http_core.h $(INCDIR)/http_request.h \
  + $(INCDIR)/http_protocol.h $(INCDIR)/http_log.h \
  + $(INCDIR)/http_main.h $(INCDIR)/util_script.h
  +mod_env.o: mod_env.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
  + ../../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
  + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/http_config.h
  +mod_expires.o: mod_expires.c $(INCDIR)/httpd.h \
  + $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/http_config.h $(INCDIR)/http_log.h
  +mod_headers.o: mod_headers.c $(INCDIR)/httpd.h \
  + $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/http_config.h
  +mod_imap.o: mod_imap.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
  + ../../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
  + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/http_config.h \
  + $(INCDIR)/http_request.h $(INCDIR)/http_core.h \
  + $(INCDIR)/http_protocol.h $(INCDIR)/http_main.h \
  + $(INCDIR)/http_log.h $(INCDIR)/util_script.h
  +mod_include.o: mod_include.c $(INCDIR)/httpd.h \
  + $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/http_config.h $(INCDIR)/http_request.h \
  + $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \
  + $(INCDIR)/http_log.h $(INCDIR)/http_main.h \
  + $(INCDIR)/util_script.h
  +mod_info.o: mod_info.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
  + ../../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
  + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/http_config.h \
  + $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
  + $(INCDIR)/http_main.h $(INCDIR)/http_protocol.h \
  + $(INCDIR)/util_script.h $(INCDIR)/http_conf_globals.h
  +mod_log_agent.o: mod_log_agent.c $(INCDIR)/httpd.h \
  + $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/http_config.h
  +mod_log_config.o: mod_log_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)/http_config.h $(INCDIR)/http_core.h \
  + $(INCDIR)/http_log.h
  +mod_log_referer.o: mod_log_referer.c $(INCDIR)/httpd.h \
  + $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/http_config.h
  +mod_mime.o: mod_mime.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
  + ../../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
  + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/http_config.h \
    mod_mime.h
  -mod_mime_magic.o: mod_mime_magic.c ../../include/httpd.h \
  - ../../include/conf.h ../../os/unix/os.h ../../include/hsregex.h \
  - ../../include/alloc.h ../../include/buff.h ../../include/ap.h \
  - ../../include/http_config.h ../../include/http_request.h \
  - ../../include/http_core.h ../../include/http_log.h \
  - ../../include/http_protocol.h
  -mod_negotiation.o: mod_negotiation.c ../../include/httpd.h \
  - ../../include/conf.h ../../os/unix/os.h ../../include/hsregex.h \
  - ../../include/alloc.h ../../include/buff.h ../../include/ap.h \
  - ../../include/http_config.h ../../include/http_request.h \
  - ../../include/http_core.h ../../include/http_log.h \
  - ../../include/util_script.h
  -mod_rewrite.o: mod_rewrite.c ../../include/httpd.h \
  - ../../include/conf.h ../../os/unix/os.h ../../include/hsregex.h \
  - ../../include/alloc.h ../../include/buff.h ../../include/ap.h \
  - ../../include/http_config.h ../../include/http_request.h \
  - ../../include/http_core.h ../../include/http_log.h mod_rewrite.h
  -mod_setenvif.o: mod_setenvif.c ../../include/httpd.h \
  - ../../include/conf.h ../../os/unix/os.h ../../include/hsregex.h \
  - ../../include/alloc.h ../../include/buff.h ../../include/ap.h \
  - ../../include/http_config.h ../../include/http_core.h \
  - ../../include/http_log.h
  -mod_so.o: mod_so.c ../../include/httpd.h ../../include/conf.h \
  - ../../os/unix/os.h ../../include/hsregex.h ../../include/alloc.h \
  - ../../include/buff.h ../../include/ap.h ../../include/http_config.h \
  - ../../include/http_log.h
  -mod_speling.o: mod_speling.c ../../include/httpd.h \
  - ../../include/conf.h ../../os/unix/os.h ../../include/hsregex.h \
  - ../../include/alloc.h ../../include/buff.h ../../include/ap.h \
  - ../../include/http_core.h ../../include/http_config.h \
  - ../../include/http_log.h
  -mod_status.o: mod_status.c ../../include/httpd.h ../../include/conf.h \
  - ../../os/unix/os.h ../../include/hsregex.h ../../include/alloc.h \
  - ../../include/buff.h ../../include/ap.h ../../include/http_config.h \
  - ../../include/http_core.h ../../include/http_protocol.h \
  - ../../include/http_main.h ../../include/util_script.h \
  - ../../include/scoreboard.h ../../include/http_log.h
  -mod_unique_id.o: mod_unique_id.c ../../include/httpd.h \
  - ../../include/conf.h ../../os/unix/os.h ../../include/hsregex.h \
  - ../../include/alloc.h ../../include/buff.h ../../include/ap.h \
  - ../../include/http_config.h ../../include/http_log.h \
  - ../../include/multithread.h
  -mod_userdir.o: mod_userdir.c ../../include/httpd.h \
  - ../../include/conf.h ../../os/unix/os.h ../../include/hsregex.h \
  - ../../include/alloc.h ../../include/buff.h ../../include/ap.h \
  - ../../include/http_config.h
  -mod_usertrack.o: mod_usertrack.c ../../include/httpd.h \
  - ../../include/conf.h ../../os/unix/os.h ../../include/hsregex.h \
  - ../../include/alloc.h ../../include/buff.h ../../include/ap.h \
  - ../../include/http_config.h ../../include/http_core.h
  +mod_mime_magic.o: mod_mime_magic.c $(INCDIR)/httpd.h \
  + $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/http_config.h $(INCDIR)/http_request.h \
  + $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
  + $(INCDIR)/http_protocol.h
  +mod_negotiation.o: mod_negotiation.c $(INCDIR)/httpd.h \
  + $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/http_config.h $(INCDIR)/http_request.h \
  + $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
  + $(INCDIR)/util_script.h
  +mod_rewrite.o: mod_rewrite.c $(INCDIR)/httpd.h \
  + $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/http_config.h $(INCDIR)/http_request.h \
  + $(INCDIR)/http_core.h $(INCDIR)/http_log.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 \
  + $(INCDIR)/http_config.h $(INCDIR)/http_core.h \
  + $(INCDIR)/http_log.h
  +mod_so.o: mod_so.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
  + ../../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
  + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/http_config.h \
  + $(INCDIR)/http_log.h
  +mod_speling.o: mod_speling.c $(INCDIR)/httpd.h \
  + $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/http_core.h $(INCDIR)/http_config.h \
  + $(INCDIR)/http_log.h
  +mod_status.o: mod_status.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
  + ../../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/alloc.h \
  + $(INCDIR)/buff.h $(INCDIR)/ap.h $(INCDIR)/http_config.h \
  + $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \
  + $(INCDIR)/http_main.h $(INCDIR)/util_script.h \
  + $(INCDIR)/scoreboard.h $(INCDIR)/http_log.h
  +mod_unique_id.o: mod_unique_id.c $(INCDIR)/httpd.h \
  + $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/http_config.h $(INCDIR)/http_log.h \
  + $(INCDIR)/multithread.h
  +mod_userdir.o: mod_userdir.c $(INCDIR)/httpd.h \
  + $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/http_config.h
  +mod_usertrack.o: mod_usertrack.c $(INCDIR)/httpd.h \
  + $(INCDIR)/conf.h ../../os/unix/os.h $(INCDIR)/hsregex.h \
  + $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap.h \
  + $(INCDIR)/http_config.h $(INCDIR)/http_core.h
  
  
  
  1.3       +7 -4      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Makefile.tmpl	1998/02/12 10:15:26	1.2
  +++ Makefile.tmpl	1998/02/22 04:37:18	1.3
  @@ -1,13 +1,16 @@
   # default Makefile.tmpl to force Configure to create a Makefile
  +INCDIR=../../include
   
   # 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.
   depend:
  -	sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \
  -	    && $(CC) -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
  -	    && mv Makefile.tmpl Makefile.tmpl.bak \
  -	    && mv Makefile.new Makefile.tmpl
  +	cp Makefile.tmpl Makefile.tmpl.bak \
  +	    && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \
  +	    && gcc -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
  +	    && sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' Makefile.new \
  +		> Makefile.tmpl \
  +	    && rm Makefile.new
   
   #Dependencies
   
  
  
  
  1.12      +6 -4      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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Makefile.tmpl	1998/02/12 10:15:27	1.11
  +++ Makefile.tmpl	1998/02/22 04:37:19	1.12
  @@ -25,10 +25,12 @@
   # gcc, and rebuilds Makefile.tmpl.  You have to re-run Configure after
   # using it.
   depend:
  -	sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \
  -	    && $(CC) -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
  -	    && mv Makefile.tmpl Makefile.tmpl.bak \
  -	    && mv Makefile.new Makefile.tmpl
  +	cp Makefile.tmpl Makefile.tmpl.bak \
  +	    && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \
  +	    && gcc -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
  +	    && sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' Makefile.new \
  +		> Makefile.tmpl \
  +	    && rm Makefile.new
   
   $(OBJS): Makefile
   
  
  
  
  1.9       +24 -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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Makefile.tmpl	1997/11/15 19:04:54	1.8
  +++ Makefile.tmpl	1998/02/22 04:37:20	1.9
  @@ -7,6 +7,7 @@
   LIBS=$(EXTRA_LIBS) $(LIBS1) -lap
   INCLUDES=$(INCLUDES1) $(INCLUDES_DEPTH1) $(EXTRA_INCLUDES)
   LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS) -L../ap
  +INCDIR=../include
   
   .c.o: 
   	$(CC) -c $(CFLAGS) $(INCLUDES) $<
  @@ -30,3 +31,26 @@
   clean:
   	rm -f $(TARGETS) *.o
   
  +# 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.
  +depend:
  +	cp Makefile.tmpl Makefile.tmpl.bak \
  +	    && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl > Makefile.new \
  +	    && gcc -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
  +	    && sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' Makefile.new \
  +		> Makefile.tmpl \
  +	    && rm Makefile.new
  +
  +#Dependencies
  +
  +$(OBJS): Makefile
  +
  +# DO NOT REMOVE
  +cls.o: cls.c
  +htdigest.o: htdigest.c ../main/md5c.c $(INCDIR)/conf.h \
  + ../os/unix/os.h $(INCDIR)/hsregex.h $(INCDIR)/md5.h
  +htpasswd.o: htpasswd.c
  +logresolve.o: logresolve.c
  +rotatelogs.o: rotatelogs.c
  +suexec.o: suexec.c suexec.h
  
  
  

Mime
View raw message