Rebuild.

[apache] / NWGNUmakefile

diff --git a/NWGNUmakefile b/NWGNUmakefile
index c52971a7eda9f7c90e6e5d0e74b40b4f0ff9f4ff..e11219570d6352a6eaef373cf9229634cfa38a84 100644 (file)
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -62,18 +62,10 @@ XINCDIRS    += \
                        $(APR)/include \
                        $(APRUTIL)/include \
                        $(SRC)/include \
-                       $(STDMOD)/aaa \
                        $(STDMOD)/core \
                        $(STDMOD)/filters \
                        $(STDMOD)/generators \
-                       $(STDMOD)/http \
-                       $(STDMOD)/loggers \
-                       $(STDMOD)/mappers \
                        $(STDMOD)/proxy \
-                       $(STDMOD)/ssl \
-                       $(SERVER) \
-                       $(SERVER)/mpm/netware \
-                       $(PCRE) \
                        $(NWOS) \
                        $(EOLIST)
 
@@ -226,6 +218,17 @@ TARGET_lib = \
 # Paths must all use the '/' character
 #
 FILES_nlm_objs = \
+       $(OBJDIR)/apreq_cookie.o \
+       $(OBJDIR)/apreq_error.o \
+       $(OBJDIR)/apreq_module.o \
+       $(OBJDIR)/apreq_module_cgi.o \
+       $(OBJDIR)/apreq_module_custom.o \
+       $(OBJDIR)/apreq_param.o \
+       $(OBJDIR)/apreq_parser.o \
+       $(OBJDIR)/apreq_parser_header.o \
+       $(OBJDIR)/apreq_parser_multipart.o \
+       $(OBJDIR)/apreq_parser_urlencoded.o \
+       $(OBJDIR)/apreq_util.o \
        $(OBJDIR)/buildmark.o \
        $(OBJDIR)/config.o \
        $(OBJDIR)/connection.o \
@@ -273,6 +276,7 @@ FILES_nlm_objs = \
        $(OBJDIR)/util_expr_eval.o \
        $(OBJDIR)/util_expr_parse.o \
        $(OBJDIR)/util_expr_scan.o \
+       $(OBJDIR)/util_fcgi.o \
        $(OBJDIR)/util_filter.o \
        $(OBJDIR)/util_md5.o \
        $(OBJDIR)/util_mutex.o \
@@ -360,17 +364,20 @@ FILES_lib_objs = \
 else
 
 FILES_lib_objs = \
+       $(OBJDIR)/chartables.o \
        $(OBJDIR)/pcre_compile.o \
        $(OBJDIR)/pcre_exec.o \
        $(OBJDIR)/pcre_fullinfo.o \
        $(OBJDIR)/pcre_globals.o \
-       $(OBJDIR)/pcre_info.o \
        $(OBJDIR)/pcre_newline.o \
        $(OBJDIR)/pcre_tables.o \
-       $(OBJDIR)/pcre_try_flipped.o \
        $(OBJDIR)/pcre_version.o \
-       $(OBJDIR)/chartables.o \
        $(EOLIST)
+ifeq "$(wildcard $(PCRE)/pcre_try_flipped.c)" "$(PCRE)/pcre_try_flipped.c"
+FILES_lib_objs += \
+       $(OBJDIR)/pcre_try_flipped.o \
+       $(EOLIST)
+endif 
 
 endif
 
@@ -386,7 +393,7 @@ nlms :: libs $(TARGET_nlm)
 # Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)/build/NWGNUhead.inc for examples)
 #
-MKCNF  = $(AWK) -v BDIR=$(BASEDIR) -v PORT=$(PORT) -v SSLPORT=$(SSLPORT) -v MODSSL=$(WITH_MOD_SSL) -v BSDSKT=$(USE_STDSOCKETS) -f build/mkconfNW.awk $1 > $2
+MKCNF  = $(AWK) -v BDIR=$(BASEDIR) -v PORT=$(PORT) -v SSLPORT=$(SSLPORT) -v MODSSL=$(WITH_SSL) -v MODHTTP2=$(WITH_HTTP2) -v BSDSKT=$(USE_STDSOCKETS) -f build/mkconfNW.awk $1 > $2
 
 install :: nlms instscripts FORCE
        $(call COPY,$(OBJDIR)/$(NLM_NAME).nlm,                         $(INSTALLBASE)/)
@@ -410,11 +417,13 @@ install :: nlms instscripts FORCE
        $(call MKCNF,docs/conf/extra/httpd-default.conf.in,            $(INSTALLBASE)/conf/extra/httpd-default.conf)
        $(call MKCNF,docs/conf/extra/httpd-info.conf.in,               $(INSTALLBASE)/conf/extra/httpd-info.conf)
        $(call MKCNF,docs/conf/extra/httpd-languages.conf.in,          $(INSTALLBASE)/conf/extra/httpd-languages.conf)
+       $(call MKCNF,docs/conf/extra/httpd-macro.conf.in,              $(INSTALLBASE)/conf/extra/httpd-macro.conf)
        $(call MKCNF,docs/conf/extra/httpd-manual.conf.in,             $(INSTALLBASE)/conf/extra/httpd-manual.conf)
        $(call MKCNF,docs/conf/extra/httpd-mpm.conf.in,                $(INSTALLBASE)/conf/extra/httpd-mpm.conf)
        $(call MKCNF,docs/conf/extra/httpd-multilang-errordoc.conf.in, $(INSTALLBASE)/conf/extra/httpd-multilang-errordoc.conf)
        $(call MKCNF,docs/conf/extra/httpd-userdir.conf.in,            $(INSTALLBASE)/conf/extra/httpd-userdir.conf)
        $(call MKCNF,docs/conf/extra/httpd-vhosts.conf.in,             $(INSTALLBASE)/conf/extra/httpd-vhosts.conf)
+       $(call MKCNF,docs/conf/extra/httpd-policy.conf.in,             $(INSTALLBASE)/conf/extra/httpd-policy.conf)
        $(call MKCNF,docs/conf/extra/httpd-ssl.conf.in,                $(INSTALLBASE)/conf/extra/httpd-ssl.conf)
        $(call MKCNF,docs/conf/extra/proxy-html.conf.in,               $(INSTALLBASE)/conf/extra/proxy-html.conf)
        $(call COPYR,docs/docroot,                                     $(INSTALLBASE)/htdocs)
@@ -431,6 +440,7 @@ installdev :: FORCE
        $(call COPY,$(STDMOD)/core/mod_so.h,                           $(INSTALLBASE)/include/)
        $(call COPY,$(STDMOD)/core/mod_watchdog.h,                     $(INSTALLBASE)/include/)
        $(call COPY,$(STDMOD)/cache/mod_cache.h,                       $(INSTALLBASE)/include/)
+       $(call COPY,$(STDMOD)/cache/cache_common.h,                    $(INSTALLBASE)/include/)
        $(call COPY,$(STDMOD)/database/mod_dbd.h,                      $(INSTALLBASE)/include/)
        $(call COPY,$(STDMOD)/dav/main/mod_dav.h,                      $(INSTALLBASE)/include/)
        $(call COPY,$(STDMOD)/filters/mod_include.h,                   $(INSTALLBASE)/include/)
@@ -442,6 +452,7 @@ installdev :: FORCE
        $(call COPY,$(STDMOD)/proxy/mod_serf.h,                        $(INSTALLBASE)/include/)
        $(call COPY,$(STDMOD)/session/mod_session.h,                   $(INSTALLBASE)/include/)
        $(call COPY,$(STDMOD)/ssl/mod_ssl.h,                           $(INSTALLBASE)/include/)
+       $(call COPY,$(STDMOD)/ssl/mod_ssl_openssl.h,                   $(INSTALLBASE)/include/)
        $(call COPY,$(APR)/*.imp,                                      $(INSTALLBASE)/lib/)
        $(call COPY,$(NWOS)/*.imp,                                     $(INSTALLBASE)/lib/)
        $(call COPY,$(NWOS)/*.xdc,                                     $(INSTALLBASE)/lib/)