remove SSLMutex documentation

[apache] / NWGNUmakefile

diff --git a/NWGNUmakefile b/NWGNUmakefile
index b0fd434ae87b1de20ff8552b238fb5800c5261c9..6995c773fc517bc47010db9cc38b8e7f88734181 100644 (file)
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -1,3 +1,34 @@
+#
+# 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
 #
@@ -32,17 +63,18 @@ XINCDIRS    += \
                        $(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)/modules/ssl/ \
                        $(AP_WORK)/os/NetWare \
                        $(AP_WORK)/server/mpm/NetWare \
-                       $(AP_WORK)/srclib/pcre \
+                       $(PCRESDK) \
                        $(NWOS) \
-                       $(AP_WORK)/modules/ssl \
                        $(EOLIST)
 
 #
@@ -211,9 +243,7 @@ FILES_nlm_objs = \
        $(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 \
@@ -225,6 +255,7 @@ FILES_nlm_objs = \
        $(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 \
@@ -236,7 +267,9 @@ FILES_nlm_objs = \
        $(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 \
@@ -328,7 +361,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)
 #
-install :: nlms FORCE
+install :: nlms instscripts FORCE
        -copy $(OBJDIR)\Apache2.nlm     $(INSTALL)\$(BASEDIR)\*.*
        -copy ABOUT_APACHE              $(INSTALL)\$(BASEDIR)\*.*
        -copy README                    $(INSTALL)\$(BASEDIR)\*.*
@@ -373,10 +406,10 @@ installdev :: FORCE
 
 prebuild :: FORCE
        $(MAKE) -C server -f NWGNUMakefile
-       $(MAKE) -C srclib/pcre -f NWGNUMakefile
+       $(MAKE) -C $(PCRESDK) -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 $(PCRESDK)\$(basename $(OBJDIR))\*.nlm $(PREBUILD_INST)\*.*
 
 #
 # Any specialized rules here
@@ -384,7 +417,7 @@ prebuild :: FORCE
 
 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:$(PCRESRC)
 
 #
 # Include the 'tail' makefile that has targets that depend on variables defined
@@ -393,4 +426,6 @@ vpath %.c os/netware:server/mpm/netware:srclib/pcre
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+include $(AP_WORK)\build\NWGNUscripts.inc
+