+#
+# Define our required macro's if not already done.
+#
+
+ifndef AP_WORK
+export AP_WORK = $(CURDIR)
+endif
+
+ifndef APR_WORK
+ifeq "$(wildcard $(AP_WORK)/srclib/apr)" "$(AP_WORK)/srclib/apr"
+export APR_WORK = $(AP_WORK)/srclib/apr
+endif
+endif
+ifneq "$(wildcard $(APR_WORK)/include/apr_version.h)" "$(APR_WORK)/include/apr_version.h"
+$(error APR_WORK does not point to a valid APR source tree)
+endif
+
+ifndef APU_WORK
+ifeq "$(wildcard $(AP_WORK)/srclib/apr-util)" "$(AP_WORK)/srclib/apr-util"
+export APU_WORK = $(AP_WORK)/srclib/apr-util
+endif
+endif
+ifndef APU_WORK
+ifeq "$(wildcard $(APR_WORK)/include/apu_version.h)" "$(APR_WORK)/include/apu_version.h"
+export APU_WORK = $(APR_WORK)
+endif
+endif
+ifneq "$(wildcard $(APU_WORK)/include/apu_version.h)" "$(APU_WORK)/include/apu_version.h"
+$(error APU_WORK does not point to a valid APU source tree)
+endif
+
#
# Declare the sub-directories to be built here
#
$(APRUTIL)/include \
$(AP_WORK)/include \
$(AP_WORK)/modules/aaa/ \
+ $(AP_WORK)/modules/core \
$(AP_WORK)/modules/filters/ \
$(AP_WORK)/modules/generators/ \
$(AP_WORK)/modules/http/ \
$(AP_WORK)/modules/loggers/ \
$(AP_WORK)/modules/mappers/ \
$(AP_WORK)/modules/proxy/ \
- $(AP_WORK)/os/NetWare \
- $(AP_WORK)/server/mpm/NetWare \
- $(AP_WORK)/srclib/pcre \
+ $(AP_WORK)/modules/ssl/ \
+ $(AP_WORK)/server/mpm/netware \
+ $(PCRE) \
$(NWOS) \
- $(AP_WORK)/modules/ssl \
$(EOLIST)
#
# These flags will come after CFLAGS
#
XCFLAGS += \
+ -DHAVE_CONFIG_H \
$(EOLIST)
#
# If there is an LIB target, put it here
#
TARGET_lib = \
+ $(OBJDIR)/pcre.lib \
$(EOLIST)
#
$(OBJDIR)/log.o \
$(OBJDIR)/main.o \
$(OBJDIR)/mod_authn_core.o \
- $(OBJDIR)/mod_authn_default.o \
$(OBJDIR)/mod_authz_core.o \
- $(OBJDIR)/mod_authz_default.o \
$(OBJDIR)/mod_authz_host.o \
$(OBJDIR)/mod_alias.o \
$(OBJDIR)/mod_dir.o \
$(OBJDIR)/mod_netware.o \
$(OBJDIR)/mod_setenvif.o \
$(OBJDIR)/mod_so.o \
+ $(OBJDIR)/mod_watchdog.o \
$(OBJDIR)/modules.o \
$(OBJDIR)/mpm_common.o \
$(OBJDIR)/mpm_netware.o \
- $(OBJDIR)/pcre.o \
$(OBJDIR)/protocol.o \
$(OBJDIR)/provider.o \
$(OBJDIR)/request.o \
$(OBJDIR)/util.o \
$(OBJDIR)/util_cfgtree.o \
$(OBJDIR)/util_charset.o \
+ $(OBJDIR)/util_cookies.o \
$(OBJDIR)/util_debug.o \
+ $(OBJDIR)/util_expr.o \
$(OBJDIR)/util_filter.o \
$(OBJDIR)/util_md5.o \
$(OBJDIR)/util_mutex.o \
$(OBJDIR)/util_nw.o \
$(OBJDIR)/util_pcre.o \
+ $(OBJDIR)/util_regex.o \
$(OBJDIR)/util_script.o \
$(OBJDIR)/util_time.o \
$(OBJDIR)/util_xml.o \
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
+ $(PCRELIB) \
libcpre.o \
$(EOLIST)
# These are the OBJ files needed to create the LIB target above.
# Paths must all use the '/' character
#
+ifeq "$(wildcard $(PCRE)/pcre.c)" "$(PCRE)/pcre.c"
+
FILES_lib_objs = \
+ $(OBJDIR)/pcre.o \
+ $(EOLIST)
+
+else
+
+FILES_lib_objs = \
+ $(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
+
+FILES_lib_objs += \
+ $(OBJDIR)/chartables.o \
$(EOLIST)
#
# Updated this target to create necessary directories and copy files to the
# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples)
#
-install :: nlms FORCE
+install :: nlms instscripts FORCE
-copy $(OBJDIR)\Apache2.nlm $(INSTALL)\$(BASEDIR)\*.*
-copy ABOUT_APACHE $(INSTALL)\$(BASEDIR)\*.*
-copy README $(INSTALL)\$(BASEDIR)\*.*
-copy STATUS $(INSTALL)\$(BASEDIR)\*.*
-copy LICENSE $(INSTALL)\$(BASEDIR)\*.*
-copy CHANGES $(INSTALL)\$(BASEDIR)\*.*
+ -copy VERSIONING $(INSTALL)\$(BASEDIR)\*.*
-copy support\dbmmanage.in $(INSTALL)\$(BASEDIR)\bin\dbmmanage.pl
-copy support\logresolve.pl.in $(INSTALL)\$(BASEDIR)\bin\logresolve.pl
+ -copy support\split-logfile.in $(INSTALL)\$(BASEDIR)\bin\split-logfile.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
$(CHKNOT) $(INSTALL)\$(BASEDIR)\conf\extra\nul 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
prebuild :: FORCE
$(MAKE) -C server -f NWGNUMakefile
- $(MAKE) -C srclib/pcre -f NWGNUMakefile
+ $(MAKE) -C $(PCRE) -f NWGNUMakefile
$(CHKNOT) $(PREBUILD_INST)\nul mkdir $(PREBUILD_INST)
-copy $(AP_WORK)\server\$(OBJDIR)\*.nlm $(PREBUILD_INST)\*.*
- -copy $(AP_WORK)\srclib\pcre\$(basename $(OBJDIR))\*.nlm $(PREBUILD_INST)\*.*
+ -copy $(PCRE)\$(basename $(OBJDIR))\*.nlm $(PREBUILD_INST)\*.*
#
# Any specialized rules here
vpath %.c server:modules/arch/netware:modules/http:modules/aaa:modules/mappers
vpath %.c modules/generators:modules/metadata:modules/filters:modules/loggers
-vpath %.c os/netware:server/mpm/netware:srclib/pcre
+vpath %.c modules/core:os/netware:server/mpm/netware:$(PCRE)
#
# Include the 'tail' makefile that has targets that depend on variables defined
include $(AP_WORK)\build\NWGNUtail.inc
+include $(AP_WORK)\build\NWGNUscripts.inc
+