coar 98/02/01 07:56:21
Modified: src Configure Makefile.tmpl
src/os/bs2000 Makefile.tmpl
src/os/emx Makefile.tmpl
src/os/unix Makefile.tmpl
src/main Makefile.tmpl
src/ap Makefile.tmpl
Log:
Phase 2 of moving the .h files into src/include.. modify the scripts
and Makefiles that reference them.
Revision Changes Path
1.179 +4 -3 apache-1.3/src/Configure
Index: Configure
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- Configure 1998/01/21 23:59:54 1.178
+++ Configure 1998/02/01 15:56:14 1.179
@@ -873,7 +873,7 @@
if [ "$RULE_WANTHSREGEX" = "yes" ]; then
REGLIB="regex/libregex.a"
SUBDIRS="$SUBDIRS regex"
- INCLUDES_AUTODEPTH="$INCLUDES_AUTODEPTH regex"
+# INCLUDES_AUTODEPTH="$INCLUDES_AUTODEPTH regex"
fi
# create modules.c
@@ -991,7 +991,8 @@
echo "CFLAGS1=$CFLAGS">> Makefile.config
echo "INCLUDES1=$INCLUDES">> Makefile.config
-INCLUDES_AUTODEPTH="$INCLUDES_AUTODEPTH $OSDIR main ap"
+#INCLUDES_AUTODEPTH="$INCLUDES_AUTODEPTH $OSDIR main ap"
+INCLUDES_AUTODEPTH="$INCLUDES_AUTODEPTH $OSDIR include"
incprefix="-I"
for depth in 0 1 2; do
incvar="INCLUDES_DEPTH${depth}="
@@ -1071,7 +1072,7 @@
LIBS=$(EXTRA_LIBS) $(LIBS1)
INCLUDES=$(INCLUDES1) $(INCLUDES_DEPTH2) $(EXTRA_INCLUDES)
LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
-INCDIR=../../main
+INCDIR=../../include
EOF
if [ -f $moddir/Makefile.libdir ]; then
# it's responsible for the rest of its Makefile
1.74 +2 -2 apache-1.3/src/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/Makefile.tmpl,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- Makefile.tmpl 1997/11/30 19:17:23 1.73
+++ Makefile.tmpl 1998/02/01 15:56:14 1.74
@@ -69,5 +69,5 @@
$(OBJS): Makefile
# DO NOT REMOVE
-modules.o: modules.c main/httpd.h main/conf.h main/alloc.h main/buff.h \
- main/http_config.h
+modules.o: modules.c include/httpd.h include/conf.h include/alloc.h \
+ include/buff.h include/http_config.h
1.2 +1 -1 apache-1.3/src/os/bs2000/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/bs2000/Makefile.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.tmpl 1998/01/13 23:11:30 1.1
+++ Makefile.tmpl 1998/02/01 15:56:16 1.2
@@ -2,7 +2,7 @@
LIBS=$(EXTRA_LIBS) $(LIBS1)
INCLUDES=$(INCLUDES1) $(INCLUDES_DEPTH2) $(EXTRA_INCLUDES)
LFLAGS=$(LFLAGS1) $(EXTRA_LFLAGS)
-INCDIR=../../main
+INCDIR=../../include
OBJS= os.o os-inline.o ebcdic.o
1.2 +1 -1 apache-1.3/src/os/emx/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/emx/Makefile.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.tmpl 1997/11/05 12:48:22 1.1
+++ Makefile.tmpl 1998/02/01 15:56:17 1.2
@@ -2,7 +2,7 @@
LIBS=$(EXTRA_LIBS) $(LIBS1)
INCLUDES=$(INCLUDES_DEPTH2) $(EXTRA_INCLUDES)
LFLAGS=$(LFLAGS1) $(EXTRA_LFLAGS)
-INCDIR=../../main
+INCDIR=../../include
OBJS= os.o os-inline.o
COPY= os.h os-inline.c
1.10 +1 -1 apache-1.3/src/os/unix/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/os/unix/Makefile.tmpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.tmpl 1997/10/07 19:53:32 1.9
+++ Makefile.tmpl 1998/02/01 15:56:18 1.10
@@ -2,7 +2,7 @@
LIBS=$(EXTRA_LIBS) $(LIBS1)
INCLUDES=$(INCLUDES1) $(INCLUDES_DEPTH2) $(EXTRA_INCLUDES)
LFLAGS=$(LFLAGS1) $(EXTRA_LFLAGS)
-INCDIR=../../main
+INCDIR=../../include
OBJS= os.o os-inline.o
1.8 +163 -106 apache-1.3/src/main/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/main/Makefile.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.tmpl 1997/12/24 04:36:13 1.7
+++ Makefile.tmpl 1998/02/01 15:56:20 1.8
@@ -7,9 +7,10 @@
LIBS=$(EXTRA_LIBS) $(LIBS1)
INCLUDES=$(INCLUDES1) $(INCLUDES_DEPTH1) $(EXTRA_INCLUDES)
LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
+INCDIR=../include
OBJS= alloc.o http_main.o http_core.o http_config.o http_request.o \
- http_log.o http_protocol.o rfc1413.o util.o util_script.o buff.o\
+ http_log.o http_protocol.o rfc1413.o util.o util_script.o buff.o \
md5c.o util_md5.o explain.o http_bprintf.o util_date.o \
fnmatch.o http_vhost.o
@@ -37,110 +38,166 @@
$(OBJS): Makefile
# DO NOT REMOVE
-alloc.o: alloc.c httpd.h conf.h alloc.h buff.h multithread.h
-buff.o: buff.c httpd.h conf.h alloc.h buff.h http_main.h
+alloc.o: alloc.c $(INCDIR)/httpd.h $(INCDIR)/conf.h $(INCDIR)/alloc.h \
+ $(INCDIR)/buff.h $(INCDIR)/multithread.h
+buff.o: buff.c $(INCDIR)/httpd.h $(INCDIR)/conf.h $(INCDIR)/alloc.h \
+ $(INCDIR)/buff.h $(INCDIR)/http_main.h
dummy.o: dummy.c
-explain.o: explain.c explain.h
+explain.o: explain.c $(INCDIR)/explain.h
fnmatch.o: fnmatch.c
-gnu-fnmatch.o: gnu-fnmatch.c fnmatch.h
-http_bprintf.o: http_bprintf.c httpd.h conf.h alloc.h buff.h
-http_config.o: http_config.c httpd.h conf.h alloc.h buff.h \
- http_config.h http_core.h http_log.h http_request.h \
- http_conf_globals.h explain.h http_vhost.h
-http_core.o: http_core.c httpd.h conf.h alloc.h buff.h http_config.h \
- http_core.h http_protocol.h http_conf_globals.h http_main.h \
- http_log.h rfc1413.h util_md5.h md5.h scoreboard.h fnmatch.h
-http_log.o: http_log.c httpd.h conf.h alloc.h buff.h http_config.h \
- http_core.h http_log.h
-http_main.o: http_main.c httpd.h conf.h alloc.h buff.h http_main.h \
- http_log.h http_config.h http_protocol.h http_request.h \
- http_conf_globals.h http_core.h scoreboard.h multithread.h explain.h \
- http_vhost.h
-http_protocol.o: http_protocol.c httpd.h conf.h alloc.h buff.h \
- http_config.h http_core.h http_protocol.h http_main.h http_log.h \
- util_date.h http_vhost.h
-http_request.o: http_request.c httpd.h conf.h alloc.h buff.h \
- http_config.h http_request.h http_core.h http_protocol.h http_log.h \
- http_main.h scoreboard.h fnmatch.h
-md5c.o: md5c.c conf.h md5.h
-mod_access.o: mod_access.c httpd.h conf.h alloc.h buff.h http_core.h \
- http_config.h http_log.h http_request.h
-mod_actions.o: mod_actions.c httpd.h conf.h alloc.h buff.h \
- http_config.h http_request.h http_core.h http_protocol.h http_main.h \
- http_log.h util_script.h
-mod_alias.o: mod_alias.c httpd.h conf.h alloc.h buff.h http_config.h
-mod_asis.o: mod_asis.c httpd.h conf.h alloc.h buff.h http_config.h \
- http_protocol.h http_log.h util_script.h http_main.h http_request.h
-mod_auth.o: mod_auth.c httpd.h conf.h alloc.h buff.h http_config.h \
- http_core.h http_log.h http_protocol.h
-mod_auth_anon.o: mod_auth_anon.c httpd.h conf.h alloc.h buff.h \
- http_config.h http_core.h http_log.h http_protocol.h http_request.h
-mod_auth_db.o: mod_auth_db.c httpd.h conf.h alloc.h buff.h \
- http_config.h http_core.h http_log.h http_protocol.h
-mod_auth_dbm.o: mod_auth_dbm.c httpd.h conf.h alloc.h buff.h \
- http_config.h http_core.h http_log.h http_protocol.h
-mod_auth_msql.o: mod_auth_msql.c httpd.h conf.h alloc.h buff.h \
- http_config.h http_core.h http_log.h http_protocol.h
-mod_autoindex.o: mod_autoindex.c httpd.h conf.h alloc.h buff.h \
- http_config.h http_core.h http_request.h http_protocol.h http_log.h \
- http_main.h util_script.h
-mod_browser.o: mod_browser.c httpd.h conf.h alloc.h buff.h \
- http_config.h
-mod_cern_meta.o: mod_cern_meta.c httpd.h conf.h alloc.h buff.h \
- http_config.h util_script.h http_log.h http_request.h
-mod_cgi.o: mod_cgi.c httpd.h conf.h alloc.h buff.h http_config.h \
- http_request.h http_core.h http_protocol.h http_main.h http_log.h \
- util_script.h http_conf_globals.h
-mod_digest.o: mod_digest.c httpd.h conf.h alloc.h buff.h http_config.h \
- http_core.h http_log.h http_protocol.h util_md5.h md5.h
-mod_dir.o: mod_dir.c httpd.h conf.h alloc.h buff.h http_config.h \
- http_core.h http_request.h http_protocol.h http_log.h http_main.h \
- util_script.h
-mod_dld.o: mod_dld.c httpd.h conf.h alloc.h buff.h http_config.h \
- http_conf_globals.h
-mod_env.o: mod_env.c httpd.h conf.h alloc.h buff.h http_config.h
-mod_expires.o: mod_expires.c httpd.h conf.h alloc.h buff.h \
- http_config.h http_log.h
-mod_headers.o: mod_headers.c httpd.h conf.h alloc.h buff.h \
- http_config.h
-mod_imap.o: mod_imap.c httpd.h conf.h alloc.h buff.h http_config.h \
- http_request.h http_core.h http_protocol.h http_main.h http_log.h \
- util_script.h
-mod_include.o: mod_include.c httpd.h conf.h alloc.h buff.h \
- http_config.h http_request.h http_core.h http_protocol.h http_log.h \
- http_main.h util_script.h
-mod_info.o: mod_info.c httpd.h conf.h alloc.h buff.h http_config.h \
- http_core.h http_log.h http_main.h http_protocol.h util_script.h \
- http_conf_globals.h
-mod_log_agent.o: mod_log_agent.c httpd.h conf.h alloc.h buff.h \
- http_config.h
-mod_log_config.o: mod_log_config.c httpd.h conf.h alloc.h buff.h \
- http_config.h http_core.h
-mod_log_referer.o: mod_log_referer.c httpd.h conf.h alloc.h buff.h \
- http_config.h
-mod_mime.o: mod_mime.c httpd.h conf.h alloc.h buff.h http_config.h \
- mod_mime.h
-mod_mime_magic.o: mod_mime_magic.c httpd.h conf.h alloc.h buff.h \
- http_config.h http_request.h http_core.h http_log.h http_protocol.h
-mod_negotiation.o: mod_negotiation.c httpd.h conf.h alloc.h buff.h \
- http_config.h http_request.h http_core.h http_log.h util_script.h
-mod_rewrite.o: mod_rewrite.c httpd.h conf.h alloc.h buff.h \
- http_config.h http_request.h http_core.h http_log.h mod_rewrite.h
-mod_setenvif.o: mod_setenvif.c httpd.h conf.h alloc.h buff.h \
- http_config.h http_core.h http_log.h
-mod_status.o: mod_status.c httpd.h conf.h alloc.h buff.h http_config.h \
- http_core.h http_protocol.h http_main.h util_script.h scoreboard.h \
- http_log.h
-mod_userdir.o: mod_userdir.c httpd.h conf.h alloc.h buff.h \
- http_config.h
-mod_usertrack.o: mod_usertrack.c httpd.h conf.h alloc.h buff.h \
- http_config.h http_core.h
-modules.o: modules.c httpd.h conf.h alloc.h buff.h http_config.h
-rfc1413.o: rfc1413.c httpd.h conf.h alloc.h buff.h http_log.h \
- rfc1413.h http_main.h
-util.o: util.c httpd.h conf.h alloc.h buff.h http_conf_globals.h
-util_date.o: util_date.c conf.h util_date.h
-util_md5.o: util_md5.c httpd.h conf.h alloc.h buff.h util_md5.h md5.h
-util_script.o: util_script.c httpd.h conf.h alloc.h buff.h \
- http_config.h http_conf_globals.h http_main.h http_log.h \
- http_protocol.h http_core.h http_request.h util_script.h
+gnu-fnmatch.o: gnu-fnmatch.c $(INCDIR)/fnmatch.h
+http_bprintf.o: http_bprintf.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h
+http_config.o: http_config.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
+ $(INCDIR)/http_core.h $(INCDIR)/http_log.h $(INCDIR)/http_request.h \
+ $(INCDIR)/http_conf_globals.h $(INCDIR)/explain.h \
+ $(INCDIR)/http_vhost.h
+http_core.o: http_core.c $(INCDIR)/httpd.h $(INCDIR)/conf.h
$(INCDIR)/alloc.h \
+ $(INCDIR)/buff.h $(INCDIR)/http_config.h $(INCDIR)/http_core.h \
+ $(INCDIR)/http_protocol.h $(INCDIR)/http_conf_globals.h \
+ $(INCDIR)/http_main.h $(INCDIR)/http_log.h $(INCDIR)/rfc1413.h \
+ $(INCDIR)/util_md5.h $(INCDIR)/md5.h $(INCDIR)/scoreboard.h \
+ $(INCDIR)/fnmatch.h
+http_log.o: http_log.c $(INCDIR)/httpd.h $(INCDIR)/conf.h $(INCDIR)/alloc.h \
+ $(INCDIR)/buff.h $(INCDIR)/http_config.h $(INCDIR)/http_core.h \
+ $(INCDIR)/http_log.h
+http_main.o: http_main.c $(INCDIR)/httpd.h $(INCDIR)/conf.h
$(INCDIR)/alloc.h \
+ $(INCDIR)/buff.h $(INCDIR)/http_main.h $(INCDIR)/http_log.h \
+ $(INCDIR)/http_config.h $(INCDIR)/http_protocol.h \
+ $(INCDIR)/http_request.h $(INCDIR)/http_conf_globals.h \
+ $(INCDIR)/http_core.h $(INCDIR)/scoreboard.h $(INCDIR)/multithread.h \
+ $(INCDIR)/explain.h $(INCDIR)/http_vhost.h
+http_protocol.o: http_protocol.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
+ $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h $(INCDIR)/http_main.h \
+ $(INCDIR)/http_log.h $(INCDIR)/util_date.h $(INCDIR)/http_vhost.h
+http_request.o: http_request.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
+ $(INCDIR)/http_request.h $(INCDIR)/http_core.h \
+ $(INCDIR)/http_protocol.h $(INCDIR)/http_log.h $(INCDIR)/http_main.h \
+ $(INCDIR)/scoreboard.h $(INCDIR)/fnmatch.h
+md5c.o: md5c.c $(INCDIR)/conf.h $(INCDIR)/md5.h
+mod_access.o: mod_access.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_core.h \
+ $(INCDIR)/http_config.h $(INCDIR)/http_log.h $(INCDIR)/http_request.h
+mod_actions.o: mod_actions.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
+ $(INCDIR)/http_request.h $(INCDIR)/http_core.h \
+ $(INCDIR)/http_protocol.h $(INCDIR)/http_main.h $(INCDIR)/http_log.h \
+ $(INCDIR)/util_script.h
+mod_alias.o: mod_alias.c $(INCDIR)/httpd.h $(INCDIR)/conf.h
$(INCDIR)/alloc.h \
+ $(INCDIR)/buff.h $(INCDIR)/http_config.h
+mod_asis.o: mod_asis.c $(INCDIR)/httpd.h $(INCDIR)/conf.h $(INCDIR)/alloc.h \
+ $(INCDIR)/buff.h $(INCDIR)/http_config.h $(INCDIR)/http_protocol.h \
+ $(INCDIR)/http_log.h $(INCDIR)/util_script.h $(INCDIR)/http_main.h \
+ $(INCDIR)/http_request.h
+mod_auth.o: mod_auth.c $(INCDIR)/httpd.h $(INCDIR)/conf.h $(INCDIR)/alloc.h \
+ $(INCDIR)/buff.h $(INCDIR)/http_config.h $(INCDIR)/http_core.h \
+ $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h
+mod_auth_anon.o: mod_auth_anon.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
+ $(INCDIR)/http_core.h $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \
+ $(INCDIR)/http_request.h
+mod_auth_db.o: mod_auth_db.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
+ $(INCDIR)/http_core.h $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h
+mod_auth_dbm.o: mod_auth_dbm.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
+ $(INCDIR)/http_core.h $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h
+mod_auth_msql.o: mod_auth_msql.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
+ $(INCDIR)/http_core.h $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h
+mod_autoindex.o: mod_autoindex.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
+ $(INCDIR)/http_core.h $(INCDIR)/http_request.h \
+ $(INCDIR)/http_protocol.h $(INCDIR)/http_log.h $(INCDIR)/http_main.h \
+ $(INCDIR)/util_script.h
+mod_browser.o: mod_browser.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h
+mod_cern_meta.o: mod_cern_meta.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
+ $(INCDIR)/util_script.h $(INCDIR)/http_log.h $(INCDIR)/http_request.h
+mod_cgi.o: mod_cgi.c $(INCDIR)/httpd.h $(INCDIR)/conf.h $(INCDIR)/alloc.h \
+ $(INCDIR)/buff.h $(INCDIR)/http_config.h $(INCDIR)/http_request.h \
+ $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h $(INCDIR)/http_main.h \
+ $(INCDIR)/http_log.h $(INCDIR)/util_script.h \
+ $(INCDIR)/http_conf_globals.h
+mod_digest.o: mod_digest.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
+ $(INCDIR)/http_core.h $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h \
+ $(INCDIR)/util_md5.h $(INCDIR)/md5.h
+mod_dir.o: mod_dir.c $(INCDIR)/httpd.h $(INCDIR)/conf.h $(INCDIR)/alloc.h \
+ $(INCDIR)/buff.h $(INCDIR)/http_config.h $(INCDIR)/http_core.h \
+ $(INCDIR)/http_request.h $(INCDIR)/http_protocol.h \
+ $(INCDIR)/http_log.h $(INCDIR)/http_main.h $(INCDIR)/util_script.h
+mod_dld.o: mod_dld.c $(INCDIR)/httpd.h $(INCDIR)/conf.h $(INCDIR)/alloc.h \
+ $(INCDIR)/buff.h $(INCDIR)/http_config.h $(INCDIR)/http_conf_globals.h
+mod_env.o: mod_env.c $(INCDIR)/httpd.h $(INCDIR)/conf.h $(INCDIR)/alloc.h \
+ $(INCDIR)/buff.h $(INCDIR)/http_config.h
+mod_expires.o: mod_expires.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
+ $(INCDIR)/http_log.h
+mod_headers.o: mod_headers.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h
+mod_imap.o: mod_imap.c $(INCDIR)/httpd.h $(INCDIR)/conf.h $(INCDIR)/alloc.h \
+ $(INCDIR)/buff.h $(INCDIR)/http_config.h $(INCDIR)/http_request.h \
+ $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h $(INCDIR)/http_main.h \
+ $(INCDIR)/http_log.h $(INCDIR)/util_script.h
+mod_include.o: mod_include.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
+ $(INCDIR)/http_request.h $(INCDIR)/http_core.h \
+ $(INCDIR)/http_protocol.h $(INCDIR)/http_log.h $(INCDIR)/http_main.h \
+ $(INCDIR)/util_script.h
+mod_info.o: mod_info.c $(INCDIR)/httpd.h $(INCDIR)/conf.h $(INCDIR)/alloc.h \
+ $(INCDIR)/buff.h $(INCDIR)/http_config.h $(INCDIR)/http_core.h \
+ $(INCDIR)/http_log.h $(INCDIR)/http_main.h $(INCDIR)/http_protocol.h \
+ $(INCDIR)/util_script.h $(INCDIR)/http_conf_globals.h
+mod_log_agent.o: mod_log_agent.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h
+mod_log_config.o: mod_log_config.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
+ $(INCDIR)/http_core.h
+mod_log_referer.o: mod_log_referer.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h
+mod_mime.o: mod_mime.c $(INCDIR)/httpd.h $(INCDIR)/conf.h $(INCDIR)/alloc.h \
+ $(INCDIR)/buff.h $(INCDIR)/http_config.h $(INCDIR)/mod_mime.h
+mod_mime_magic.o: mod_mime_magic.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
+ $(INCDIR)/http_request.h $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
+ $(INCDIR)/http_protocol.h
+mod_negotiation.o: mod_negotiation.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
+ $(INCDIR)/http_request.h $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
+ $(INCDIR)/util_script.h
+mod_rewrite.o: mod_rewrite.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
+ $(INCDIR)/http_request.h $(INCDIR)/http_core.h $(INCDIR)/http_log.h \
+ $(INCDIR)/mod_rewrite.h
+mod_setenvif.o: mod_setenvif.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
+ $(INCDIR)/http_core.h $(INCDIR)/http_log.h
+mod_status.o: mod_status.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
+ $(INCDIR)/http_core.h $(INCDIR)/http_protocol.h $(INCDIR)/http_main.h \
+ $(INCDIR)/util_script.h $(INCDIR)/scoreboard.h $(INCDIR)/http_log.h
+mod_userdir.o: mod_userdir.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h
+mod_usertrack.o: mod_usertrack.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
+ $(INCDIR)/http_core.h
+modules.o: modules.c $(INCDIR)/httpd.h $(INCDIR)/conf.h $(INCDIR)/alloc.h \
+ $(INCDIR)/buff.h $(INCDIR)/http_config.h
+rfc1413.o: rfc1413.c $(INCDIR)/httpd.h $(INCDIR)/conf.h $(INCDIR)/alloc.h \
+ $(INCDIR)/buff.h $(INCDIR)/http_log.h $(INCDIR)/rfc1413.h \
+ $(INCDIR)/http_main.h
+util.o: util.c $(INCDIR)/httpd.h $(INCDIR)/conf.h $(INCDIR)/alloc.h \
+ $(INCDIR)/buff.h $(INCDIR)/http_conf_globals.h
+util_date.o: util_date.c $(INCDIR)/conf.h $(INCDIR)/util_date.h
+util_md5.o: util_md5.c $(INCDIR)/httpd.h $(INCDIR)/conf.h $(INCDIR)/alloc.h \
+ $(INCDIR)/buff.h $(INCDIR)/util_md5.h $(INCDIR)/md5.h
+util_script.o: util_script.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
+ $(INCDIR)/alloc.h $(INCDIR)/buff.h $(INCDIR)/http_config.h \
+ $(INCDIR)/http_conf_globals.h $(INCDIR)/http_main.h \
+ $(INCDIR)/http_log.h $(INCDIR)/http_protocol.h $(INCDIR)/http_core.h \
+ $(INCDIR)/http_request.h $(INCDIR)/util_script.h
1.9 +1 -1 apache-1.3/src/ap/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/ap/Makefile.tmpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.tmpl 1998/01/25 16:13:11 1.8
+++ Makefile.tmpl 1998/02/01 15:56:21 1.9
@@ -2,7 +2,7 @@
LIBS=$(EXTRA_LIBS) $(LIBS1)
INCLUDES=$(INCLUDES1) $(INCLUDES_DEPTH1) $(EXTRA_INCLUDES)
LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
-INCDIR=../main
+INCDIR=../include
LIB=libap.a
