XINCDIRS += \
$(APR)/include \
$(APRUTIL)/include \
- $(AP_WORK)/include \
- $(STDMOD)/aaa \
+ $(SRC)/include \
$(STDMOD)/core \
$(STDMOD)/filters \
$(STDMOD)/generators \
- $(STDMOD)/http \
- $(STDMOD)/loggers \
- $(STDMOD)/mappers \
$(STDMOD)/proxy \
- $(STDMOD)/ssl \
- $(AP_WORK)/server \
- $(AP_WORK)/server/mpm/netware \
- $(PCRE) \
$(NWOS) \
$(EOLIST)
# If there is an LIB target, put it here
#
TARGET_lib = \
- $(OBJDIR)/pcre.lib \
+ $(PCRELIB) \
$(EOLIST)
#
# 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 \
$(OBJDIR)/http_request.o \
$(OBJDIR)/byterange_filter.o \
$(OBJDIR)/chunk_filter.o \
- $(OBJDIR)/http_etag.o \
$(OBJDIR)/http_filters.o \
$(OBJDIR)/listen.o \
$(OBJDIR)/log.o \
$(OBJDIR)/util_charset.o \
$(OBJDIR)/util_cookies.o \
$(OBJDIR)/util_debug.o \
+ $(OBJDIR)/util_etag.o \
$(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 \
#
FILES_nlm_libs = \
$(PCRELIB) \
- libcpre.o \
+ $(PRELUDE) \
$(EOLIST)
#
# Any additional imports go here
#
FILES_nlm_Ximports = \
- @netware.imp \
- @$(APR)/aprlib.imp \
+ @aprlib.imp \
@libc.imp \
+ @netware.imp \
GetCurrentAddressSpace \
$(EOLIST)
# Any symbols exported to here
#
FILES_nlm_exports = \
- @$(NWOS)/httpd.imp \
+ @httpd.imp \
$(EOLIST)
#
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 \
$(EOLIST)
-
-endif
-
+ifeq "$(wildcard $(PCRE)/pcre_try_flipped.c)" "$(PCRE)/pcre_try_flipped.c"
FILES_lib_objs += \
- $(OBJDIR)/chartables.o \
+ $(OBJDIR)/pcre_try_flipped.o \
$(EOLIST)
+endif
+
+endif
#
# implement targets and dependancies (leave this section alone)
# 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_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, $(INSTALL)/$(BASEDIR)/)
- $(call COPY,ABOUT_APACHE, $(INSTALL)/$(BASEDIR)/)
- $(call COPY,CHANGES, $(INSTALL)/$(BASEDIR)/)
- $(call COPY,LICENSE, $(INSTALL)/$(BASEDIR)/)
- $(call COPY,README, $(INSTALL)/$(BASEDIR)/)
- $(call COPY,VERSIONING, $(INSTALL)/$(BASEDIR)/)
- $(call COPY,STATUS, $(INSTALL)/$(BASEDIR)/)
- $(call COPY,support/dbmmanage.in, $(INSTALL)/$(BASEDIR)/bin/dbmmanage.pl)
- $(call COPY,support/logresolve.pl.in, $(INSTALL)/$(BASEDIR)/bin/logresolve.pl)
- $(call COPY,support/split-logfile.in, $(INSTALL)/$(BASEDIR)/bin/split-logfile.pl)
- $(call COPY,support/check_forensic, $(INSTALL)/$(BASEDIR)/bin/check_forensic.sh)
- $(call COPY,docs/conf/magic, $(INSTALL)/$(BASEDIR)/conf/)
- $(call COPY,docs/conf/mime.types, $(INSTALL)/$(BASEDIR)/conf/)
- $(call COPY,docs/conf/charset.conv, $(INSTALL)/$(BASEDIR)/conf/)
- $(call COPY,docs/cgi-examples/printenv, $(INSTALL)/$(BASEDIR)/cgi-bin/printenv.pl)
- -$(AWK) -v BDIR=$(BASEDIR) -v PORT=$(PORT) -v SSLPORT=$(SSLPORT) -v MODSSL=$(WITH_MOD_SSL) -v BSDSKT=$(USE_STDSOCKETS) -f build\mkconfnw.awk docs/conf/httpd.conf.in >$(INSTALL)/$(BASEDIR)/conf\httpd.conf
- $(call MKDIR,$(INSTALL)/$(BASEDIR)/conf/extra)
- -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs/conf/extra/httpd-autoindex.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-autoindex.conf
- -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs/conf/extra/httpd-dav.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-dav.conf
- -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs/conf/extra/httpd-default.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-default.conf
- -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs/conf/extra/httpd-info.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-info.conf
- -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs/conf/extra/httpd-languages.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-languages.conf
- -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs/conf/extra/httpd-manual.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-manual.conf
- -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs/conf/extra/httpd-mpm.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-mpm.conf
- -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs/conf/extra/httpd-multilang-errordoc.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-multilang-errordoc.conf
- -$(AWK) -v BDIR=$(BASEDIR) -f build\mkconfnw.awk docs/conf/extra/httpd-userdir.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-userdir.conf
- -$(AWK) -v BDIR=$(BASEDIR) -v PORT=$(PORT) -f build\mkconfnw.awk docs/conf/extra/httpd-vhosts.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-vhosts.conf
- -$(AWK) -v BDIR=$(BASEDIR) -v SSLPORT=$(SSLPORT) -f build\mkconfnw.awk docs/conf/extra/httpd-ssl.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-ssl.conf
- $(call COPYR,docs/docroot, $(INSTALL)/$(BASEDIR)/htdocs)
- $(call COPYR,docs/error, $(INSTALL)/$(BASEDIR)/)
- $(call COPYR,docs/icons, $(INSTALL)/$(BASEDIR)/)
- $(call COPYR,docs/man, $(INSTALL)/$(BASEDIR)/)
- $(call COPYR,docs/manual, $(INSTALL)/$(BASEDIR)/)
+ $(call COPY,$(OBJDIR)/$(NLM_NAME).nlm, $(INSTALLBASE)/)
+ $(call COPY,ABOUT_APACHE, $(INSTALLBASE)/)
+ $(call COPY,CHANGES, $(INSTALLBASE)/)
+ $(call COPY,LICENSE, $(INSTALLBASE)/)
+ $(call COPY,README, $(INSTALLBASE)/)
+ $(call COPY,VERSIONING, $(INSTALLBASE)/)
+ $(call COPY,STATUS, $(INSTALLBASE)/)
+ $(call COPY,support/dbmmanage.in, $(INSTALLBASE)/bin/dbmmanage.pl)
+ $(call COPY,support/logresolve.pl.in, $(INSTALLBASE)/bin/logresolve.pl)
+ $(call COPY,support/split-logfile.in, $(INSTALLBASE)/bin/split-logfile.pl)
+ $(call COPY,support/check_forensic, $(INSTALLBASE)/bin/check_forensic.sh)
+ $(call COPY,docs/conf/magic, $(INSTALLBASE)/conf/)
+ $(call COPY,docs/conf/mime.types, $(INSTALLBASE)/conf/)
+ $(call COPY,docs/conf/charset.conv, $(INSTALLBASE)/conf/)
+ $(call COPY,docs/cgi-examples/printenv, $(INSTALLBASE)/cgi-bin/printenv.pl)
+ $(call MKCNF,docs/conf/httpd.conf.in, $(INSTALLBASE)/conf/httpd.conf)
+ $(call MKCNF,docs/conf/extra/httpd-autoindex.conf.in, $(INSTALLBASE)/conf/extra/httpd-autoindex.conf)
+ $(call MKCNF,docs/conf/extra/httpd-dav.conf.in, $(INSTALLBASE)/conf/extra/httpd-dav.conf)
+ $(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)
+ $(call COPYR,docs/error, $(INSTALLBASE)/error)
+ $(call COPYR,docs/icons, $(INSTALLBASE)/icons)
+ $(call COPYR,docs/man, $(INSTALLBASE)/man)
+ $(call COPYR,docs/manual, $(INSTALLBASE)/manual)
installdev :: FORCE
- $(call COPY,$(SRC)/include/*.h, $(INSTALL)/$(BASEDIR)/include/)
- $(call COPY,$(NWOS)/*.h, $(INSTALL)/$(BASEDIR)/include/)
- $(call COPY,$(APR)/include/*.h, $(INSTALL)/$(BASEDIR)/include/)
- $(call COPY,$(APRUTIL)/include/*.h, $(INSTALL)/$(BASEDIR)/include/)
- $(call COPY,$(APR)/*.imp, $(INSTALL)/$(BASEDIR)/lib/)
- $(call COPY,$(NWOS)/*.imp, $(INSTALL)/$(BASEDIR)/lib/)
- $(call COPY,$(NWOS)/*.xdc, $(INSTALL)/$(BASEDIR)/lib/)
+ $(call COPY,$(SRC)/include/*.h, $(INSTALLBASE)/include/)
+ $(call COPY,$(NWOS)/*.h, $(INSTALLBASE)/include/)
+ $(call COPY,$(APR)/include/*.h, $(INSTALLBASE)/include/)
+ $(call COPY,$(APRUTIL)/include/*.h, $(INSTALLBASE)/include/)
+ $(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/)
+ $(call COPY,$(STDMOD)/generators/mod_cgi.h, $(INSTALLBASE)/include/)
+ $(call COPY,$(STDMOD)/generators/mod_status.h, $(INSTALLBASE)/include/)
+ $(call COPY,$(STDMOD)/loggers/mod_log_config.h, $(INSTALLBASE)/include/)
+ $(call COPY,$(STDMOD)/mappers/mod_rewrite.h, $(INSTALLBASE)/include/)
+ $(call COPY,$(STDMOD)/proxy/mod_proxy.h, $(INSTALLBASE)/include/)
+ $(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/)
+ $(call COPY,$(APBUILD)/NWGNU*.inc, $(INSTALLBASE)/build/)
prebuild :: FORCE
$(MAKE) -C $(SERVER) -f NWGNUmakefile
$(MAKE) -C $(PCRE) -f NWGNUmakefile
$(call MKDIR,$(PREBUILD_INST))
- $(call COPY,$(SERVER)/$(OBJDIR)/*.nlm, $(PREBUILD_INST)/)
- $(call COPY,$(PCRE)/$(OBJDIR)/*.nlm, $(PREBUILD_INST)/)
+ $(call COPY,$(SERVER)/$(OBJDIR)/*.nlm, $(PREBUILD_INST)/)
+ $(call COPY,$(PCRE)/$(OBJDIR)/*.nlm, $(PREBUILD_INST)/)
#
# Any specialized rules here
vpath %.c modules/generators:modules/metadata:modules/filters:modules/loggers
vpath %.c modules/core:os/netware:server/mpm/netware:$(PCRE)
+$(OBJDIR)/chartables.o: os/netware/chartables.c
+
#
# Include the 'tail' makefile that has targets that depend on variables defined
# in this makefile
projects / apache / blobdiff