metafiles

[apache] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 940d037efb12e3491a229fe7ddd48632004e43a1..0f8cf8d51bca565518372ea903a17df3dc9265ad 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,7 +4,7 @@ CLEAN_SUBDIRS = test
 
 PROGRAM_NAME         = $(progname)
 PROGRAM_SOURCES      = modules.c
-PROGRAM_LDADD        = buildmark.o $(HTTPD_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(PCRE_LIBS) $(EXTRA_LIBS) $(AP_LIBS) $(LIBS)
+PROGRAM_LDADD        = buildmark.o $(HTTPD_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(HTTPD_LIBS) $(EXTRA_LIBS) $(AP_LIBS) $(LIBS)
 PROGRAM_PRELINK      = $(COMPILE) -c $(top_srcdir)/server/buildmark.c
 PROGRAM_DEPENDENCIES = \
   server/libmain.la \
@@ -22,7 +22,7 @@ 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.conf docs/conf/extra/*.conf shlibtool \
-       build/pkg/pkginfo build/config_vars.sh
+       build/pkg/pkginfo build/config_vars.sh bsd_converted
 EXTRACLEAN_TARGETS = configure include/ap_config_auto.h.in generated_lists \
        httpd.spec
 
@@ -102,16 +102,14 @@ 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 
-       @$(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
+       @echo Installing build system files
+       @$(MKINSTALLDIRS) $(DESTDIR)$(installbuilddir)
+       @$(INSTALL_DATA) $(top_srcdir)/build/*.mk build/*.mk \
+               $(DESTDIR)$(installbuilddir)
+       @$(INSTALL_PROGRAM) $(top_builddir)/config.nice \
+               $(top_srcdir)/build/mkdir.sh \
+               $(top_srcdir)/build/instdso.sh \
+               $(DESTDIR)$(installbuilddir)
        @$(INSTALL_DATA) build/config_vars.out $(DESTDIR)$(installbuilddir)/config_vars.mk
        @rm build/config_vars.out
 
@@ -125,6 +123,14 @@ docs:
            echo '  http://httpd.apache.org/docs-project/docsformat.html'; \
        fi
 
+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
 
@@ -194,9 +200,11 @@ INSTALL_HEADERS = \
        $(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 \
@@ -205,14 +213,13 @@ INSTALL_HEADERS = \
        $(srcdir)/modules/proxy/mod_serf.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
        @$(MKINSTALLDIRS) $(DESTDIR)$(includedir)
-       @for hdr in $(INSTALL_HEADERS); do \
-         $(INSTALL_DATA) $$hdr $(DESTDIR)$(includedir); \
-       done
+       @$(INSTALL_DATA) $(INSTALL_HEADERS) $(DESTDIR)$(includedir)
 
 install-man:
        @echo Installing man pages and online manual
@@ -229,11 +236,22 @@ install-man:
          cd $(DESTDIR)$(manualdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
        fi
 
-install-suexec:
+install-suexec: install-suexec-binary install-suexec-$(INSTALL_SUEXEC)
+
+install-suexec-binary:
        @if test -f $(builddir)/support/suexec; then \
             test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir); \
             $(INSTALL_PROGRAM) $(top_builddir)/support/suexec $(DESTDIR)$(sbindir); \
-            chmod 4755 $(DESTDIR)$(sbindir)/suexec; \
+       fi
+
+install-suexec-setuid:
+       @if test -f $(builddir)/support/suexec; then \
+           chmod 4755 $(DESTDIR)$(sbindir)/suexec; \
+       fi
+
+install-suexec-caps:
+       @if test -f $(builddir)/support/suexec; then \
+            setcap 'cap_setuid,cap_setgid+pe' $(DESTDIR)$(sbindir)/suexec; \
        fi
 
 suexec: