rbb 99/09/01 07:38:41
Modified: src Makefile.tmpl
src/ap Makefile.tmpl
src/lib/apr/include apr_lib.h
src/lib/apr/lib apr_getpass.c
src/main Makefile.tmpl
src/modules/mpm/mpmt_pthread Makefile.tmpl
src/modules/standard Makefile.tmpl
src/os/unix Makefile.tmpl
Removed: src/include alloc.h
src/main alloc.c
Log:
Remove alloc.c and alloc.h from apache. ALL of their functions have moved
into APR. Also, re-make dependancies to reflect this change. These files
were left in after the pool->context change, to make it easier to back
out the change. There have been no complaints, so they are going away now.
Revision Changes Path
1.4 +12 -5 apache-2.0/src/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /home/cvs/apache-2.0/src/Makefile.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.tmpl 1999/08/31 05:31:59 1.3
+++ Makefile.tmpl 1999/09/01 14:38:34 1.4
@@ -123,10 +123,17 @@
# DO NOT REMOVE
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/httpd.h include/buff.h \
- include/ap_iol.h include/ap.h include/apr.h include/util_uri.h
+ 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_errno.h lib/apr/include/apr_lib.h \
+ lib/apr/include/apr_file_io.h lib/apr/include/hsregex.h \
+ include/buff.h include/ap_iol.h include/ap.h include/apr.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/buff.h \
- include/ap_iol.h include/ap.h include/apr.h include/util_uri.h \
- include/http_config.h include/ap_hooks.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_errno.h lib/apr/include/apr_lib.h \
+ lib/apr/include/apr_file_io.h lib/apr/include/hsregex.h \
+ include/buff.h include/ap_iol.h include/ap.h include/apr.h \
+ include/util_uri.h include/http_config.h include/ap_hooks.h
1.4 +42 -14 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.tmpl 1999/08/31 05:32:04 1.3
+++ Makefile.tmpl 1999/09/01 14:38:36 1.4
@@ -38,48 +38,76 @@
&& rm Makefile.new
# DO NOT REMOVE
-ap_buf.o: ap_buf.c $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
+ap_base64.o: ap_base64.c $(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)/ap_buf.h
+ $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/ap.h \
+ $(INCDIR)/apr.h
+ap_buf.o: ap_buf.c
+ap_checkpass.o: ap_checkpass.c $(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 \
+ $(INCDIR)/ap_md5.h $(INCDIR)/ap_sha1.h $(INCDIR)/ap.h \
+ $(INCDIR)/apr.h
ap_cpystrn.o: ap_cpystrn.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
- $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.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_lib.h \
+ ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/apr.h $(INCDIR)/util_uri.h
ap_execve.o: ap_execve.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
- $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.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_lib.h \
+ ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/apr.h $(INCDIR)/util_uri.h
ap_fnmatch.o: ap_fnmatch.c $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c \
- $(INCDIR)/ap_ctype.h $(INCDIR)/fnmatch.h
+ $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/fnmatch.h
ap_getpass.o: ap_getpass.c $(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)/ap.h $(INCDIR)/apr.h
+ $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/ap.h \
+ $(INCDIR)/apr.h
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)/alloc.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_lib.h \
+ ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/ap_hooks.h
ap_md5c.o: ap_md5c.c $(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)/ap_md5.h $(INCDIR)/ap.h \
- $(INCDIR)/apr.h
-ap_sha1.o: ap_sha1.c $(INCDIR)/ap_config.h $(INCDIR)/ap_sha1.h \
- $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h $(OSDIR)/os-inline.c
+ $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/ap_md5.h \
+ $(INCDIR)/ap.h $(INCDIR)/apr.h
+ap_sha1.o: ap_sha1.c $(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 $(INCDIR)/ap_sha1.h \
+ $(INCDIR)/ap.h $(INCDIR)/apr.h
ap_signal.o: ap_signal.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
- $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.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_lib.h \
+ ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/apr.h $(INCDIR)/util_uri.h
ap_slack.o: ap_slack.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
- $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.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_lib.h \
+ ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/http_log.h
ap_snprintf.o: ap_snprintf.c $(INCDIR)/httpd.h $(INCDIR)/ap_config.h \
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
- $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h $(INCDIR)/alloc.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_lib.h \
+ ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/apr.h $(INCDIR)/util_uri.h
1.6 +3 -1 apache-2.0/src/lib/apr/include/apr_lib.h
Index: apr_lib.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_lib.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- apr_lib.h 1999/08/31 23:21:44 1.5
+++ apr_lib.h 1999/09/01 14:38:37 1.6
@@ -66,9 +66,11 @@
#include "apr_general.h"
#include "apr_file_io.h"
+#if HAVE_DIRENT_H
+#include <dirent.h>
+#endif
#ifndef WIN32
-#include <dirent.h>
#include "apr_config.h"
#else
#include "../file_io/win32/readdir.h" /* definition of DIR for WIN32 */
1.4 +2 -2 apache-2.0/src/lib/apr/lib/apr_getpass.c
Index: apr_getpass.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_getpass.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- apr_getpass.c 1999/08/31 05:32:34 1.3
+++ apr_getpass.c 1999/09/01 14:38:37 1.4
@@ -65,12 +65,12 @@
#else
#include "apr_win.h"
#endif
+#include "apr_lib.h"
#include "apr_errno.h"
#include <sys/types.h>
#include <errno.h>
-#include "apr_lib.h"
-#ifdef WIN32
+#if HAVE_CONIO_h
#include <conio.h>
#endif
1.4 +100 -47 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.tmpl 1999/08/31 05:32:54 1.3
+++ Makefile.tmpl 1999/09/01 14:38:38 1.4
@@ -60,20 +60,29 @@
# DO NOT REMOVE
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)/alloc.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_lib.h \
+ ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/http_main.h \
$(INCDIR)/http_log.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)/alloc.h $(INCDIR)/buff.h \
- $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
- $(INCDIR)/util_uri.h
+ $(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_lib.h \
+ ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \
+ $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
+ $(INCDIR)/apr.h $(INCDIR)/util_uri.h
gen_uri_delims.o: gen_uri_delims.c
http_config.o: http_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)/alloc.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_lib.h \
+ ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
$(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
@@ -82,96 +91,137 @@
http_connection.o: http_connection.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)/alloc.h $(INCDIR)/buff.h \
- $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
- $(INCDIR)/util_uri.h $(INCDIR)/http_connection.h \
+ $(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_lib.h \
+ ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \
+ $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
+ $(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/http_connection.h \
$(INCDIR)/ap_hooks.h $(INCDIR)/http_request.h \
$(INCDIR)/http_protocol.h $(INCDIR)/ap_mpm.h \
$(INCDIR)/http_config.h $(INCDIR)/http_vhost.h
-http_core.o: http_core.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)/alloc.h \
- $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
- $(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
- $(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_protocol.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 \
- $(INCDIR)/fnmatch.h $(INCDIR)/http_connection.h
-http_log.o: http_log.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)/alloc.h \
- $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
- $(INCDIR)/apr.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
+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_errno.h ../lib/apr/include/apr_file_io.h \
+ ../lib/apr/include/hsregex.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 $(INCDIR)/buff.h \
+ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
+ $(INCDIR)/http_core.h $(INCDIR)/http_protocol.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 $(INCDIR)/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_errno.h ../lib/apr/include/apr_file_io.h \
+ ../lib/apr/include/hsregex.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 $(INCDIR)/buff.h \
+ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.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
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)/alloc.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_lib.h \
+ ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/http_main.h \
$(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h $(INCDIR)/ap_mpm.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)/alloc.h $(INCDIR)/buff.h \
- $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
- $(INCDIR)/util_uri.h $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.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)/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_lib.h \
+ ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \
+ $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
+ $(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+ $(INCDIR)/ap_hooks.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
http_request.o: http_request.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)/alloc.h $(INCDIR)/buff.h \
- $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.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 $(INCDIR)/http_log.h \
- $(INCDIR)/http_main.h $(INCDIR)/fnmatch.h
+ $(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_lib.h \
+ ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \
+ $(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
+ $(INCDIR)/apr.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 \
+ $(INCDIR)/http_log.h $(INCDIR)/http_main.h $(INCDIR)/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)/alloc.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_lib.h \
+ ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/apr.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 $(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)/alloc.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_lib.h \
+ ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/apr.h $(INCDIR)/util_uri.h
listen.o: listen.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)/alloc.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_lib.h \
+ ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
$(INCDIR)/ap_hooks.h $(INCDIR)/ap_listen.h $(INCDIR)/http_log.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)/alloc.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_lib.h \
+ ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/http_log.h \
$(INCDIR)/rfc1413.h $(INCDIR)/http_main.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)/alloc.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_lib.h \
+ ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/http_main.h \
$(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \
$(INCDIR)/ap_hooks.h test_char.h
util_date.o: util_date.c $(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)/util_date.h
+ $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h $(INCDIR)/util_date.h
util_md5.o: util_md5.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)/alloc.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_lib.h \
+ ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/util_md5.h \
$(INCDIR)/ap_md5.h
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)/alloc.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_lib.h \
+ ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
$(INCDIR)/ap_hooks.h $(INCDIR)/http_main.h $(INCDIR)/http_log.h \
@@ -180,7 +230,10 @@
$(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)/alloc.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_lib.h \
+ ../lib/apr/include/apr_file_io.h ../lib/apr/include/hsregex.h \
$(INCDIR)/buff.h $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
$(INCDIR)/apr.h $(INCDIR)/util_uri.h $(INCDIR)/http_log.h \
uri_delims.h
1.8 +41 -27 apache-2.0/src/modules/mpm/mpmt_pthread/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/Makefile.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.tmpl 1999/08/31 05:33:22 1.7
+++ Makefile.tmpl 1999/09/01 14:38:39 1.8
@@ -59,38 +59,52 @@
$(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 \
- $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
- $(INCDIR)/ap.h $(INCDIR)/apr.h \
- $(INCDIR)/util_uri.h $(INCDIR)/http_main.h \
- $(INCDIR)/http_log.h $(INCDIR)/http_config.h \
- $(INCDIR)/ap_hooks.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 acceptlock.h mpmt_pthread.h \
- $(OSDIR)/unixd.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_lib.h \
+ ../../../lib/apr/include/apr_file_io.h \
+ ../../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
+ $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
+ $(INCDIR)/http_main.h $(INCDIR)/http_log.h \
+ $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.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 \
+ acceptlock.h mpmt_pthread.h $(OSDIR)/unixd.h
mpmt_pthread.o: mpmt_pthread.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 \
- $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
- $(INCDIR)/ap.h $(INCDIR)/apr.h \
- $(INCDIR)/util_uri.h $(INCDIR)/http_main.h \
- $(INCDIR)/http_log.h $(INCDIR)/http_config.h \
- $(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_connection.h $(INCDIR)/ap_mpm.h \
- $(OSDIR)/unixd.h $(OSDIR)/iol_socket.h \
- $(INCDIR)/ap_listen.h scoreboard.h mpm_default.h acceptlock.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_lib.h \
+ ../../../lib/apr/include/apr_file_io.h \
+ ../../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
+ $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
+ $(INCDIR)/http_main.h $(INCDIR)/http_log.h \
+ $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
+ $(INCDIR)/http_core.h $(INCDIR)/http_connection.h \
+ $(INCDIR)/ap_mpm.h $(OSDIR)/unixd.h \
+ $(OSDIR)/iol_socket.h $(INCDIR)/ap_listen.h \
+ scoreboard.h mpm_default.h acceptlock.h
scoreboard.o: scoreboard.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 \
- $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
- $(INCDIR)/ap.h $(INCDIR)/apr.h \
- $(INCDIR)/util_uri.h $(INCDIR)/http_log.h \
- $(INCDIR)/http_main.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
- $(OSDIR)/unixd.h $(INCDIR)/http_conf_globals.h \
- mpmt_pthread.h scoreboard.h mpm_default.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_lib.h \
+ ../../../lib/apr/include/apr_file_io.h \
+ ../../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h \
+ $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
+ $(INCDIR)/http_log.h $(INCDIR)/http_main.h \
+ $(INCDIR)/http_core.h $(INCDIR)/http_config.h \
+ $(INCDIR)/ap_hooks.h $(OSDIR)/unixd.h \
+ $(INCDIR)/http_conf_globals.h mpmt_pthread.h scoreboard.h \
+ mpm_default.h
1.3 +295 -171 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.tmpl 1999/08/26 14:18:36 1.2
+++ Makefile.tmpl 1999/09/01 14:38:40 1.3
@@ -8,297 +8,421 @@
$(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)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
- $(INCDIR)/ap.h $(INCDIR)/apr.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)/hsregex.h ../../lib/apr/include/apr_general.h \
+ ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
+ ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
+ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.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
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)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
- $(INCDIR)/ap.h $(INCDIR)/apr.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 $(INCDIR)/http_main.h \
- $(INCDIR)/http_log.h $(INCDIR)/util_script.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_lib.h ../../lib/apr/include/apr_file_io.h \
+ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.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 \
+ $(INCDIR)/http_main.h $(INCDIR)/http_log.h \
+ $(INCDIR)/util_script.h
mod_alias.o: mod_alias.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)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
- $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
- $(INCDIR)/http_request.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_lib.h ../../lib/apr/include/apr_file_io.h \
+ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+ $(INCDIR)/ap_hooks.h $(INCDIR)/http_request.h
mod_asis.o: mod_asis.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)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
- $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
- $(INCDIR)/http_protocol.h $(INCDIR)/http_log.h \
- $(INCDIR)/util_script.h $(INCDIR)/http_main.h \
- $(INCDIR)/http_request.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_lib.h ../../lib/apr/include/apr_file_io.h \
+ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+ $(INCDIR)/ap_hooks.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)/ap_config.h \
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
$(OSDIR)/os.h $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
- $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
- $(INCDIR)/ap.h $(INCDIR)/apr.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 $(INCDIR)/ap_md5.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_lib.h ../../lib/apr/include/apr_file_io.h \
+ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.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 \
$(INCDIR)/http_request.h
mod_auth_anon.o: mod_auth_anon.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)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
- $(INCDIR)/ap.h $(INCDIR)/apr.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 $(INCDIR)/http_request.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_lib.h ../../lib/apr/include/apr_file_io.h \
+ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.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 \
+ $(INCDIR)/http_request.h
mod_auth_db.o: mod_auth_db.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)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
- $(INCDIR)/ap.h $(INCDIR)/apr.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 $(INCDIR)/ap_md5.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_lib.h ../../lib/apr/include/apr_file_io.h \
+ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.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
mod_auth_dbm.o: mod_auth_dbm.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)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
- $(INCDIR)/ap.h $(INCDIR)/apr.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 $(INCDIR)/ap_md5.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_lib.h ../../lib/apr/include/apr_file_io.h \
+ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.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
mod_autoindex.o: mod_autoindex.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)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
- $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.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 \
- $(INCDIR)/fnmatch.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_lib.h ../../lib/apr/include/apr_file_io.h \
+ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+ $(INCDIR)/ap_hooks.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 $(INCDIR)/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)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
- $(INCDIR)/ap.h $(INCDIR)/apr.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)/hsregex.h ../../lib/apr/include/apr_general.h \
+ ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
+ ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
+ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.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
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)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
- $(INCDIR)/ap.h $(INCDIR)/apr.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 $(INCDIR)/http_main.h \
- $(INCDIR)/http_log.h $(INCDIR)/util_script.h \
- $(INCDIR)/http_conf_globals.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_lib.h ../../lib/apr/include/apr_file_io.h \
+ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.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 \
+ $(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)/ap_config.h $(INCDIR)/ap_mmn.h \
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
$(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
- $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
- $(INCDIR)/ap.h $(INCDIR)/apr.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 $(INCDIR)/util_md5.h \
- $(INCDIR)/ap_md5.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_lib.h ../../lib/apr/include/apr_file_io.h \
+ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.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 \
+ $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h
mod_dir.o: mod_dir.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)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
- $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.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
+ $(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_lib.h ../../lib/apr/include/apr_file_io.h \
+ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+ $(INCDIR)/ap_hooks.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_echo.o: mod_echo.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)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
- $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
- $(INCDIR)/http_connection.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_lib.h ../../lib/apr/include/apr_file_io.h \
+ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+ $(INCDIR)/ap_hooks.h $(INCDIR)/http_connection.h
mod_env.o: mod_env.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)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
- $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
- $(INCDIR)/http_request.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_lib.h ../../lib/apr/include/apr_file_io.h \
+ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+ $(INCDIR)/ap_hooks.h $(INCDIR)/http_request.h
mod_expires.o: mod_expires.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)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
- $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
- $(INCDIR)/http_log.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_lib.h ../../lib/apr/include/apr_file_io.h \
+ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+ $(INCDIR)/ap_hooks.h $(INCDIR)/http_log.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)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
- $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.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_lib.h ../../lib/apr/include/apr_file_io.h \
+ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+ $(INCDIR)/ap_hooks.h
mod_imap.o: mod_imap.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)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
- $(INCDIR)/ap.h $(INCDIR)/apr.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 $(INCDIR)/http_main.h \
- $(INCDIR)/http_log.h $(INCDIR)/util_script.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_lib.h ../../lib/apr/include/apr_file_io.h \
+ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.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 \
+ $(INCDIR)/http_main.h $(INCDIR)/http_log.h \
+ $(INCDIR)/util_script.h
mod_include.o: mod_include.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)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
- $(INCDIR)/ap.h $(INCDIR)/apr.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 $(INCDIR)/http_log.h \
- $(INCDIR)/http_main.h $(INCDIR)/util_script.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_lib.h ../../lib/apr/include/apr_file_io.h \
+ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.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 \
+ $(INCDIR)/http_log.h $(INCDIR)/http_main.h \
+ $(INCDIR)/util_script.h
mod_info.o: mod_info.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)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
- $(INCDIR)/ap.h $(INCDIR)/apr.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 \
- $(INCDIR)/util_script.h $(INCDIR)/http_conf_globals.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_lib.h ../../lib/apr/include/apr_file_io.h \
+ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.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 $(INCDIR)/util_script.h \
+ $(INCDIR)/http_conf_globals.h
mod_log_agent.o: mod_log_agent.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)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
- $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
- $(INCDIR)/http_log.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_lib.h ../../lib/apr/include/apr_file_io.h \
+ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+ $(INCDIR)/ap_hooks.h $(INCDIR)/http_log.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)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
- $(INCDIR)/ap.h $(INCDIR)/apr.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
+ $(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_lib.h ../../lib/apr/include/apr_file_io.h \
+ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.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
mod_log_referer.o: mod_log_referer.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)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
- $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
- $(INCDIR)/http_log.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_lib.h ../../lib/apr/include/apr_file_io.h \
+ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+ $(INCDIR)/ap_hooks.h $(INCDIR)/http_log.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)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
- $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
- $(INCDIR)/http_log.h $(INCDIR)/http_request.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_lib.h ../../lib/apr/include/apr_file_io.h \
+ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+ $(INCDIR)/ap_hooks.h $(INCDIR)/http_log.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)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
- $(INCDIR)/ap.h $(INCDIR)/apr.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
+ $(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_lib.h ../../lib/apr/include/apr_file_io.h \
+ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.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
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)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
- $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
- $(INCDIR)/http_request.h $(INCDIR)/http_protocol.h \
- $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
- $(INCDIR)/util_script.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_lib.h ../../lib/apr/include/apr_file_io.h \
+ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+ $(INCDIR)/ap_hooks.h $(INCDIR)/http_request.h \
+ $(INCDIR)/http_protocol.h $(INCDIR)/http_core.h \
+ $(INCDIR)/http_log.h $(INCDIR)/util_script.h
mod_rewrite.o: mod_rewrite.c mod_rewrite.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)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
- $(INCDIR)/ap.h $(INCDIR)/apr.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)/hsregex.h ../../lib/apr/include/apr_general.h \
+ ../../lib/apr/include/apr_config.h ../../lib/apr/include/apr_errno.h \
+ ../../lib/apr/include/apr_lib.h ../../lib/apr/include/apr_file_io.h \
+ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.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
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)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
- $(INCDIR)/ap.h $(INCDIR)/apr.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
+ $(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_lib.h ../../lib/apr/include/apr_file_io.h \
+ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.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
mod_so.o: mod_so.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)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
- $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
- $(INCDIR)/http_log.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_lib.h ../../lib/apr/include/apr_file_io.h \
+ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+ $(INCDIR)/ap_hooks.h $(INCDIR)/http_log.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)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
- $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_core.h $(INCDIR)/http_config.h \
- $(INCDIR)/ap_hooks.h $(INCDIR)/http_log.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_lib.h ../../lib/apr/include/apr_file_io.h \
+ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_core.h \
+ $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
+ $(INCDIR)/http_log.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)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
- $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
- $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h \
- $(INCDIR)/http_conf_globals.h $(INCDIR)/http_main.h \
- $(INCDIR)/util_script.h ../../modules/mpm/prefork/scoreboard.h \
- $(INCDIR)/http_log.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_lib.h ../../lib/apr/include/apr_file_io.h \
+ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+ $(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h \
+ $(INCDIR)/http_protocol.h $(INCDIR)/http_conf_globals.h \
+ $(INCDIR)/http_main.h $(INCDIR)/util_script.h \
+ ../../modules/mpm/mpmt_pthread/scoreboard.h \
+ ../../modules/mpm/mpmt_pthread/mpm_default.h $(INCDIR)/http_log.h
mod_unique_id.o: mod_unique_id.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)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
- $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
- $(INCDIR)/http_log.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_lib.h ../../lib/apr/include/apr_file_io.h \
+ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+ $(INCDIR)/ap_hooks.h $(INCDIR)/http_log.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)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
- $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
- $(INCDIR)/http_request.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_lib.h ../../lib/apr/include/apr_file_io.h \
+ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+ $(INCDIR)/ap_hooks.h $(INCDIR)/http_request.h
mod_usertrack.o: mod_usertrack.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)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
- $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
- $(INCDIR)/http_core.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_lib.h ../../lib/apr/include/apr_file_io.h \
+ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+ $(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h
+mod_vhost_alias.o: mod_vhost_alias.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_lib.h ../../lib/apr/include/apr_file_io.h \
+ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+ $(INCDIR)/ap_hooks.h $(INCDIR)/http_core.h
1.3 +17 -8 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.tmpl 1999/08/26 18:05:23 1.2
+++ Makefile.tmpl 1999/09/01 14:38:41 1.3
@@ -42,19 +42,28 @@
$(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)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
- $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.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_lib.h ../../lib/apr/include/apr_file_io.h \
+ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
+ $(INCDIR)/util_uri.h iol_socket.h
os-aix-dso.o: os-aix-dso.c
os-inline.o: os-inline.c $(INCDIR)/ap_config.h \
$(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
- $(OSDIR)/os.h $(INCDIR)/ap_ctype.h
+ $(OSDIR)/os.h $(INCDIR)/ap_ctype.h $(INCDIR)/hsregex.h
os.o: os.c $(INCDIR)/ap_config.h $(INCDIR)/ap_mmn.h \
$(INCDIR)/ap_config_auto.h $(OSDIR)/os.h \
- $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h os.h
+ $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
+ $(INCDIR)/hsregex.h os.h
unixd.o: unixd.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)/alloc.h $(INCDIR)/buff.h $(INCDIR)/ap_iol.h \
- $(INCDIR)/ap.h $(INCDIR)/apr.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/ap_hooks.h \
- $(INCDIR)/http_main.h $(INCDIR)/http_log.h unixd.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_lib.h ../../lib/apr/include/apr_file_io.h \
+ ../../lib/apr/include/hsregex.h $(INCDIR)/buff.h \
+ $(INCDIR)/ap_iol.h $(INCDIR)/ap.h $(INCDIR)/apr.h \
+ $(INCDIR)/util_uri.h $(INCDIR)/http_config.h \
+ $(INCDIR)/ap_hooks.h $(INCDIR)/http_main.h \
+ $(INCDIR)/http_log.h unixd.h