X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=Makefile.in;h=6d952b24a1eedce048235d2cffdc1a16a22100e9;hb=ee66570028d11ca435f0977c25fd051cc37433a6;hp=7af3ca6cc9ad08f2d53992affe24465c2135b992;hpb=32cbe57a5f7d94d12a9b4530b6e6c179ff1fa3d4;p=apache

diff --git a/Makefile.in b/Makefile.in
index 7af3ca6cc9..6d952b24a1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,22 +4,25 @@ CLEAN_SUBDIRS = test
 
 PROGRAM_NAME         = $(progname)
 PROGRAM_SOURCES      = modules.c
-PROGRAM_LDADD        = $(HTTPD_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS) $(LIBS)
+PROGRAM_LDADD        = buildmark.o $(HTTPD_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(PCRE_LIBS) $(EXTRA_LIBS) $(AP_LIBS) $(LIBS)
+PROGRAM_PRELINK      = $(COMPILE) -c $(top_srcdir)/server/buildmark.c
 PROGRAM_DEPENDENCIES = \
+  server/libmain.la \
   $(BUILTIN_LIBS) \
   $(MPM_LIB) \
-  server/libmain.la \
   os/$(OS_DIR)/libos.la
 
-PROGRAMS        = $(PROGRAM_NAME)
-TARGETS         = $(PROGRAMS) $(shared_build) $(other_targets)
+sbin_PROGRAMS   = $(PROGRAM_NAME)
+TARGETS         = $(sbin_PROGRAMS) $(shared_build) $(other_targets)
 INSTALL_TARGETS = install-conf install-htdocs install-error install-icons \
-	install-other install-cgi install-include install-suexec install-man \
-	install-build
+	install-other install-cgi install-include install-suexec install-build \
+	install-man
 
 DISTCLEAN_TARGETS  = include/ap_config_auto.h include/ap_config_layout.h \
+	include/apache_probes.h \
 	modules.c config.cache config.log config.status build/config_vars.mk \
-	build/rules.mk docs/conf/httpd-std.conf docs/conf/ssl-std.conf shlibtool
+	build/rules.mk docs/conf/httpd.conf docs/conf/extra/*.conf shlibtool \
+	build/pkg/pkginfo build/config_vars.sh
 EXTRACLEAN_TARGETS = configure include/ap_config_auto.h.in generated_lists \
 	httpd.spec
 
@@ -27,11 +30,10 @@ include $(top_builddir)/build/rules.mk
 include $(top_srcdir)/build/program.mk
 
 install-conf:
-	@echo Installing configuration files ; \
-	if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
-	    $(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir) ; \
-	fi ; \
-	cd $(top_srcdir)/docs/conf; \
+	@echo Installing configuration files
+	@$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(sysconfdir)/extra
+	@$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir)/original/extra
+	@cd $(top_srcdir)/docs/conf; \
 	for i in mime.types magic; do \
 	    if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \
 	        $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \
@@ -39,45 +41,72 @@ install-conf:
 	done; \
 	for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \
 	    cd $$j ; \
-	    for i in *-std*.conf; do \
+	    for i in httpd.conf extra/*.conf; do \
+	    	if [ -f $$i ] ; then \
 	    	( \
 	    		n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \
 	    		if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" = "x"; then \
 	    			sed -e 's#@@ServerRoot@@#$(prefix)#g' \
 	    				-e 's#@@Port@@#$(PORT)#g' \
+	    				-e 's#@@SSLPort@@#$(SSLPORT)#g' \
 	    				-e '/@@LoadModule@@/d' \
 	    				< $$i; \
 	    		else \
 	    			sed -n -e '/@@LoadModule@@/q' \
 	    				-e 's#@@ServerRoot@@#$(prefix)#g' \
 	    				-e 's#@@Port@@#$(PORT)#g' \
+	    				-e 's#@@SSLPort@@#$(SSLPORT)#g' \
 	    				-e 'p' \
 	    				< $$i; \
+	    			if echo " $(DSO_MODULES) "|$(EGREP) " cgi " > /dev/null ; then \
+	    				have_cgi="1"; \
+	    			else \
+	    				have_cgi="0"; \
+	    			fi; \
+	    			if echo " $(DSO_MODULES) "|$(EGREP) " cgid " > /dev/null ; then \
+	    				have_cgid="1"; \
+	    			else \
+	    				have_cgid="0"; \
+	    			fi; \
 	    			for j in $(DSO_MODULES) "^EOL^"; do \
-	    				if test "x$$j" = "xssl"; then \
-	    					echo "<IfDefine SSL>"; \
-	    				fi; \
 	    				if test $$j != "^EOL^"; then \
-	    					echo "LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \
-	    				fi; \
-	    				if test "x$$j" = "xssl"; then \
-	    					echo "</IfDefine>"; \
-	    				fi; \
+	    					if echo ",$(ENABLED_DSO_MODULES),"|$(EGREP) ",$$j," > /dev/null ; then \
+	    						loading_disabled=""; \
+	    					else \
+	    						loading_disabled="#"; \
+	    					fi; \
+	    					if test "$(LOAD_ALL_MODULES)" = "yes"; then \
+	    						loading_disabled=""; \
+	    					fi; \
+							if test $$j = "cgid" -a "$$have_cgi" = "1"; then \
+								echo "<IfModule !mpm_prefork_module>"; \
+								echo "	$${loading_disabled}LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \
+								echo "</IfModule>"; \
+							elif test $$j = "cgi" -a "$$have_cgid" = "1"; then \
+								echo "<IfModule mpm_prefork_module>"; \
+								echo "	$${loading_disabled}LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \
+								echo "</IfModule>"; \
+							else \
+								echo "$${loading_disabled}LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \
+							fi; \
+						fi; \
 	    			done; \
 	    			sed -e '1,/@@LoadModule@@/d' \
 	    				-e '/@@LoadModule@@/d' \
 	    				-e 's#@@ServerRoot@@#$(prefix)#g' \
 	    				-e 's#@@Port@@#$(PORT)#g' \
+	    				-e 's#@@SSLPort@@#$(SSLPORT)#g' \
 	    				< $$i; \
 	    		fi \
-	    	) > $(DESTDIR)$(sysconfdir)/$$i; \
-	    	chmod 0644 $(DESTDIR)$(sysconfdir)/$$i; \
-	    	file=`echo $$i|sed s/-std//`; \
-	    	if [ "$$file" = "httpd.conf" ]; then \
-	    		file=`echo $$file|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \
+	    	) > $(DESTDIR)$(sysconfdir)/original/$$i; \
+	    	chmod 0644 $(DESTDIR)$(sysconfdir)/original/$$i; \
+	    	file=$$i; \
+	    	if [ "$$i" = "httpd.conf" ]; then \
+	    		file=`echo $$i|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \
+	    	fi; \
+	    	if test ! -f $(DESTDIR)$(sysconfdir)/$$file; then \
+	    		$(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/original/$$i $(DESTDIR)$(sysconfdir)/$$file; \
 	    	fi; \
-	    	if test "$$file" != "$$i" && test ! -f $(DESTDIR)$(sysconfdir)/$$file; then \
-	    		$(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/$$i $(DESTDIR)$(sysconfdir)/$$file; \
 	    	fi; \
 	    done ; \
 	done ; \
@@ -88,23 +117,43 @@ install-conf:
 	    fi ; \
 	fi
 
-install-build:
+# Create a sanitized config_vars.mk
+build/config_vars.out: build/config_vars.mk
+	@$(SHELL) build/config_vars.sh < build/config_vars.mk > build/config_vars.out
+
+install-build: build/config_vars.out
 	@echo Installing build system files 
-	@test -d $(DESTDIR)$(installbuilddir) || $(MKINSTALLDIRS) $(DESTDIR)$(installbuilddir) 
-	@cp $(top_srcdir)/build/*.mk $(DESTDIR)$(installbuilddir); \
-	cp build/*.mk $(DESTDIR)$(installbuilddir); \
-	sed 's#LIBTOOL = \(.*\)#LIBTOOL = $(SHELL) $(installbuilddir)/libtool $(LTFLAGS)#' \
-	    build/config_vars.mk > $(DESTDIR)$(installbuilddir)/config_vars.mk; \
-	cp $(top_srcdir)/build/instdso.sh $(DESTDIR)$(installbuilddir); \
-	cp $(top_builddir)/config.nice $(DESTDIR)$(installbuilddir);
+	@$(MKINSTALLDIRS) $(DESTDIR)$(installbuilddir) 
+	@for f in $(top_srcdir)/build/*.mk build/*.mk; do \
+	 $(INSTALL_DATA) $$f $(DESTDIR)$(installbuilddir); \
+	done
+	@for f in $(top_builddir)/config.nice \
+		  $(top_srcdir)/build/mkdir.sh \
+		  $(top_srcdir)/build/instdso.sh; do \
+	 $(INSTALL_PROGRAM) $$f $(DESTDIR)$(installbuilddir); \
+	done
+	@$(INSTALL_DATA) build/config_vars.out $(DESTDIR)$(installbuilddir)/config_vars.mk
+	@rm build/config_vars.out
 
 htdocs-srcdir = $(top_srcdir)/docs/docroot
 
-docs::
-	mkdir -p ./docs/api
-	srclib/apr/build/scandoc.pl -i./build/default.pl -p./docs/api/ ./include/*.h
+docs:
+	@if test -d $(top_srcdir)/docs/manual/build; then \
+	    cd $(top_srcdir)/docs/manual/build && ./build.sh all; \
+	else \
+	    echo 'For details on generating the docs, please read:'; \
+	    echo '  http://httpd.apache.org/docs-project/docsformat.html'; \
+	fi
 
-dox::
+validate-xml:
+	@if test -d $(top_srcdir)/docs/manual/build; then \
+	    cd $(top_srcdir)/docs/manual/build && ./build.sh validate-xml; \
+	else \
+	    echo 'For details on generating the docs, please read:'; \
+	    echo '  http://httpd.apache.org/docs-project/docsformat.html'; \
+	fi
+
+dox:
 	doxygen $(top_srcdir)/docs/doxygen.conf
 
 install-htdocs:
@@ -113,8 +162,12 @@ install-htdocs:
         else \
 	    echo Installing HTML documents ; \
 	    $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir) ; \
-	    test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) ; \
-	    cd $(DESTDIR)$(htdocsdir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \
+	    if test -d $(htdocs-srcdir) && test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \
+		$(RSYNC) --exclude .svn -rlpt --numeric-ids $(htdocs-srcdir)/ $(DESTDIR)$(htdocsdir)/; \
+	    else \
+		test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) ; \
+		cd $(DESTDIR)$(htdocsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
+	    fi; \
 	fi
 
 install-error:
@@ -124,7 +177,7 @@ install-error:
 	    echo Installing error documents ; \
 	    $(MKINSTALLDIRS) $(DESTDIR)$(errordir) ; \
 	    cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir) ; \
-	    test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \
+	    test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
 	fi
 
 install-icons:
@@ -134,7 +187,7 @@ install-icons:
 	    echo Installing icons ; \
 	    $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir) ; \
 	    cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir) ; \
-	    test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \
+	    test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
 	fi
 
 install-cgi:
@@ -144,7 +197,7 @@ install-cgi:
 	   echo Installing CGIs ; \
 	   $(MKINSTALLDIRS) $(DESTDIR)$(cgidir) ; \
 	   cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir) ; \
-	   test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \
+	   test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
 	fi
 
 install-other:
@@ -161,28 +214,35 @@ install-other:
 		cp -p $$file $(DESTDIR)$(bindir); \
 	fi;
 
+INSTALL_HEADERS = \
+	include/*.h \
+	$(srcdir)/include/*.h \
+	$(srcdir)/os/$(OS_DIR)/os.h \
+	$(srcdir)/modules/arch/unix/mod_unixd.h \
+	$(srcdir)/modules/core/mod_so.h \
+	$(srcdir)/modules/core/mod_watchdog.h \
+	$(srcdir)/modules/cache/mod_cache.h \
+	$(srcdir)/modules/cache/cache_common.h \
+	$(srcdir)/modules/database/mod_dbd.h \
+	$(srcdir)/modules/dav/main/mod_dav.h \
+	$(srcdir)/modules/filters/mod_include.h \
+	$(srcdir)/modules/filters/mod_xml2enc.h \
+	$(srcdir)/modules/generators/mod_cgi.h \
+	$(srcdir)/modules/generators/mod_status.h \
+	$(srcdir)/modules/loggers/mod_log_config.h \
+	$(srcdir)/modules/mappers/mod_rewrite.h \
+	$(srcdir)/modules/proxy/mod_proxy.h \
+        $(srcdir)/modules/session/mod_session.h \
+	$(srcdir)/modules/ssl/mod_ssl.h \
+	$(srcdir)/modules/ssl/mod_ssl_openssl.h \
+	$(srcdir)/os/$(OS_DIR)/*.h
+
 install-include:
 	@echo Installing header files
-	@test -d $(DESTDIR)$(includedir) || $(MKINSTALLDIRS) $(DESTDIR)$(includedir)
-	@cp -p include/*.h $(DESTDIR)$(includedir)
-	@cp -p $(srcdir)/include/*.h $(DESTDIR)$(includedir)
-	@cp -p $(srcdir)/os/$(OS_DIR)/os.h $(DESTDIR)$(includedir)
-	@if test -f $(srcdir)/os/$(OS_DIR)/os-inline.c; then \
-            cp -p $(srcdir)/os/$(OS_DIR)/os-inline.c $(DESTDIR)$(includedir); \
-        fi;
-	@cp -p $(srcdir)/server/mpm/$(MPM_SUBDIR_NAME)/*.h $(DESTDIR)$(includedir)
-	@cp -p $(srcdir)/modules/aaa/mod_auth.h $(DESTDIR)$(includedir)
-	@cp -p $(srcdir)/modules/dav/main/mod_dav.h $(DESTDIR)$(includedir)
-	@cp -p $(srcdir)/modules/filters/mod_include.h $(DESTDIR)$(includedir)
-	@cp -p $(srcdir)/modules/generators/mod_cgi.h $(DESTDIR)$(includedir)
-	@cp -p $(srcdir)/modules/generators/mod_status.h $(DESTDIR)$(includedir)
-	@cp -p $(srcdir)/modules/loggers/mod_log_config.h $(DESTDIR)$(includedir)
-	@cp -p $(srcdir)/modules/http/mod_core.h $(DESTDIR)$(includedir)
-	@cp -p $(srcdir)/modules/proxy/mod_proxy.h $(DESTDIR)$(includedir)
-	@cp -p $(srcdir)/modules/ssl/mod_ssl.h $(DESTDIR)$(includedir)
-	@cp -p $(srcdir)/srclib/pcre/pcre*.h $(DESTDIR)$(includedir)
-	@cp -p $(srcdir)/os/$(OS_DIR)/*.h $(DESTDIR)$(includedir)
-	@chmod 644 $(DESTDIR)$(includedir)/*.h
+	@$(MKINSTALLDIRS) $(DESTDIR)$(includedir)
+	@for hdr in $(INSTALL_HEADERS); do \
+	  $(INSTALL_DATA) $$hdr $(DESTDIR)$(includedir); \
+	done
 
 install-man:
 	@echo Installing man pages and online manual
@@ -192,8 +252,12 @@ install-man:
 	@test -d $(DESTDIR)$(manualdir)   || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
 	@cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1
 	@cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8
-	@(cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir))
-	@(cd $(DESTDIR)$(manualdir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null ) || true
+	@if test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \
+	  $(RSYNC) --exclude .svn -rlpt --numeric-ids $(top_srcdir)/docs/manual/ $(DESTDIR)$(manualdir)/; \
+	else \
+	  cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir); \
+	  cd $(DESTDIR)$(manualdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
+	fi
 
 install-suexec:
 	@if test -f $(builddir)/support/suexec; then \
@@ -208,4 +272,5 @@ suexec:
 x-local-distclean:
 	@rm -rf autom4te.cache
 
+# XXX: This looks awfully platform-specific [read: bad form and style]
 include $(top_srcdir)/os/os2/core.mk