]> granicus.if.org Git - apache/blobdiff - Makefile.in
Fix RedirectMatch so it won't emit invalid Location fields.
[apache] / Makefile.in
index 69bd87a8047563d52d2885c58d19430f30945609..6d8a23daca0c6c564ab08521f370dd472b0cead6 100644 (file)
@@ -1,5 +1,6 @@
 
 SUBDIRS = srclib os server modules support
+CLEAN_SUBDIRS = test
 
 PROGRAM_NAME         = $(progname)
 PROGRAM_SOURCES      = modules.c
@@ -13,29 +14,59 @@ PROGRAM_DEPENDENCIES = \
   $(AP_LIBS)
 
 PROGRAMS        = $(PROGRAM_NAME)
-targets         = $(PROGRAMS) $(other_targets)
-phony_targets   = $(srcdir)/buildmark.c
-install_targets = install-conf install-htdocs install-icons install-other \
-       install-cgi install-include install-support install-suexec
-DISTCLEAN_TARGETS  = include/config_auto.h modules.c aclocal.m4 buildmk.stamp \
-       configure generated_lists include/ap_config_auto.h \
-       include/ap_config_auto.h.in include/ap_config_path.h install-sh \
-       missing mkinstalldirs
-
-include $(top_srcdir)/build/rules.mk
+TARGETS         = $(PROGRAMS) $(shared_build) $(other_targets)
+PHONY_TARGETS   = $(srcdir)/buildmark.c
+INSTALL_TARGETS = install-conf install-htdocs install-error install-icons \
+       install-other install-cgi install-include install-suexec install-man \
+       install-build
+
+DISTCLEAN_TARGETS  = include/ap_config_auto.h include/ap_config_path.h \
+       modules.c config.cache config.log config.status config_vars.mk
+EXTRACLEAN_TARGETS = configure include/ap_config_auto.h.in generated_lists
+
+include $(top_builddir)/build/rules.mk
 include $(top_srcdir)/build/program.mk
 
 install-conf:
        @echo Installing configuration files
        @test -d $(sysconfdir) || $(MKINSTALLDIRS) $(sysconfdir)
-       @cd docs/conf; \
+       @cd $(top_srcdir)/docs/conf; \
        for i in mime.types magic; do \
                $(INSTALL_DATA) $$i $(sysconfdir); \
        done; \
-       for i in *-std*; do \
-               sed -e 's#@@ServerRoot@@#$(prefix)#g' \
-                   -e 's#@@Port@@#$(PORT)#g' \
-                       < $$i > $(sysconfdir)/$$i; \
+       for i in *-std* ssl.conf; do \
+               [ -f $$i ] || continue; \
+               ( \
+                       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 '/@@LoadModule@@/d' \
+                                       < $$i; \
+                       else \
+                               sed -n -e '/@@LoadModule@@/q' \
+                                       -e 's#@@ServerRoot@@#$(prefix)#g' \
+                                       -e 's#@@Port@@#$(PORT)#g' \
+                                       -e 'p' \
+                                       < $$i; \
+                               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 modules/mod_$${j}.so"; \
+                                       fi; \
+                                       if test "x$$j" = "xssl"; then \
+                                               echo "</IfDefine>"; \
+                                       fi; \
+                               done; \
+                               sed -e '1,/@@LoadModule@@/d' \
+                                       -e '/@@LoadModule@@/d' \
+                                       -e 's#@@ServerRoot@@#$(prefix)#g' \
+                                       -e 's#@@Port@@#$(PORT)#g' \
+                                       < $$i; \
+                       fi \
+               ) > $(sysconfdir)/$$i; \
                chmod 0644 $(sysconfdir)/$$i; \
                file=`echo $$i|sed s/-std//`; \
                if [ "$$file" = "httpd.conf" ]; then \
@@ -45,53 +76,60 @@ install-conf:
                        $(INSTALL_DATA) $(sysconfdir)/$$i $(sysconfdir)/$$file; \
                fi; \
        done
+       @if test -f "$(builddir)/envvars-std"; then \
+           cp -p envvars-std $(sbindir); \
+           if test ! -f $(sbindir)/envvars; then \
+               cp -p envvars-std $(sbindir)/envvars ; \
+           fi ; \
+       fi
 
-htdocs-srcdir = docs/docroot
+install-build:
+       @echo Installing build system files 
+       @test -d $(installbuilddir) || $(MKINSTALLDIRS) $(installbuilddir) 
+       @sed 's#LIBTOOL = \(.*\)#LIBTOOL = $(SHELL) $(installbuilddir)/libtool $(LTFLAGS)#' \
+           config_vars.mk > $(installbuilddir)/config_vars.mk; \
+       cp build/*.mk $(installbuilddir); \
+       cp $(top_srcdir)/build/instdso.sh $(installbuilddir); \
+       cp srclib/apr/libtool $(installbuilddir); \
+       if test -f srclib/apr/shlibtool; then \
+           cp srclib/apr/shlibtool $(installbuilddir); \
+       fi
+
+htdocs-srcdir = $(top_srcdir)/docs/docroot
 
 docs::
        mkdir -p ./docs/api
-       srclib/apr/build/scandoc -isrclib/apr/build/default.pl -p./docs/api/ ./include/*.h
+       srclib/apr/build/scandoc.pl -i./build/default.pl -p./docs/api/ ./include/*.h
 
 dox::
-       $(HOME)/software/unpacked/doxygen-1.2.5/bin/doxygen docs/doxygen.conf
+       doxygen $(top_srcdir)/docs/doxygen.conf
 
 install-htdocs:
        @echo Installing HTML documents
        @test -d $(htdocsdir) || $(MKINSTALLDIRS) $(htdocsdir)
        @test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(htdocsdir))
-       @test -d $(htdocsdir)/manual || $(MKINSTALLDIRS) $(htdocsdir)/manual
-       @test -d docs/manual && (cd docs/manual && cp -rp * $(htdocsdir)/manual)
+       @test -d $(manualdir) || $(MKINSTALLDIRS) $(manualdir)
+       @test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(manualdir))
        @(cd $(htdocsdir) && find . -name "CVS" -print | xargs rm -rf {} \;)
 
+install-error:
+       @echo Installing error documents
+       @test -d $(errordir) || $(MKINSTALLDIRS) $(errordir)
+       @(cd $(top_srcdir)/docs/error && cp -rp * $(errordir))
+       @(cd $(errordir) && find . -name "CVS" -print | xargs rm -rf {} \;)
+
 install-icons:
        @echo Installing icons
        @test -d $(iconsdir) || $(MKINSTALLDIRS) $(iconsdir)
-       @(cd docs/icons && cp -rp * $(iconsdir))
+       @(cd $(top_srcdir)/docs/icons && cp -rp * $(iconsdir))
        @(cd $(iconsdir) && find . -name "CVS" -print | xargs rm -rf {} \;)
 
 install-cgi:
        @echo Installing CGIs
        @test -d $(cgidir) || $(MKINSTALLDIRS) $(cgidir)
-       @(cd docs/cgi-examples && cp -rp * $(cgidir))
+       @(cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(cgidir))
        @(cd $(cgidir) && find . -name "CVS" -print | xargs rm -rf {} \;)
 
-install-support:
-       @echo Installing Support Binaries
-       @test -d $(bindir) || $(MKINSTALLDIRS) $(bindir)
-       @cp -p $(srcdir)/support/httpd.exp $(bindir)
-       @cp -p $(builddir)/support/htpasswd $(bindir)
-       @cp -p $(builddir)/support/htdigest $(bindir)
-       @cp -p $(builddir)/support/rotatelogs $(bindir)
-       @cp -p $(builddir)/support/logresolve $(bindir)
-       @cp -p $(builddir)/support/ab $(bindir)
-       @cp -p $(builddir)/support/apachectl $(bindir)
-       chmod 755 $(bindir)/apachectl
-       @if test -f $(builddir)/support/apxs; then \
-           cp -p $(builddir)/support/apxs $(bindir); \
-           chmod 755 $(bindir)/apxs; \
-       fi
-
-
 install-other:
        @test -d $(logfiledir) || $(MKINSTALLDIRS) $(logfiledir)
        @for ext in dll x; do \
@@ -99,7 +137,11 @@ install-other:
                if test -f $$file; then \
                        cp -p $$file $(bindir); \
                fi; \
-       done;
+       done; \
+       file=httpd.dll; \
+       if test -f $$file; then \
+               cp -p $$file $(bindir); \
+       fi;
 
 install-include:
        @echo Installing header files
@@ -112,20 +154,32 @@ install-include:
        @cp -p $(srcdir)/server/mpm/$(MPM_NAME)/*.h $(includedir)
        @cp -p $(srcdir)/modules/dav/main/mod_dav.h $(includedir)
        @cp -p $(srcdir)/modules/filters/mod_include.h $(includedir)
-       @cp -p $(srcdir)/srclib/pcre/*.h $(includedir)
+       @cp -p $(srcdir)/modules/generators/mod_cgi.h $(includedir)
+       @cp -p $(srcdir)/modules/http/mod_core.h $(includedir)
+       @cp -p $(srcdir)/modules/proxy/mod_proxy.h $(includedir)
+       @cp -p $(srcdir)/modules/ssl/*.h $(includedir)
+       @cp -p $(srcdir)/srclib/pcre/pcre*.h $(includedir)
        @cp -p $(srcdir)/srclib/apr/include/*.h $(includedir)
        @cp -p $(srcdir)/srclib/apr-util/include/*.h $(includedir)
        @cp -p $(srcdir)/os/$(OS_DIR)/*.h $(includedir)
        @chmod 644 $(includedir)/*.h
 
+install-man:
+       @echo Installing man pages
+       @test -d $(mandir)      || $(MKINSTALLDIRS) $(mandir)
+       @test -d $(mandir)/man1 || $(MKINSTALLDIRS) $(mandir)/man1
+       @test -d $(mandir)/man8 || $(MKINSTALLDIRS) $(mandir)/man8
+       @cp -p $(top_srcdir)/docs/man/*.1 $(mandir)/man1
+       @cp -p $(top_srcdir)/docs/man/*.8 $(mandir)/man8
+
 install-suexec:
        @if test -f $(builddir)/support/suexec; then \
             test -d $(sbindir) || $(MKINSTALLDIRS) $(sbindir); \
-            cp -p $(srcdir)/support/suexec $(sbindir); \
+            $(INSTALL_PROGRAM) $(top_builddir)/support/suexec $(sbindir); \
             chmod 4755 $(sbindir)/suexec; \
        fi
 
 suexec:
-       cd support && make suexec
+       cd support && $(MAKE) suexec
 
 include $(top_srcdir)/os/os2/core.mk