pcs 97/08/10 06:33:59
Modified: src Makefile.tmpl
Log:
Source re-org: new simplified top-level makefile suffix
Revision Changes Path
1.55 +29 -118 apachen/src/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apachen/src/Makefile.tmpl,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- Makefile.tmpl 1997/08/06 20:21:19 1.54
+++ Makefile.tmpl 1997/08/10 13:33:58 1.55
@@ -8,15 +8,21 @@
INCLUDES=$(INCLUDES1) $(EXTRA_INCLUDES)
LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
-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 modules.o buff.o\
- md5c.o util_md5.o explain.o http_bprintf.o util_date.o util_snprintf.o\
- fnmatch.o $(MODULES)
+OBJS= \
+ core/alloc.o core/http_main.o core/http_core.o \
+ core/http_config.o core/http_request.o core/http_log.o \
+ core/http_protocol.o core/rfc1413.o core/util.o \
+ core/util_script.o core/buff.o core/md5c.o \
+ core/util_md5.o core/explain.o core/http_bprintf.o \
+ core/util_date.o core/util_snprintf.o core/fnmatch.o \
+ modules.o \
+ $(OSOBJ) \
+ $(MODULES)
.c.o:
$(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $<
-all: @@Configuration@@ httpd
+all: @@Configuration@@ os-dir core-dir modules/last-built httpd
@@Configuration@@: Configuration.tmpl
@echo "@@Configuration@@ older than Configuration.tmpl, or doesn't
exist."
@@ -25,7 +31,7 @@
@echo "If not, you will at least have to touch @@Configuration@@."
@false
-httpd: $(REGLIB) $(OBJS)
+httpd: $(REGLIB) modules.o
$(CC) $(LDFLAGS) -o httpd $(OBJS) $(REGLIB) $(LIBS)
regex/libregex.a:
@@ -35,10 +41,23 @@
(cd modules; \
$(MAKE) CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)')
+support: support-dir
+
+support-dir:
+ cd support; $(MAKE)
+
+core-dir:
+ cd core; $(MAKE)
+
+os-dir:
+ cd $(OSDIR); $(MAKE)
+
clean:
- rm -f httpd *.o core
+ rm -f httpd *.o $(OBJS)
+ cd core; $(MAKE) clean
cd regex; $(MAKE) clean
cd modules; $(MAKE) clean
+ cd support; $(MAKE) clean
dist.tar:
# Assure a semi-sensible configuration going out...
@@ -47,10 +66,6 @@
tar cvf dist.tar README INSTALL CHANGES TODO API.html \
Configuration Configure Makefile.tmpl Makefile *.h *.c
-# Work around broken compilers
-http_bprintf.o: http_bprintf.c
- $(CC) -c $(INCLUDES) $(CFLAGS) $(BROKEN_BPRINTF_FLAGS) http_bprintf.c
-
# We really don't expect end users to use this rule. It works only with
# gcc, and rebuilds Makefile.tmpl. You have to re-run Configure after
# using it.
@@ -60,115 +75,11 @@
&& mv Makefile.tmpl Makefile.tmpl.bak \
&& mv Makefile.new Makefile.tmpl
+
#Dependencies
$(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
-dummy.o: dummy.c
-explain.o: explain.c 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_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_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_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
-util_snprintf.o: util_snprintf.c conf.h
+modules.o: modules.c core/httpd.h core/conf.h core/alloc.h core/buff.h \
+ core/http_config.h
