remove SSLMutex documentation

[apache] / NWGNUmakefile

diff --git a/NWGNUmakefile b/NWGNUmakefile
index 9a1b3c500af0dc887ddd9dc1974629d0ec2e89bf..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
 #
@@ -39,11 +70,11 @@ XINCDIRS    += \
                        $(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 \
                        $(PCRESDK) \
                        $(NWOS) \
-                       $(AP_WORK)/modules/ssl \
                        $(EOLIST)
 
 #
@@ -224,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 \
@@ -385,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 modules/core:os/netware:server/mpm/netware:$(PCRESDK)
+vpath %.c modules/core:os/netware:server/mpm/netware:$(PCRESRC)
 
 #
 # Include the 'tail' makefile that has targets that depend on variables defined