rbb 99/12/05 11:33:32
Modified: src Makefile.tmpl modules.c
src/ap Makefile.tmpl
src/main Makefile.tmpl
src/modules/mpm/prefork Makefile.tmpl
src/modules/standard Makefile.tmpl
src/os/unix Makefile.tmpl
Log:
No file should be dependant on apr_config.h unless it is in APR.
Revision Changes Path
1.12 +2 -2 apache-2.0/src/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /home/cvs/apache-2.0/src/Makefile.tmpl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile.tmpl 1999/11/17 21:39:17 1.11
+++ Makefile.tmpl 1999/12/05 19:33:26 1.12
@@ -124,14 +124,14 @@
buildmark.o: buildmark.c include/ap_config.h include/ap_mmn.h \
include/ap_config_auto.h os/unix/os.h os/unix/os-inline.c \
include/ap_ctype.h include/hsregex.h include/httpd.h \
- lib/apr/include/apr_general.h lib/apr/include/apr_config.h \
+ lib/apr/include/apr_general.h lib/apr/include/apr.h \
lib/apr/include/apr_errno.h lib/apr/include/apr_lib.h \
lib/apr/include/apr_file_io.h include/buff.h include/ap_iol.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 \
os/unix/os-inline.c include/ap_ctype.h include/hsregex.h \
- lib/apr/include/apr_general.h lib/apr/include/apr_config.h \
+ lib/apr/include/apr_general.h lib/apr/include/apr.h \
lib/apr/include/apr_errno.h lib/apr/include/apr_lib.h \
lib/apr/include/apr_file_io.h include/buff.h include/ap_iol.h \
include/ap.h include/util_uri.h include/http_config.h \
1.3 +7 -5 apache-2.0/src/Attic/modules.c
1.10 +2 -2 apache-2.0/src/ap/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /home/cvs/apache-2.0/src/ap/Makefile.tmpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.tmpl 1999/11/17 21:39:19 1.9
+++ Makefile.tmpl 1999/12/05 19:33:27 1.10
@@ -45,7 +45,7 @@
ap_hooks.o: ap_hooks.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
- ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
+ ../lib/apr/include/apr_general.h ../lib/apr/include/apr.h \
../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
../lib/apr/include/apr_file_io.h $(INCDIR)/buff.h \
$(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
@@ -53,7 +53,7 @@
ap_sha1.o: ap_sha1.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
- ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
+ ../lib/apr/include/apr_general.h ../lib/apr/include/apr.h \
../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
../lib/apr/include/apr_file_io.h $(INCDIR)/buff.h \
$(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
1.10 +56 -56 apache-2.0/src/main/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/Makefile.tmpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.tmpl 1999/11/20 21:04:45 1.9
+++ Makefile.tmpl 1999/12/05 19:33:29 1.10
@@ -61,27 +61,27 @@
buff.o: buff.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
- ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
+ ../lib/apr/include/apr_general.h ../lib/apr/include/apr.h \
../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
../lib/apr/include/apr_file_io.h $(INCDIR)/buff.h \
$(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_main.h $(INCDIR)/http_log.h
+ $(INCDIR)/http_main.h $(INCDIR)/http_log.h \
+ ../lib/apr/include/apr_thread_proc.h
gen_test_char.o: gen_test_char.c $(INCDIR)/httpd.h \
$(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \
$(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
- ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
+ ../lib/apr/include/apr_general.h ../lib/apr/include/apr.h \
../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
../lib/apr/include/apr_file_io.h $(INCDIR)/buff.h \
$(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h
gen_uri_delims.o: gen_uri_delims.c
http_config.o: http_config.c ../lib/apr/include/apr_portable.h \
- ../lib/apr/include/apr_config.h ../lib/apr/include/apr_general.h \
+ ../lib/apr/include/apr_general.h ../lib/apr/include/apr.h \
../lib/apr/include/apr_errno.h ../lib/apr/include/apr_thread_proc.h \
- ../lib/apr/include/apr_file_io.h ../lib/apr/include/apr_win.h \
- ../lib/apr/include/apr_network_io.h ../lib/apr/include/apr_lock.h \
- ../lib/apr/include/apr_time.h $(INCDIR)/httpd.h \
- $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
+ ../lib/apr/include/apr_file_io.h ../lib/apr/include/apr_network_io.h \
+ ../lib/apr/include/apr_lock.h ../lib/apr/include/apr_time.h \
+ $(INCDIR)/httpd.h $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \
$(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
../lib/apr/include/apr_lib.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
@@ -93,20 +93,19 @@
$(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \
$(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
- ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
+ ../lib/apr/include/apr_general.h ../lib/apr/include/apr.h \
../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
../lib/apr/include/apr_file_io.h $(INCDIR)/buff.h \
$(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
$(INCDIR)/http_connection.h $(INCDIR)/ap_hooks.h \
../lib/apr/include/apr_network_io.h $(INCDIR)/http_request.h \
$(INCDIR)/http_protocol.h ../lib/apr/include/apr_portable.h \
- ../lib/apr/include/apr_thread_proc.h ../lib/apr/include/apr_win.h \
- ../lib/apr/include/apr_lock.h ../lib/apr/include/apr_time.h \
- ../lib/apr/include/apr_mmap.h $(INCDIR)/ap_mpm.h \
- $(INCDIR)/mpm_status.h $(INCDIR)/http_config.h \
+ ../lib/apr/include/apr_thread_proc.h ../lib/apr/include/apr_lock.h \
+ ../lib/apr/include/apr_time.h ../lib/apr/include/apr_mmap.h \
+ $(INCDIR)/ap_mpm.h $(INCDIR)/mpm_status.h $(INCDIR)/http_config.h \
$(INCDIR)/http_vhost.h
http_core.o: http_core.c ../lib/apr/include/apr_lib.h \
- ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
+ ../lib/apr/include/apr_general.h ../lib/apr/include/apr.h \
../lib/apr/include/apr_errno.h ../lib/apr/include/apr_file_io.h \
$(INCDIR)/httpd.h $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \
@@ -114,18 +113,18 @@
$(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
$(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \
$(INCDIR)/http_protocol.h ../lib/apr/include/apr_portable.h \
- ../lib/apr/include/apr_thread_proc.h ../lib/apr/include/apr_win.h \
+ ../lib/apr/include/apr_thread_proc.h \
../lib/apr/include/apr_network_io.h ../lib/apr/include/apr_lock.h \
../lib/apr/include/apr_time.h ../lib/apr/include/apr_mmap.h \
$(INCDIR)/http_request.h $(INCDIR)/http_vhost.h \
$(INCDIR)/http_main.h $(INCDIR)/http_log.h $(INCDIR)/rfc1413.h \
- $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h /usr/include/fnmatch.h \
- $(INCDIR)/http_connection.h
+ $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h \
+ ../lib/apr/include/apr_fnmatch.h $(INCDIR)/http_connection.h
http_log.o: http_log.c ../lib/apr/include/apr_lib.h \
- ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
+ ../lib/apr/include/apr_general.h ../lib/apr/include/apr.h \
../lib/apr/include/apr_errno.h ../lib/apr/include/apr_file_io.h \
../lib/apr/include/apr_portable.h \
- ../lib/apr/include/apr_thread_proc.h ../lib/apr/include/apr_win.h \
+ ../lib/apr/include/apr_thread_proc.h \
../lib/apr/include/apr_network_io.h ../lib/apr/include/apr_lock.h \
../lib/apr/include/apr_time.h $(INCDIR)/httpd.h \
$(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
@@ -137,24 +136,25 @@
http_main.o: http_main.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
- ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
+ ../lib/apr/include/apr_general.h ../lib/apr/include/apr.h \
../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
../lib/apr/include/apr_file_io.h $(INCDIR)/buff.h \
$(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_main.h $(INCDIR)/http_log.h $(INCDIR)/http_config.h \
- $(INCDIR)/ap_hooks.h $(INCDIR)/ap_mpm.h \
- ../lib/expat-lite/xmlparse.h
+ $(INCDIR)/http_main.h $(INCDIR)/http_log.h \
+ ../lib/apr/include/apr_thread_proc.h $(INCDIR)/http_config.h \
+ $(INCDIR)/ap_hooks.h ../lib/apr/include/apr_getopt.h \
+ $(INCDIR)/ap_mpm.h ../lib/expat-lite/xmlparse.h
http_protocol.o: http_protocol.c $(INCDIR)/httpd.h \
$(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \
$(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
- ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
+ ../lib/apr/include/apr_general.h ../lib/apr/include/apr.h \
../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
../lib/apr/include/apr_file_io.h $(INCDIR)/buff.h \
$(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
$(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \
$(INCDIR)/http_protocol.h ../lib/apr/include/apr_portable.h \
- ../lib/apr/include/apr_thread_proc.h ../lib/apr/include/apr_win.h \
+ ../lib/apr/include/apr_thread_proc.h \
../lib/apr/include/apr_network_io.h ../lib/apr/include/apr_lock.h \
../lib/apr/include/apr_time.h ../lib/apr/include/apr_mmap.h \
$(INCDIR)/http_main.h $(INCDIR)/http_request.h \
@@ -164,40 +164,40 @@
$(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \
$(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
- ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
+ ../lib/apr/include/apr_general.h ../lib/apr/include/apr.h \
../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
../lib/apr/include/apr_file_io.h $(INCDIR)/buff.h \
$(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
$(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
$(INCDIR)/http_request.h $(INCDIR)/http_core.h \
$(INCDIR)/http_protocol.h ../lib/apr/include/apr_portable.h \
- ../lib/apr/include/apr_thread_proc.h ../lib/apr/include/apr_win.h \
+ ../lib/apr/include/apr_thread_proc.h \
../lib/apr/include/apr_network_io.h ../lib/apr/include/apr_lock.h \
../lib/apr/include/apr_time.h ../lib/apr/include/apr_mmap.h \
- $(INCDIR)/http_log.h $(INCDIR)/http_main.h /usr/include/fnmatch.h
+ $(INCDIR)/http_log.h $(INCDIR)/http_main.h \
+ ../lib/apr/include/apr_fnmatch.h
http_vhost.o: http_vhost.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
- ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
+ ../lib/apr/include/apr_general.h ../lib/apr/include/apr.h \
../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
../lib/apr/include/apr_file_io.h $(INCDIR)/buff.h \
$(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
$(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h $(INCDIR)/http_log.h \
- $(INCDIR)/http_vhost.h $(INCDIR)/http_protocol.h \
- ../lib/apr/include/apr_portable.h \
- ../lib/apr/include/apr_thread_proc.h ../lib/apr/include/apr_win.h \
+ ../lib/apr/include/apr_thread_proc.h $(INCDIR)/http_vhost.h \
+ $(INCDIR)/http_protocol.h ../lib/apr/include/apr_portable.h \
../lib/apr/include/apr_network_io.h ../lib/apr/include/apr_lock.h \
../lib/apr/include/apr_time.h ../lib/apr/include/apr_mmap.h \
$(INCDIR)/http_core.h
iol_file.o: iol_file.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
- ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
+ ../lib/apr/include/apr_general.h ../lib/apr/include/apr.h \
../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
../lib/apr/include/apr_file_io.h $(INCDIR)/buff.h \
$(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h
listen.o: listen.c ../lib/apr/include/apr_network_io.h \
- ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
+ ../lib/apr/include/apr_general.h ../lib/apr/include/apr.h \
../lib/apr/include/apr_errno.h $(INCDIR)/httpd.h \
$(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \
@@ -205,27 +205,28 @@
../lib/apr/include/apr_lib.h ../lib/apr/include/apr_file_io.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
- $(INCDIR)/ap_listen.h $(INCDIR)/http_log.h
+ $(INCDIR)/ap_listen.h $(INCDIR)/http_log.h \
+ ../lib/apr/include/apr_thread_proc.h
rfc1413.o: rfc1413.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
- ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
+ ../lib/apr/include/apr_general.h ../lib/apr/include/apr.h \
../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
../lib/apr/include/apr_file_io.h $(INCDIR)/buff.h \
$(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_log.h $(INCDIR)/rfc1413.h $(INCDIR)/http_main.h \
+ $(INCDIR)/http_log.h ../lib/apr/include/apr_thread_proc.h \
+ $(INCDIR)/rfc1413.h $(INCDIR)/http_main.h \
../lib/apr/include/apr_network_io.h
util.o: util.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
- ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
+ ../lib/apr/include/apr_general.h ../lib/apr/include/apr.h \
../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
../lib/apr/include/apr_file_io.h $(INCDIR)/buff.h \
$(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
$(INCDIR)/http_main.h $(INCDIR)/http_log.h \
- $(INCDIR)/http_protocol.h $(INCDIR)/ap_hooks.h \
- ../lib/apr/include/apr_portable.h \
- ../lib/apr/include/apr_thread_proc.h ../lib/apr/include/apr_win.h \
+ ../lib/apr/include/apr_thread_proc.h $(INCDIR)/http_protocol.h \
+ $(INCDIR)/ap_hooks.h ../lib/apr/include/apr_portable.h \
../lib/apr/include/apr_network_io.h ../lib/apr/include/apr_lock.h \
../lib/apr/include/apr_time.h ../lib/apr/include/apr_mmap.h \
test_char.h
@@ -233,12 +234,11 @@
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \
$(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/util_date.h
util_md5.o: util_md5.c ../lib/apr/include/apr_portable.h \
- ../lib/apr/include/apr_config.h ../lib/apr/include/apr_general.h \
+ ../lib/apr/include/apr_general.h ../lib/apr/include/apr.h \
../lib/apr/include/apr_errno.h ../lib/apr/include/apr_thread_proc.h \
- ../lib/apr/include/apr_file_io.h ../lib/apr/include/apr_win.h \
- ../lib/apr/include/apr_network_io.h ../lib/apr/include/apr_lock.h \
- ../lib/apr/include/apr_time.h $(INCDIR)/httpd.h \
- $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
+ ../lib/apr/include/apr_file_io.h ../lib/apr/include/apr_network_io.h \
+ ../lib/apr/include/apr_lock.h ../lib/apr/include/apr_time.h \
+ $(INCDIR)/httpd.h $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \
$(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
../lib/apr/include/apr_lib.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
@@ -247,23 +247,23 @@
util_script.o: util_script.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
- ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
+ ../lib/apr/include/apr_general.h ../lib/apr/include/apr.h \
../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
../lib/apr/include/apr_file_io.h $(INCDIR)/buff.h \
$(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
$(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h $(INCDIR)/http_main.h \
- $(INCDIR)/http_log.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_protocol.h ../lib/apr/include/apr_portable.h \
- ../lib/apr/include/apr_thread_proc.h ../lib/apr/include/apr_win.h \
- ../lib/apr/include/apr_network_io.h ../lib/apr/include/apr_lock.h \
- ../lib/apr/include/apr_time.h ../lib/apr/include/apr_mmap.h \
- $(INCDIR)/http_request.h $(INCDIR)/util_script.h \
- $(INCDIR)/util_date.h
+ $(INCDIR)/http_log.h ../lib/apr/include/apr_thread_proc.h \
+ $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \
+ ../lib/apr/include/apr_portable.h ../lib/apr/include/apr_network_io.h \
+ ../lib/apr/include/apr_lock.h ../lib/apr/include/apr_time.h \
+ ../lib/apr/include/apr_mmap.h $(INCDIR)/http_request.h \
+ $(INCDIR)/util_script.h $(INCDIR)/util_date.h
util_uri.o: util_uri.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h \
- ../lib/apr/include/apr_general.h ../lib/apr/include/apr_config.h \
+ ../lib/apr/include/apr_general.h ../lib/apr/include/apr.h \
../lib/apr/include/apr_errno.h ../lib/apr/include/apr_lib.h \
../lib/apr/include/apr_file_io.h $(INCDIR)/buff.h \
$(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_log.h uri_delims.h
+ $(INCDIR)/http_log.h ../lib/apr/include/apr_thread_proc.h \
+ uri_delims.h
1.14 +1 -3 apache-2.0/src/modules/mpm/prefork/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/prefork/Makefile.tmpl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Makefile.tmpl 1999/11/17 21:39:37 1.13
+++ Makefile.tmpl 1999/12/05 19:33:30 1.14
@@ -56,12 +56,10 @@
# DO NOT REMOVE
prefork.o: prefork.c ../../../lib/apr/include/apr_portable.h \
- ../../../lib/apr/include/apr_config.h \
- ../../../lib/apr/include/apr_general.h \
+ ../../../lib/apr/include/apr_general.h ../../../lib/apr/include/apr.h \
../../../lib/apr/include/apr_errno.h \
../../../lib/apr/include/apr_thread_proc.h \
../../../lib/apr/include/apr_file_io.h \
- ../../../lib/apr/include/apr_win.h \
../../../lib/apr/include/apr_network_io.h \
../../../lib/apr/include/apr_lock.h \
../../../lib/apr/include/apr_time.h $(INCDIR)/httpd.h \
1.10 +79 -99 apache-2.0/src/modules/standard/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/Makefile.tmpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.tmpl 1999/11/20 21:12:58 1.9
+++ Makefile.tmpl 1999/12/05 19:33:30 1.10
@@ -9,18 +9,19 @@
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
$(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \
- ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
+ ../../lib/apr/include/apr.h ../../lib/apr/include/apr_errno.h \
../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_core.h \
$(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
- $(INCDIR)/http_log.h $(INCDIR)/http_request.h
+ $(INCDIR)/http_log.h ../../lib/apr/include/apr_thread_proc.h \
+ $(INCDIR)/http_request.h
mod_actions.o: mod_actions.c $(INCDIR)/httpd.h \
$(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
$(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \
- ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
+ ../../lib/apr/include/apr.h ../../lib/apr/include/apr_errno.h \
../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
@@ -28,7 +29,6 @@
$(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \
../../lib/apr/include/apr_portable.h \
../../lib/apr/include/apr_thread_proc.h \
- ../../lib/apr/include/apr_win.h \
../../lib/apr/include/apr_network_io.h \
../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h \
../../lib/apr/include/apr_mmap.h $(INCDIR)/http_main.h \
@@ -38,7 +38,7 @@
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
$(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \
- ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
+ ../../lib/apr/include/apr.h ../../lib/apr/include/apr_errno.h \
../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
@@ -47,14 +47,13 @@
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
$(OSDIR)/os.h $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
$(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \
- ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
+ ../../lib/apr/include/apr.h ../../lib/apr/include/apr_errno.h \
../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
$(INCDIR)/ap_hooks.h $(INCDIR)/http_protocol.h \
../../lib/apr/include/apr_portable.h \
../../lib/apr/include/apr_thread_proc.h \
- ../../lib/apr/include/apr_win.h \
../../lib/apr/include/apr_network_io.h \
../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h \
../../lib/apr/include/apr_mmap.h $(INCDIR)/http_log.h \
@@ -62,7 +61,7 @@
$(INCDIR)/http_request.h
mod_auth.o: mod_auth.c ../../lib/apr/include/apr_md5.h \
../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_general.h \
- ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
+ ../../lib/apr/include/apr.h ../../lib/apr/include/apr_errno.h \
../../lib/apr/include/apr_file_io.h $(INCDIR)/httpd.h \
$(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
@@ -71,9 +70,8 @@
$(INCDIR)/ap.h $(INCDIR)/util_uri.h \
$(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
$(INCDIR)/http_core.h $(INCDIR)/http_log.h \
- $(INCDIR)/http_protocol.h ../../lib/apr/include/apr_portable.h \
- ../../lib/apr/include/apr_thread_proc.h \
- ../../lib/apr/include/apr_win.h \
+ ../../lib/apr/include/apr_thread_proc.h $(INCDIR)/http_protocol.h \
+ ../../lib/apr/include/apr_portable.h \
../../lib/apr/include/apr_network_io.h \
../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h \
../../lib/apr/include/apr_mmap.h $(INCDIR)/http_request.h
@@ -82,15 +80,13 @@
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
$(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \
- ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
+ ../../lib/apr/include/apr.h ../../lib/apr/include/apr_errno.h \
../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
$(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \
- ../../lib/apr/include/apr_portable.h \
- ../../lib/apr/include/apr_thread_proc.h \
- ../../lib/apr/include/apr_win.h \
+ $(INCDIR)/http_log.h ../../lib/apr/include/apr_thread_proc.h \
+ $(INCDIR)/http_protocol.h ../../lib/apr/include/apr_portable.h \
../../lib/apr/include/apr_network_io.h \
../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h \
../../lib/apr/include/apr_mmap.h $(INCDIR)/http_request.h
@@ -99,15 +95,13 @@
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
$(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \
- ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
+ ../../lib/apr/include/apr.h ../../lib/apr/include/apr_errno.h \
../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
$(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \
- ../../lib/apr/include/apr_portable.h \
- ../../lib/apr/include/apr_thread_proc.h \
- ../../lib/apr/include/apr_win.h \
+ $(INCDIR)/http_log.h ../../lib/apr/include/apr_thread_proc.h \
+ $(INCDIR)/http_protocol.h ../../lib/apr/include/apr_portable.h \
../../lib/apr/include/apr_network_io.h \
../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h \
../../lib/apr/include/apr_mmap.h
@@ -116,15 +110,13 @@
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
$(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \
- ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
+ ../../lib/apr/include/apr.h ../../lib/apr/include/apr_errno.h \
../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
$(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \
- ../../lib/apr/include/apr_portable.h \
- ../../lib/apr/include/apr_thread_proc.h \
- ../../lib/apr/include/apr_win.h \
+ $(INCDIR)/http_log.h ../../lib/apr/include/apr_thread_proc.h \
+ $(INCDIR)/http_protocol.h ../../lib/apr/include/apr_portable.h \
../../lib/apr/include/apr_network_io.h \
../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h \
../../lib/apr/include/apr_mmap.h
@@ -133,16 +125,14 @@
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
$(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \
- ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
+ ../../lib/apr/include/apr.h ../../lib/apr/include/apr_errno.h \
../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
$(INCDIR)/ap_hooks.h $(INCDIR)/http_conf_globals.h \
$(INCDIR)/http_core.h $(INCDIR)/http_request.h \
- $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \
- ../../lib/apr/include/apr_portable.h \
- ../../lib/apr/include/apr_thread_proc.h \
- ../../lib/apr/include/apr_win.h \
+ $(INCDIR)/http_log.h ../../lib/apr/include/apr_thread_proc.h \
+ $(INCDIR)/http_protocol.h ../../lib/apr/include/apr_portable.h \
../../lib/apr/include/apr_network_io.h \
../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h \
../../lib/apr/include/apr_mmap.h $(INCDIR)/util_md5.h \
@@ -152,7 +142,7 @@
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
$(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \
- ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
+ ../../lib/apr/include/apr.h ../../lib/apr/include/apr_errno.h \
../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
@@ -160,28 +150,28 @@
$(INCDIR)/http_request.h $(INCDIR)/http_protocol.h \
../../lib/apr/include/apr_portable.h \
../../lib/apr/include/apr_thread_proc.h \
- ../../lib/apr/include/apr_win.h \
../../lib/apr/include/apr_network_io.h \
../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h \
../../lib/apr/include/apr_mmap.h $(INCDIR)/http_log.h \
$(INCDIR)/http_main.h $(INCDIR)/util_script.h \
- /usr/include/fnmatch.h
+ ../../lib/apr/include/apr_fnmatch.h
mod_cern_meta.o: mod_cern_meta.c $(INCDIR)/httpd.h \
$(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
$(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \
- ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
+ ../../lib/apr/include/apr.h ../../lib/apr/include/apr_errno.h \
../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
$(INCDIR)/ap_hooks.h $(INCDIR)/util_script.h \
- $(INCDIR)/http_log.h $(INCDIR)/http_request.h
+ $(INCDIR)/http_log.h ../../lib/apr/include/apr_thread_proc.h \
+ $(INCDIR)/http_request.h
mod_cgi.o: mod_cgi.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
$(OSDIR)/os.h $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
$(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \
- ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
+ ../../lib/apr/include/apr.h ../../lib/apr/include/apr_errno.h \
../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
@@ -189,19 +179,16 @@
$(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \
../../lib/apr/include/apr_portable.h \
../../lib/apr/include/apr_thread_proc.h \
- ../../lib/apr/include/apr_win.h \
../../lib/apr/include/apr_network_io.h \
../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h \
../../lib/apr/include/apr_mmap.h $(INCDIR)/http_main.h \
$(INCDIR)/http_log.h $(INCDIR)/util_script.h \
$(INCDIR)/http_conf_globals.h
mod_cgid.o: mod_cgid.c ../../lib/apr/include/apr_lib.h \
- ../../lib/apr/include/apr_general.h \
- ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
- ../../lib/apr/include/apr_file_io.h \
+ ../../lib/apr/include/apr_general.h ../../lib/apr/include/apr.h \
+ ../../lib/apr/include/apr_errno.h ../../lib/apr/include/apr_file_io.h \
../../lib/apr/include/apr_portable.h \
../../lib/apr/include/apr_thread_proc.h \
- ../../lib/apr/include/apr_win.h \
../../lib/apr/include/apr_network_io.h \
../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h \
$(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
@@ -220,15 +207,13 @@
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
$(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \
- ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
+ ../../lib/apr/include/apr.h ../../lib/apr/include/apr_errno.h \
../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
$(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \
- ../../lib/apr/include/apr_portable.h \
- ../../lib/apr/include/apr_thread_proc.h \
- ../../lib/apr/include/apr_win.h \
+ $(INCDIR)/http_log.h ../../lib/apr/include/apr_thread_proc.h \
+ $(INCDIR)/http_protocol.h ../../lib/apr/include/apr_portable.h \
../../lib/apr/include/apr_network_io.h \
../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h \
../../lib/apr/include/apr_mmap.h $(INCDIR)/util_md5.h \
@@ -237,7 +222,7 @@
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
$(OSDIR)/os.h $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
$(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \
- ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
+ ../../lib/apr/include/apr.h ../../lib/apr/include/apr_errno.h \
../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
@@ -245,7 +230,6 @@
$(INCDIR)/http_request.h $(INCDIR)/http_protocol.h \
../../lib/apr/include/apr_portable.h \
../../lib/apr/include/apr_thread_proc.h \
- ../../lib/apr/include/apr_win.h \
../../lib/apr/include/apr_network_io.h \
../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h \
../../lib/apr/include/apr_mmap.h $(INCDIR)/http_log.h \
@@ -254,7 +238,7 @@
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
$(OSDIR)/os.h $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
$(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \
- ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
+ ../../lib/apr/include/apr.h ../../lib/apr/include/apr_errno.h \
../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
@@ -264,7 +248,7 @@
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
$(OSDIR)/os.h $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
$(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \
- ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
+ ../../lib/apr/include/apr.h ../../lib/apr/include/apr_errno.h \
../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
@@ -274,17 +258,18 @@
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
$(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \
- ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
+ ../../lib/apr/include/apr.h ../../lib/apr/include/apr_errno.h \
../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
- $(INCDIR)/ap_hooks.h $(INCDIR)/http_log.h
+ $(INCDIR)/ap_hooks.h $(INCDIR)/http_log.h \
+ ../../lib/apr/include/apr_thread_proc.h
mod_headers.o: mod_headers.c $(INCDIR)/httpd.h \
$(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
$(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \
- ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
+ ../../lib/apr/include/apr.h ../../lib/apr/include/apr_errno.h \
../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
@@ -293,7 +278,7 @@
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
$(OSDIR)/os.h $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
$(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \
- ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
+ ../../lib/apr/include/apr.h ../../lib/apr/include/apr_errno.h \
../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
@@ -301,7 +286,6 @@
$(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \
../../lib/apr/include/apr_portable.h \
../../lib/apr/include/apr_thread_proc.h \
- ../../lib/apr/include/apr_win.h \
../../lib/apr/include/apr_network_io.h \
../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h \
../../lib/apr/include/apr_mmap.h $(INCDIR)/http_main.h \
@@ -311,7 +295,7 @@
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
$(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \
- ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
+ ../../lib/apr/include/apr.h ../../lib/apr/include/apr_errno.h \
../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
@@ -319,7 +303,6 @@
$(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \
../../lib/apr/include/apr_portable.h \
../../lib/apr/include/apr_thread_proc.h \
- ../../lib/apr/include/apr_win.h \
../../lib/apr/include/apr_network_io.h \
../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h \
../../lib/apr/include/apr_mmap.h $(INCDIR)/http_log.h \
@@ -328,15 +311,14 @@
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
$(OSDIR)/os.h $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
$(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \
- ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
+ ../../lib/apr/include/apr.h ../../lib/apr/include/apr_errno.h \
../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
$(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_log.h $(INCDIR)/http_main.h \
- $(INCDIR)/http_protocol.h ../../lib/apr/include/apr_portable.h \
- ../../lib/apr/include/apr_thread_proc.h \
- ../../lib/apr/include/apr_win.h \
+ $(INCDIR)/http_log.h ../../lib/apr/include/apr_thread_proc.h \
+ $(INCDIR)/http_main.h $(INCDIR)/http_protocol.h \
+ ../../lib/apr/include/apr_portable.h \
../../lib/apr/include/apr_network_io.h \
../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h \
../../lib/apr/include/apr_mmap.h $(INCDIR)/util_script.h \
@@ -346,25 +328,24 @@
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
$(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \
- ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
+ ../../lib/apr/include/apr.h ../../lib/apr/include/apr_errno.h \
../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
- $(INCDIR)/ap_hooks.h $(INCDIR)/http_log.h
+ $(INCDIR)/ap_hooks.h $(INCDIR)/http_log.h \
+ ../../lib/apr/include/apr_thread_proc.h
mod_log_config.o: mod_log_config.c $(INCDIR)/httpd.h \
$(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
$(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \
- ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
+ ../../lib/apr/include/apr.h ../../lib/apr/include/apr_errno.h \
../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
$(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \
- ../../lib/apr/include/apr_portable.h \
- ../../lib/apr/include/apr_thread_proc.h \
- ../../lib/apr/include/apr_win.h \
+ $(INCDIR)/http_log.h ../../lib/apr/include/apr_thread_proc.h \
+ $(INCDIR)/http_protocol.h ../../lib/apr/include/apr_portable.h \
../../lib/apr/include/apr_network_io.h \
../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h \
../../lib/apr/include/apr_mmap.h
@@ -373,51 +354,50 @@
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
$(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \
- ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
+ ../../lib/apr/include/apr.h ../../lib/apr/include/apr_errno.h \
../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
- $(INCDIR)/ap_hooks.h $(INCDIR)/http_log.h
+ $(INCDIR)/ap_hooks.h $(INCDIR)/http_log.h \
+ ../../lib/apr/include/apr_thread_proc.h
mod_mime.o: mod_mime.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
$(OSDIR)/os.h $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
$(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \
- ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
+ ../../lib/apr/include/apr.h ../../lib/apr/include/apr_errno.h \
../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
$(INCDIR)/ap_hooks.h $(INCDIR)/http_log.h \
- $(INCDIR)/http_request.h
+ ../../lib/apr/include/apr_thread_proc.h $(INCDIR)/http_request.h
mod_mime_magic.o: mod_mime_magic.c $(INCDIR)/httpd.h \
$(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
$(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \
- ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
+ ../../lib/apr/include/apr.h ../../lib/apr/include/apr_errno.h \
../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
$(INCDIR)/ap_hooks.h $(INCDIR)/http_request.h \
$(INCDIR)/http_core.h $(INCDIR)/http_log.h \
- $(INCDIR)/http_protocol.h ../../lib/apr/include/apr_portable.h \
- ../../lib/apr/include/apr_thread_proc.h \
- ../../lib/apr/include/apr_win.h \
+ ../../lib/apr/include/apr_thread_proc.h $(INCDIR)/http_protocol.h \
+ ../../lib/apr/include/apr_portable.h \
../../lib/apr/include/apr_network_io.h \
../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h \
- ../../lib/apr/include/apr_mmap.h
+ ../../lib/apr/include/apr_mmap.h $(INCDIR)/util_script.h
mod_negotiation.o: mod_negotiation.c $(INCDIR)/httpd.h \
$(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
$(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \
- ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
+ ../../lib/apr/include/apr.h ../../lib/apr/include/apr_errno.h \
../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
$(INCDIR)/ap_hooks.h $(INCDIR)/http_request.h \
$(INCDIR)/http_protocol.h ../../lib/apr/include/apr_portable.h \
../../lib/apr/include/apr_thread_proc.h \
- ../../lib/apr/include/apr_win.h \
../../lib/apr/include/apr_network_io.h \
../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h \
../../lib/apr/include/apr_mmap.h $(INCDIR)/http_core.h \
@@ -427,27 +407,26 @@
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
$(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \
- ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
+ ../../lib/apr/include/apr.h ../../lib/apr/include/apr_errno.h \
../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
$(INCDIR)/ap_hooks.h $(INCDIR)/http_conf_globals.h \
$(INCDIR)/http_request.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_log.h $(INCDIR)/http_vhost.h
+ $(INCDIR)/http_log.h ../../lib/apr/include/apr_thread_proc.h \
+ $(INCDIR)/http_vhost.h
mod_setenvif.o: mod_setenvif.c $(INCDIR)/httpd.h \
$(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
$(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \
- ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
+ ../../lib/apr/include/apr.h ../../lib/apr/include/apr_errno.h \
../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
$(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \
- ../../lib/apr/include/apr_portable.h \
- ../../lib/apr/include/apr_thread_proc.h \
- ../../lib/apr/include/apr_win.h \
+ $(INCDIR)/http_log.h ../../lib/apr/include/apr_thread_proc.h \
+ $(INCDIR)/http_protocol.h ../../lib/apr/include/apr_portable.h \
../../lib/apr/include/apr_network_io.h \
../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h \
../../lib/apr/include/apr_mmap.h
@@ -455,35 +434,35 @@
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
$(OSDIR)/os.h $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
$(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \
- ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
+ ../../lib/apr/include/apr.h ../../lib/apr/include/apr_errno.h \
../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
- $(INCDIR)/ap_hooks.h $(INCDIR)/http_log.h
+ $(INCDIR)/ap_hooks.h $(INCDIR)/http_log.h \
+ ../../lib/apr/include/apr_thread_proc.h
mod_speling.o: mod_speling.c $(INCDIR)/httpd.h \
$(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
$(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \
- ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
+ ../../lib/apr/include/apr.h ../../lib/apr/include/apr_errno.h \
../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_core.h \
$(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
- $(INCDIR)/http_log.h
+ $(INCDIR)/http_log.h ../../lib/apr/include/apr_thread_proc.h
mod_status.o: mod_status.c $(INCDIR)/httpd.h \
$(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
$(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \
- ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
+ ../../lib/apr/include/apr.h ../../lib/apr/include/apr_errno.h \
../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
$(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \
$(INCDIR)/http_protocol.h ../../lib/apr/include/apr_portable.h \
../../lib/apr/include/apr_thread_proc.h \
- ../../lib/apr/include/apr_win.h \
../../lib/apr/include/apr_network_io.h \
../../lib/apr/include/apr_lock.h ../../lib/apr/include/apr_time.h \
../../lib/apr/include/apr_mmap.h $(INCDIR)/mpm_status.h
@@ -492,17 +471,18 @@
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
$(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \
- ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
+ ../../lib/apr/include/apr.h ../../lib/apr/include/apr_errno.h \
../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
- $(INCDIR)/ap_hooks.h $(INCDIR)/http_log.h
+ $(INCDIR)/ap_hooks.h $(INCDIR)/http_log.h \
+ ../../lib/apr/include/apr_thread_proc.h
mod_userdir.o: mod_userdir.c $(INCDIR)/httpd.h \
$(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
$(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \
- ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
+ ../../lib/apr/include/apr.h ../../lib/apr/include/apr_errno.h \
../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
@@ -512,7 +492,7 @@
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
$(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \
- ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
+ ../../lib/apr/include/apr.h ../../lib/apr/include/apr_errno.h \
../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
@@ -522,7 +502,7 @@
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
$(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \
- ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
+ ../../lib/apr/include/apr.h ../../lib/apr/include/apr_errno.h \
../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
1.8 +4 -3 apache-2.0/src/os/unix/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/unix/Makefile.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.tmpl 1999/11/17 21:39:46 1.7
+++ Makefile.tmpl 1999/12/05 19:33:31 1.8
@@ -43,7 +43,7 @@
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
$(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \
- ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
+ ../../lib/apr/include/apr.h ../../lib/apr/include/apr_errno.h \
../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h ../../lib/apr/include/apr_network_io.h \
@@ -60,9 +60,10 @@
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
$(OSDIR)/os.h $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
$(INCDIR)/hsregex.h ../../lib/apr/include/apr_general.h \
- ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
+ ../../lib/apr/include/apr.h ../../lib/apr/include/apr_errno.h \
../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
$(INCDIR)/ap_hooks.h $(INCDIR)/http_main.h \
- $(INCDIR)/http_log.h unixd.h
+ $(INCDIR)/http_log.h ../../lib/apr/include/apr_thread_proc.h \
+ unixd.h
