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 \
$(MPM_LIB) \
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-build \
install-man
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
done; \
for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \
cd $$j ; \
- for i in httpd.conf extra/httpd-*.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`; \
-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 $$j != "^EOL^"; then \
- if echo "$(ENABLED_DSO_MODULES)"|$(EGREP) "\<$$j\>" > /dev/null ; then \
+ if echo ",$(ENABLED_DSO_MODULES),"|$(EGREP) ",$$j," > /dev/null ; then \
loading_disabled=""; \
else \
loading_disabled="#"; \
if test "$(LOAD_ALL_MODULES)" = "yes"; then \
loading_disabled=""; \
fi; \
- echo "$${loading_disabled}LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \
- 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' \
@$(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
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
$(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/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
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:
x-local-distclean:
@rm -rf autom4te.cache
+update-log-tags update-log-msg-tags:
+ find server modules os -name \*.c|xargs perl \
+ docs/log-message-tags/update-log-msg-tags
+
# XXX: This looks awfully platform-specific [read: bad form and style]
include $(top_srcdir)/os/os2/core.mk
projects / apache / blobdiff