Allow APR to exist and build outside of the httpd/srclib file structure

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106975 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/NWGNUmakefile b/NWGNUmakefile
index ba31a12aef27159ee13e0666e4f67d8004c4f665..ee85d857e5008d71b64e95ec807d07bacb44cc36 100644 (file)
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -3,7 +3,7 @@
 #
 
 SUBDIRS = \
-       srclib\apr \
+       $(APR_WORK) \
        build \
        support \
        modules \
@@ -28,9 +28,8 @@ include $(AP_WORK)\build\NWGNUhead.inc
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/include/arch/NetWare \
-                       $(AP_WORK)/srclib/apr-util/include \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
                        $(AP_WORK)/include \
                        $(AP_WORK)/modules/filters/ \
                        $(AP_WORK)/modules/generators/ \

diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc
index 206e0b40026905e1fd3501130f04e228f0b767d2..a84b9e246dd2c733eda701f7d5b25eaf882b47d0 100644 (file)
--- a/build/NWGNUenvironment.inc
+++ b/build/NWGNUenvironment.inc
@@ -268,12 +268,12 @@ endif
 STDMOD         = $(AP_WORK)/modules
 NWOS           = $(AP_WORK)/os/netware
 SERVER         = $(AP_WORK)/server
-SRC                    = $(AP_WORK)
-APR                    = $(AP_WORK)/srclib/apr
-APRUTIL                = $(AP_WORK)/srclib/apr-util
+SRC            = $(AP_WORK)
+APR            = $(APR_WORK)
+APRUTIL                = $(APR_WORK)/../apr-util
 SUPMOD         = $(AP_WORK)/support
 PCRE           = $(AP_WORK)/srclib/pcre
-APRTEST                = $(AP_WORK)/srclib/apr/test
+APRTEST                = $(APR_WORK)/test
 HTTPD          = $(AP_WORK)/modules/http
 XML                    = $(AP_WORK)/srclib/apr-util/xml
 

diff --git a/build/NWGNUmakefile b/build/NWGNUmakefile
index 8b631f21aa7b460b3fc66cd64c8bd0bf1340d3c7..72dd90f659326f5f754c68547fa8f4a0176d738b 100644 (file)
--- a/build/NWGNUmakefile
+++ b/build/NWGNUmakefile
@@ -46,8 +46,8 @@ cc.opt : NWGNUmakefile $(AP_WORK)\build\NWGNUenvironment.inc $(AP_WORK)\build\NW
        @echo -I..\modules\aaa >> $@
        @echo -I..\os\netware >> $@
        @echo -I..\server\mpm\netware >> $@
-       @echo -I..\srclib\apr\include >> $@
-       @echo -I..\srclib\apr-util\include >> $@
+       @echo -I$(APR_WORK)\include >> $@
+       @echo -I$(APRUTIL)\include >> $@
        @echo -ir $(NOVELLLIBC) >> $@
 
 $(APR)/include/%.h: $(subst /,\,$(APR))\include\%.hnw

diff --git a/modules/aaa/NWGNUauthbasc b/modules/aaa/NWGNUauthbasc
index dbc4d0fa9ab5a7bbdc27c36dfaed83395a2e1f17..bc7e1ec92c9c09dae197fee2e50b34d5a5abcd10 100644 (file)
--- a/modules/aaa/NWGNUauthbasc
+++ b/modules/aaa/NWGNUauthbasc
@@ -19,9 +19,9 @@ XINCDIRS      += \
                        $(AP_WORK)/include \
                        $(NWOS) \
                        $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/apr-util/include \
-                       $(AP_WORK)/srclib/apr \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/modules/aaa/NWGNUauthdigt b/modules/aaa/NWGNUauthdigt
index 9dfa45b2e769ad9dff55934cf05ba69a3bc5363c..3b594b29c3325daf189db3c0b5136c6822795d99 100644 (file)
--- a/modules/aaa/NWGNUauthdigt
+++ b/modules/aaa/NWGNUauthdigt
@@ -19,9 +19,9 @@ XINCDIRS      += \
                        $(AP_WORK)/include \
                        $(NWOS) \
                        $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/apr-util/include \
-                       $(AP_WORK)/srclib/apr \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/modules/aaa/NWGNUauthnano b/modules/aaa/NWGNUauthnano
index 2e610752812cd8ba40a76deeaaaabc0d8232a31e..5bdd1c2f822aa4c48df4b07bc256433b8dff0828 100644 (file)
--- a/modules/aaa/NWGNUauthnano
+++ b/modules/aaa/NWGNUauthnano
@@ -19,9 +19,9 @@ XINCDIRS      += \
                        $(AP_WORK)/include \
                        $(NWOS) \
                        $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/apr-util/include \
-                       $(AP_WORK)/srclib/apr \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/modules/aaa/NWGNUauthndbm b/modules/aaa/NWGNUauthndbm
index c9087bd540c299a928aa62c4e2053c6e94ca6aa5..9ebfd871a998fbf43fc24321ff3fb669b883a190 100644 (file)
--- a/modules/aaa/NWGNUauthndbm
+++ b/modules/aaa/NWGNUauthndbm
@@ -19,9 +19,9 @@ XINCDIRS      += \
                        $(AP_WORK)/include \
                        $(NWOS) \
                        $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/apr-util/include \
-                       $(AP_WORK)/srclib/apr \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/modules/aaa/NWGNUauthndef b/modules/aaa/NWGNUauthndef
index 39710e60949a4753fd3ef7c80d678000da776b71..e77d40dc337a62735da7192eb9bcfee098f40ac4 100644 (file)
--- a/modules/aaa/NWGNUauthndef
+++ b/modules/aaa/NWGNUauthndef
@@ -19,9 +19,9 @@ XINCDIRS      += \
                        $(AP_WORK)/include \
                        $(NWOS) \
                        $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/apr-util/include \
-                       $(AP_WORK)/srclib/apr \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/modules/aaa/NWGNUauthnfil b/modules/aaa/NWGNUauthnfil
index 9e396a67de87d031228732fd4eb605f3fc02a194..1cfbb4227337e7914126e7f14f63ae5a62e94640 100644 (file)
--- a/modules/aaa/NWGNUauthnfil
+++ b/modules/aaa/NWGNUauthnfil
@@ -19,9 +19,9 @@ XINCDIRS      += \
                        $(AP_WORK)/include \
                        $(NWOS) \
                        $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/apr-util/include \
-                       $(AP_WORK)/srclib/apr \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/modules/aaa/NWGNUauthnzldap b/modules/aaa/NWGNUauthnzldap
index 6c36774dae567e0be4a84e16e6e89de8b6b482c1..5b0ac89daf9f7d06434317643d0504a7a9fd3b99 100644 (file)
--- a/modules/aaa/NWGNUauthnzldap
+++ b/modules/aaa/NWGNUauthnzldap
@@ -18,9 +18,9 @@ endif
 XINCDIRS       += \
                        $(AP_WORK)/include \
                        $(NWOS) \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/apr-util/include \
-                       $(AP_WORK)/srclib/apr \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/modules/aaa/NWGNUauthzdbm b/modules/aaa/NWGNUauthzdbm
index 65060a3cd0b6311687292f47d4d4f3931d0e6895..1b7bd137603f0e7274331ed700c6cd2586864531 100644 (file)
--- a/modules/aaa/NWGNUauthzdbm
+++ b/modules/aaa/NWGNUauthzdbm
@@ -19,9 +19,9 @@ XINCDIRS      += \
                        $(AP_WORK)/include \
                        $(NWOS) \
                        $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/apr-util/include \
-                       $(AP_WORK)/srclib/apr \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/modules/aaa/NWGNUauthzdef b/modules/aaa/NWGNUauthzdef
index e194678157059e4e4dba12a11a80f428118ac843..348785b04dd12ad25f35b48225e73cb695fa0a05 100644 (file)
--- a/modules/aaa/NWGNUauthzdef
+++ b/modules/aaa/NWGNUauthzdef
@@ -19,9 +19,9 @@ XINCDIRS      += \
                        $(AP_WORK)/include \
                        $(NWOS) \
                        $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/apr-util/include \
-                       $(AP_WORK)/srclib/apr \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/modules/aaa/NWGNUauthzgrp b/modules/aaa/NWGNUauthzgrp
index 60eb244bdb0b7cd5cf391e418e25bd0455a7453c..a104c4fd76f05791d5688edc0c228bb98d6c545f 100644 (file)
--- a/modules/aaa/NWGNUauthzgrp
+++ b/modules/aaa/NWGNUauthzgrp
@@ -19,9 +19,9 @@ XINCDIRS      += \
                        $(AP_WORK)/include \
                        $(NWOS) \
                        $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/apr-util/include \
-                       $(AP_WORK)/srclib/apr \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/modules/aaa/NWGNUauthzusr b/modules/aaa/NWGNUauthzusr
index 3a3a11d88513c50011e47dba95f596d7a3d178e9..eb9e2c93c3de1355275b5a7e87173978b1ef973c 100644 (file)
--- a/modules/aaa/NWGNUauthzusr
+++ b/modules/aaa/NWGNUauthzusr
@@ -19,9 +19,9 @@ XINCDIRS      += \
                        $(AP_WORK)/include \
                        $(NWOS) \
                        $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/apr-util/include \
-                       $(AP_WORK)/srclib/apr \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/modules/cache/NWGNUdsk_cach b/modules/cache/NWGNUdsk_cach
index 6780d123905775ba01e2c35b3ef68b84bfd1347d..9dc385e77e197b589517ab36a462e7e750168abd 100644 (file)
--- a/modules/cache/NWGNUdsk_cach
+++ b/modules/cache/NWGNUdsk_cach
@@ -23,9 +23,8 @@ include $(AP_WORK)\build\NWGNUhead.inc
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/include/arch/NetWare \
-                       $(AP_WORK)/srclib/apr-util/include \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
                        $(AP_WORK)/include \
                        $(AP_WORK)/os/NetWare \
                        $(AP_WORK)/server/mpm/NetWare \

diff --git a/modules/cache/NWGNUmem_cach b/modules/cache/NWGNUmem_cach
index 6d83d8ae69a9928b054d47467eaa2a9922d79f33..782d8834cf9919e0622c0980aebaa0e201a1151b 100644 (file)
--- a/modules/cache/NWGNUmem_cach
+++ b/modules/cache/NWGNUmem_cach
@@ -23,9 +23,8 @@ include $(AP_WORK)\build\NWGNUhead.inc
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/include/arch/NetWare \
-                       $(AP_WORK)/srclib/apr-util/include \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
                        $(AP_WORK)/include \
                        $(AP_WORK)/os/NetWare \
                        $(AP_WORK)/server/mpm/NetWare \

diff --git a/modules/cache/NWGNUmod_cach b/modules/cache/NWGNUmod_cach
index 55e1a73323c57f065a15e77b0276ad7538d0e634..125c4567940bbe24fa3e8948afd158ce3d74b166 100644 (file)
--- a/modules/cache/NWGNUmod_cach
+++ b/modules/cache/NWGNUmod_cach
@@ -23,9 +23,8 @@ include $(AP_WORK)\build\NWGNUhead.inc
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/include/arch/NetWare \
-                       $(AP_WORK)/srclib/apr-util/include \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
                        $(AP_WORK)/include \
                        $(AP_WORK)/os/NetWare \
                        $(AP_WORK)/server/mpm/NetWare \

diff --git a/modules/dav/fs/NWGNUmakefile b/modules/dav/fs/NWGNUmakefile
index f4f770444018e2c7ce0992f350f03a94c2860237..d4307a76738cb28f6914f75a4b990dc13dadabf6 100644 (file)
--- a/modules/dav/fs/NWGNUmakefile
+++ b/modules/dav/fs/NWGNUmakefile
@@ -24,9 +24,8 @@ include $(AP_WORK)\build\NWGNUhead.inc
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/include/arch/NetWare \
-                       $(AP_WORK)/srclib/apr-util/include \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
                        $(AP_WORK)/include \
                        $(AP_WORK)/os/NetWare \
                        $(AP_WORK)/server/mpm/NetWare \

diff --git a/modules/dav/lock/NWGNUmakefile b/modules/dav/lock/NWGNUmakefile
index 99dbc5928312491bcd7f4d15295db27308230661..6036fab3b852f3c06c5170893f4661258017c89d 100644 (file)
--- a/modules/dav/lock/NWGNUmakefile
+++ b/modules/dav/lock/NWGNUmakefile
@@ -24,9 +24,8 @@ include $(AP_WORK)\build\NWGNUhead.inc
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/include/arch/NetWare \
-                       $(AP_WORK)/srclib/apr-util/include \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
                        $(AP_WORK)/include \
                        $(AP_WORK)/os/NetWare \
                        $(AP_WORK)/server/mpm/NetWare \

diff --git a/modules/dav/main/NWGNUmakefile b/modules/dav/main/NWGNUmakefile
index a692a2f9204a45a3b868cfae8adfd91ced7bcece..9fc46c030d3ee4d76d61a29d0866aae3f2e0bf39 100644 (file)
--- a/modules/dav/main/NWGNUmakefile
+++ b/modules/dav/main/NWGNUmakefile
@@ -23,9 +23,8 @@ include $(AP_WORK)\build\NWGNUhead.inc
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/include/arch/NetWare \
-                       $(AP_WORK)/srclib/apr-util/include \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
                        $(AP_WORK)/include \
                        $(AP_WORK)/os/NetWare \
                        $(AP_WORK)/server/mpm/NetWare \

diff --git a/modules/echo/NWGNUmakefile b/modules/echo/NWGNUmakefile
index 3fc4a12c10d576c71b64a61f0985124f323a2d2e..d3d40e28143634e16d91cce3acf3808acdd498b1 100644 (file)
--- a/modules/echo/NWGNUmakefile
+++ b/modules/echo/NWGNUmakefile
@@ -27,9 +27,9 @@ XINCDIRS      += \
                        $(AP_WORK)/include \
                        $(NWOS) \
                        $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/apr-util/include \
-                       $(AP_WORK)/srclib/apr \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/modules/experimental/NWGNUcharsetl b/modules/experimental/NWGNUcharsetl
index e6b37ff25b9c0c665bb24a1661c2b0c6cda0bfd2..7094e9447f03901341c209bc8c05b8388384d2a0 100644 (file)
--- a/modules/experimental/NWGNUcharsetl
+++ b/modules/experimental/NWGNUcharsetl
@@ -27,9 +27,9 @@ XINCDIRS      += \
                        $(AP_WORK)/include \
                        $(NWOS) \
                        $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/apr-util/include \
-                       $(AP_WORK)/srclib/apr \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/modules/experimental/NWGNUexample b/modules/experimental/NWGNUexample
index adf0507955ffa4e67426fb070d169be4336f0e9e..13c97b1d66a2ec5bd83c1e2dd900fcdd5204c8f2 100644 (file)
--- a/modules/experimental/NWGNUexample
+++ b/modules/experimental/NWGNUexample
@@ -27,9 +27,9 @@ XINCDIRS      += \
                        $(AP_WORK)/include \
                        $(NWOS) \
                        $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/apr-util/include \
-                       $(AP_WORK)/srclib/apr \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/modules/experimental/NWGNUmod_filter b/modules/experimental/NWGNUmod_filter
index 49a75ea0de1dfa892afff7f70f1d03d965911a4b..ec671c59634cc6226db6fffaa02300cee97ba761 100644 (file)
--- a/modules/experimental/NWGNUmod_filter
+++ b/modules/experimental/NWGNUmod_filter
@@ -1,250 +1,250 @@
-#\r
-# Make sure all needed macro's are defined\r
-#\r
-\r
-#\r
-# Get the 'head' of the build environment if necessary.  This includes default\r
-# targets and paths to tools\r
-#\r
-\r
-ifndef EnvironmentDefined\r
-include $(AP_WORK)\build\NWGNUhead.inc\r
-endif\r
-\r
-#\r
-# These directories will be at the beginning of the include list, followed by\r
-# INCDIRS\r
-#\r
-XINCDIRS       += \\r
-                       $(AP_WORK)/include \\r
-                       $(NWOS) \\r
-                       $(AP_WORK)/modules/arch/netware \\r
-                       $(AP_WORK)/srclib/apr/include \\r
-                       $(AP_WORK)/srclib/apr-util/include \\r
-                       $(AP_WORK)/srclib/apr \\r
-                       $(EOLIST)\r
-\r
-#\r
-# These flags will come after CFLAGS\r
-#\r
-XCFLAGS                += \\r
-                       -prefix pre_nw.h \\r
-                       $(EOLIST)\r
-\r
-#\r
-# These defines will come after DEFINES\r
-#\r
-XDEFINES       += \\r
-                       $(EOLIST)\r
-\r
-#\r
-# These flags will be added to the link.opt file\r
-#\r
-XLFLAGS                += \\r
-                       $(EOLIST)\r
-\r
-#\r
-# These values will be appended to the correct variables based on the value of\r
-# RELEASE\r
-#\r
-ifeq "$(RELEASE)" "debug"\r
-XINCDIRS       += \\r
-                       $(EOLIST)\r
-\r
-XCFLAGS                += \\r
-                       $(EOLIST)\r
-\r
-XDEFINES       += \\r
-                       $(EOLIST)\r
-\r
-XLFLAGS                += \\r
-                       $(EOLIST)\r
-endif\r
-\r
-ifeq "$(RELEASE)" "noopt"\r
-XINCDIRS       += \\r
-                       $(EOLIST)\r
-\r
-XCFLAGS                += \\r
-                       $(EOLIST)\r
-\r
-XDEFINES       += \\r
-                       $(EOLIST)\r
-\r
-XLFLAGS                += \\r
-                       $(EOLIST)\r
-endif\r
-\r
-ifeq "$(RELEASE)" "release"\r
-XINCDIRS       += \\r
-                       $(EOLIST)\r
-\r
-XCFLAGS                += \\r
-                       $(EOLIST)\r
-\r
-XDEFINES       += \\r
-                       $(EOLIST)\r
-\r
-XLFLAGS                += \\r
-                       $(EOLIST)\r
-endif\r
-\r
-#\r
-# These are used by the link target if an NLM is being generated\r
-# This is used by the link 'name' directive to name the nlm.  If left blank\r
-# TARGET_nlm (see below) will be used.\r
-#\r
-NLM_NAME               = mod_filter\r
-\r
-#\r
-# This is used by the link '-desc ' directive. \r
-# If left blank, NLM_NAME will be used.\r
-#\r
-NLM_DESCRIPTION        = Apache $(VERSION_STR) Filter Module\r
-\r
-#\r
-# This is used by the '-threadname' directive.  If left blank,\r
-# NLM_NAME Thread will be used.\r
-#\r
-NLM_THREAD_NAME        = Filter Module\r
-\r
-#\r
-# If this is specified, it will override VERSION value in \r
-# $(AP_WORK)\build\NWGNUenvironment.inc\r
-#\r
-NLM_VERSION            =\r
-\r
-#\r
-# If this is specified, it will override the default of 64K\r
-#\r
-NLM_STACK_SIZE = 8192\r
-\r
-\r
-#\r
-# If this is specified it will be used by the link '-entry' directive\r
-#\r
-NLM_ENTRY_SYM  = _LibCPrelude\r
-\r
-#\r
-# If this is specified it will be used by the link '-exit' directive\r
-#\r
-NLM_EXIT_SYM   = _LibCPostlude\r
-\r
-#\r
-# If this is specified it will be used by the link '-check' directive\r
-#\r
-NLM_CHECK_SYM  =\r
-\r
-#\r
-# If these are specified it will be used by the link '-flags' directive\r
-#\r
-NLM_FLAGS              =  AUTOUNLOAD, PSEUDOPREEMPTION\r
-\r
-#\r
-# If this is specified it will be linked in with the XDCData option in the def \r
-# file instead of the default of $(NWOS)/apache.xdc.  XDCData can be disabled\r
-# by setting APACHE_UNIPROC in the environment\r
-#\r
-XDCDATA         = \r
-\r
-#\r
-# If there is an NLM target, put it here\r
-#\r
-TARGET_nlm = \\r
-       $(OBJDIR)/mod_filter.nlm \\r
-       $(EOLIST)\r
-\r
-#\r
-# If there is an LIB target, put it here\r
-#\r
-TARGET_lib = \\r
-       $(EOLIST)\r
-\r
-#\r
-# These are the OBJ files needed to create the NLM target above.\r
-# Paths must all use the '/' character\r
-#\r
-FILES_nlm_objs = \\r
-       $(OBJDIR)/mod_filter.o \\r
-       $(EOLIST)\r
-\r
-#\r
-# These are the LIB files needed to create the NLM target above.\r
-# These will be added as a library command in the link.opt file.\r
-#\r
-FILES_nlm_libs = \\r
-       libcpre.o \\r
-       $(EOLIST)\r
-\r
-#\r
-# These are the modules that the above NLM target depends on to load.\r
-# These will be added as a module command in the link.opt file.\r
-#\r
-FILES_nlm_modules = \\r
-       aprlib \\r
-       libc \\r
-       $(EOLIST)\r
-\r
-#\r
-# If the nlm has a msg file, put it's path here\r
-#\r
-FILE_nlm_msg =\r
- \r
-#\r
-# If the nlm has a hlp file put it's path here\r
-#\r
-FILE_nlm_hlp =\r
-\r
-#\r
-# If this is specified, it will override $(NWOS)\copyright.txt.\r
-#\r
-FILE_nlm_copyright =\r
-\r
-#\r
-# Any additional imports go here\r
-#\r
-FILES_nlm_Ximports = \\r
-       @$(APR)/aprlib.imp \\r
-       @$(NWOS)/httpd.imp \\r
-       @libc.imp \\r
-       $(EOLIST)\r
- \r
-#   \r
-# Any symbols exported to here\r
-#\r
-FILES_nlm_exports = \\r
-       filter_module \\r
-       $(EOLIST)\r
-       \r
-#   \r
-# These are the OBJ files needed to create the LIB target above.\r
-# Paths must all use the '/' character\r
-#\r
-FILES_lib_objs = \\r
-               $(EOLIST)\r
-\r
-#\r
-# implement targets and dependancies (leave this section alone)\r
-#\r
-\r
-libs :: $(OBJDIR) $(TARGET_lib)\r
-\r
-nlms :: libs $(TARGET_nlm)\r
-\r
-#\r
-# Updated this target to create necessary directories and copy files to the \r
-# correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)\r
-#\r
-install :: nlms FORCE\r
-\r
-#\r
-# Any specialized rules here\r
-#\r
-\r
-#\r
-# Include the 'tail' makefile that has targets that depend on variables defined\r
-# in this makefile\r
-#\r
-\r
-include $(AP_WORK)\build\NWGNUtail.inc\r
-\r
+#
+# Make sure all needed macro's are defined
+#
+
+#
+# Get the 'head' of the build environment if necessary.  This includes default
+# targets and paths to tools
+#
+
+ifndef EnvironmentDefined
+include $(AP_WORK)\build\NWGNUhead.inc
+endif
+
+#
+# These directories will be at the beginning of the include list, followed by
+# INCDIRS
+#
+XINCDIRS       += \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
+                       $(AP_WORK)/modules/arch/netware \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR) \
+                       $(EOLIST)
+
+#
+# These flags will come after CFLAGS
+#
+XCFLAGS                += \
+                       -prefix pre_nw.h \
+                       $(EOLIST)
+
+#
+# These defines will come after DEFINES
+#
+XDEFINES       += \
+                       $(EOLIST)
+
+#
+# These flags will be added to the link.opt file
+#
+XLFLAGS                += \
+                       $(EOLIST)
+
+#
+# These values will be appended to the correct variables based on the value of
+# RELEASE
+#
+ifeq "$(RELEASE)" "debug"
+XINCDIRS       += \
+                       $(EOLIST)
+
+XCFLAGS                += \
+                       $(EOLIST)
+
+XDEFINES       += \
+                       $(EOLIST)
+
+XLFLAGS                += \
+                       $(EOLIST)
+endif
+
+ifeq "$(RELEASE)" "noopt"
+XINCDIRS       += \
+                       $(EOLIST)
+
+XCFLAGS                += \
+                       $(EOLIST)
+
+XDEFINES       += \
+                       $(EOLIST)
+
+XLFLAGS                += \
+                       $(EOLIST)
+endif
+
+ifeq "$(RELEASE)" "release"
+XINCDIRS       += \
+                       $(EOLIST)
+
+XCFLAGS                += \
+                       $(EOLIST)
+
+XDEFINES       += \
+                       $(EOLIST)
+
+XLFLAGS                += \
+                       $(EOLIST)
+endif
+
+#
+# These are used by the link target if an NLM is being generated
+# This is used by the link 'name' directive to name the nlm.  If left blank
+# TARGET_nlm (see below) will be used.
+#
+NLM_NAME               = mod_filter
+
+#
+# This is used by the link '-desc ' directive. 
+# If left blank, NLM_NAME will be used.
+#
+NLM_DESCRIPTION        = Apache $(VERSION_STR) Filter Module
+
+#
+# This is used by the '-threadname' directive.  If left blank,
+# NLM_NAME Thread will be used.
+#
+NLM_THREAD_NAME        = Filter Module
+
+#
+# If this is specified, it will override VERSION value in 
+# $(AP_WORK)\build\NWGNUenvironment.inc
+#
+NLM_VERSION            =
+
+#
+# If this is specified, it will override the default of 64K
+#
+NLM_STACK_SIZE = 8192
+
+
+#
+# If this is specified it will be used by the link '-entry' directive
+#
+NLM_ENTRY_SYM  = _LibCPrelude
+
+#
+# If this is specified it will be used by the link '-exit' directive
+#
+NLM_EXIT_SYM   = _LibCPostlude
+
+#
+# If this is specified it will be used by the link '-check' directive
+#
+NLM_CHECK_SYM  =
+
+#
+# If these are specified it will be used by the link '-flags' directive
+#
+NLM_FLAGS              =  AUTOUNLOAD, PSEUDOPREEMPTION
+
+#
+# If this is specified it will be linked in with the XDCData option in the def 
+# file instead of the default of $(NWOS)/apache.xdc.  XDCData can be disabled
+# by setting APACHE_UNIPROC in the environment
+#
+XDCDATA         = 
+
+#
+# If there is an NLM target, put it here
+#
+TARGET_nlm = \
+       $(OBJDIR)/mod_filter.nlm \
+       $(EOLIST)
+
+#
+# If there is an LIB target, put it here
+#
+TARGET_lib = \
+       $(EOLIST)
+
+#
+# These are the OBJ files needed to create the NLM target above.
+# Paths must all use the '/' character
+#
+FILES_nlm_objs = \
+       $(OBJDIR)/mod_filter.o \
+       $(EOLIST)
+
+#
+# These are the LIB files needed to create the NLM target above.
+# These will be added as a library command in the link.opt file.
+#
+FILES_nlm_libs = \
+       libcpre.o \
+       $(EOLIST)
+
+#
+# These are the modules that the above NLM target depends on to load.
+# These will be added as a module command in the link.opt file.
+#
+FILES_nlm_modules = \
+       aprlib \
+       libc \
+       $(EOLIST)
+
+#
+# If the nlm has a msg file, put it's path here
+#
+FILE_nlm_msg =
+ 
+#
+# If the nlm has a hlp file put it's path here
+#
+FILE_nlm_hlp =
+
+#
+# If this is specified, it will override $(NWOS)\copyright.txt.
+#
+FILE_nlm_copyright =
+
+#
+# Any additional imports go here
+#
+FILES_nlm_Ximports = \
+       @$(APR)/aprlib.imp \
+       @$(NWOS)/httpd.imp \
+       @libc.imp \
+       $(EOLIST)
+ 
+#   
+# Any symbols exported to here
+#
+FILES_nlm_exports = \
+       filter_module \
+       $(EOLIST)
+       
+#   
+# These are the OBJ files needed to create the LIB target above.
+# Paths must all use the '/' character
+#
+FILES_lib_objs = \
+               $(EOLIST)
+
+#
+# implement targets and dependancies (leave this section alone)
+#
+
+libs :: $(OBJDIR) $(TARGET_lib)
+
+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
+
+#
+# Any specialized rules here
+#
+
+#
+# Include the 'tail' makefile that has targets that depend on variables defined
+# in this makefile
+#
+
+include $(AP_WORK)\build\NWGNUtail.inc
+

diff --git a/modules/filters/NWGNUdeflate b/modules/filters/NWGNUdeflate
index c828e1f6d5bc3646e7838c0fdc6a38dd9421069b..53b4f78910873cb31587189bd1fbca0d4b464be5 100644 (file)
--- a/modules/filters/NWGNUdeflate
+++ b/modules/filters/NWGNUdeflate
@@ -30,9 +30,9 @@ XINCDIRS      += \
                        $(AP_WORK)/include \
                        $(NWOS) \
                        $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/apr-util/include \
-                       $(AP_WORK)/srclib/apr \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/modules/filters/NWGNUextfiltr b/modules/filters/NWGNUextfiltr
index f17aea1e847b542f4f68dd7f608af4c2cc8aea79..1de291ca2b53cd81f9839f755718f32a77f0e83a 100644 (file)
--- a/modules/filters/NWGNUextfiltr
+++ b/modules/filters/NWGNUextfiltr
@@ -19,9 +19,9 @@ XINCDIRS      += \
                        $(AP_WORK)/include \
                        $(NWOS) \
                        $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/apr-util/include \
-                       $(AP_WORK)/srclib/apr \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/modules/generators/NWGNUinfo b/modules/generators/NWGNUinfo
index c24f9525a19339a07484fff9b8f89d8f3a296dab..8d1a8972f922e3ec530ab3500655a0ff54de3c5f 100644 (file)
--- a/modules/generators/NWGNUinfo
+++ b/modules/generators/NWGNUinfo
@@ -19,9 +19,9 @@ XINCDIRS      += \
                        $(AP_WORK)/include \
                        $(NWOS) \
                        $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/apr-util/include \
-                       $(AP_WORK)/srclib/apr \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/modules/generators/NWGNUstatus b/modules/generators/NWGNUstatus
index f636edffcd4075917e73eebfb9fe90f028b57690..6e9c1d823afa0c3c14d7621808be21d97033aeb0 100644 (file)
--- a/modules/generators/NWGNUstatus
+++ b/modules/generators/NWGNUstatus
@@ -19,9 +19,9 @@ XINCDIRS      += \
                        $(AP_WORK)/include \
                        $(NWOS) \
                        $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/apr-util/include \
-                       $(AP_WORK)/srclib/apr \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/modules/ldap/NWGNUmakefile b/modules/ldap/NWGNUmakefile
index 98be959d06589c5ff1da255c810ea1c4ebbad994..21179fedfb6f8be9b7e8583773607592f444701a 100644 (file)
--- a/modules/ldap/NWGNUmakefile
+++ b/modules/ldap/NWGNUmakefile
@@ -18,9 +18,9 @@ endif
 XINCDIRS       += \
                        $(AP_WORK)/include \
                        $(NWOS) \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/apr-util/include \
-                       $(AP_WORK)/srclib/apr \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR) \
                        $(LDAPSDK)/inc \
                        $(EOLIST)
 

diff --git a/modules/loggers/NWGNUforensic b/modules/loggers/NWGNUforensic
index 561922eae519f3932cf00f0fcfb0e5fdd49de558..58bbbcee43477c8139b835f14d33e9d203169559 100644 (file)
--- a/modules/loggers/NWGNUforensic
+++ b/modules/loggers/NWGNUforensic
@@ -27,9 +27,9 @@ XINCDIRS      += \
                        $(AP_WORK)/include \
                        $(NWOS) \
                        $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/apr-util/include \
-                       $(AP_WORK)/srclib/apr \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/modules/loggers/NWGNUmodlogio b/modules/loggers/NWGNUmodlogio
index 21d68b9673c1b671a0aef12afa78c0a67a49fe67..77f42d52ef01a988c54755ee1df4a326db32c852 100644 (file)
--- a/modules/loggers/NWGNUmodlogio
+++ b/modules/loggers/NWGNUmodlogio
@@ -27,9 +27,9 @@ XINCDIRS      += \
                        $(AP_WORK)/include \
                        $(NWOS) \
                        $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/apr-util/include \
-                       $(AP_WORK)/srclib/apr \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/modules/mappers/NWGNUrewrite b/modules/mappers/NWGNUrewrite
index 5fc146afb1de21ba8c18dad232dc158d2ad0b276..153a2410b5ed3e700296eb1b7144090289cb40cc 100644 (file)
--- a/modules/mappers/NWGNUrewrite
+++ b/modules/mappers/NWGNUrewrite
@@ -20,9 +20,9 @@ XINCDIRS      += \
                        $(NWOS) \
                        $(AP_WORK)/modules/arch/netware \
                        $(AP_WORK)/modules/ssl \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/apr-util/include \
-                       $(AP_WORK)/srclib/apr \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/modules/mappers/NWGNUspeling b/modules/mappers/NWGNUspeling
index 097a446bfba53e0cef61ecdc8a54d831b93cad1e..16c6677d6fde6ef99f64e6ecbd280410ee25deff 100644 (file)
--- a/modules/mappers/NWGNUspeling
+++ b/modules/mappers/NWGNUspeling
@@ -19,9 +19,9 @@ XINCDIRS      += \
                        $(AP_WORK)/include \
                        $(NWOS) \
                        $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/apr-util/include \
-                       $(AP_WORK)/srclib/apr \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/modules/mappers/NWGNUvhost b/modules/mappers/NWGNUvhost
index 5c466e779db20262c2c41fd4df22c7da58a75073..9f0bad4f647f6e2ca31458297752587ae2b0f612 100644 (file)
--- a/modules/mappers/NWGNUvhost
+++ b/modules/mappers/NWGNUvhost
@@ -19,9 +19,9 @@ XINCDIRS      += \
                        $(AP_WORK)/include \
                        $(NWOS) \
                        $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/apr-util/include \
-                       $(AP_WORK)/srclib/apr \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/modules/metadata/NWGNUcernmeta b/modules/metadata/NWGNUcernmeta
index 14d6727e0d45e5b46d769a41c580411e9d5df578..ffcd42a239d3ec246c6a38238a1b449d12cbb1b5 100644 (file)
--- a/modules/metadata/NWGNUcernmeta
+++ b/modules/metadata/NWGNUcernmeta
@@ -19,9 +19,9 @@ XINCDIRS      += \
                        $(AP_WORK)/include \
                        $(NWOS) \
                        $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/apr-util/include \
-                       $(AP_WORK)/srclib/apr \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/modules/metadata/NWGNUexpires b/modules/metadata/NWGNUexpires
index bb59bef3fa6aa0b6387b61caa4fd95eab052f656..5dff127faf30d2ba95d1ce499eb86cfef6a1961f 100644 (file)
--- a/modules/metadata/NWGNUexpires
+++ b/modules/metadata/NWGNUexpires
@@ -19,9 +19,9 @@ XINCDIRS      += \
                        $(AP_WORK)/include \
                        $(NWOS) \
                        $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/apr-util/include \
-                       $(AP_WORK)/srclib/apr \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/modules/metadata/NWGNUheaders b/modules/metadata/NWGNUheaders
index 04bf615aad21e5f154e41b3b2e44879a78c2b601..5c788a2f1c59ef58e0f7f9ec380aa60c7c391d8d 100644 (file)
--- a/modules/metadata/NWGNUheaders
+++ b/modules/metadata/NWGNUheaders
@@ -20,9 +20,9 @@ XINCDIRS      += \
                        $(NWOS) \
                        $(AP_WORK)/modules/arch/netware \
                        $(AP_WORK)/modules/ssl \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/apr-util/include \
-                       $(AP_WORK)/srclib/apr \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/modules/metadata/NWGNUmimemagi b/modules/metadata/NWGNUmimemagi
index a2ea5a24d92e51040bbfb98d63279e8c0de5c282..3c5f11a430edf80afa2e3cc8039ca70fae2662bb 100644 (file)
--- a/modules/metadata/NWGNUmimemagi
+++ b/modules/metadata/NWGNUmimemagi
@@ -19,9 +19,9 @@ XINCDIRS      += \
                        $(AP_WORK)/include \
                        $(NWOS) \
                        $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/apr-util/include \
-                       $(AP_WORK)/srclib/apr \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/modules/metadata/NWGNUmodident b/modules/metadata/NWGNUmodident
index dc7e03148216e46ea6272b175f053387d425e538..0677b431022945392fe5931bf14a3b73e27d06fa 100644 (file)
--- a/modules/metadata/NWGNUmodident
+++ b/modules/metadata/NWGNUmodident
@@ -19,9 +19,9 @@ XINCDIRS      += \
                        $(AP_WORK)/include \
                        $(NWOS) \
                        $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/apr-util/include \
-                       $(AP_WORK)/srclib/apr \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/modules/metadata/NWGNUmodversion b/modules/metadata/NWGNUmodversion
index 47b24699c99f18e8dc2e41cbb9100c5869e25853..9f97d64926cc100826923bc4fceb25bb29ed37f3 100644 (file)
--- a/modules/metadata/NWGNUmodversion
+++ b/modules/metadata/NWGNUmodversion
@@ -19,9 +19,9 @@ XINCDIRS      += \
                        $(AP_WORK)/include \
                        $(NWOS) \
                        $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/apr-util/include \
-                       $(AP_WORK)/srclib/apr \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/modules/metadata/NWGNUuniqueid b/modules/metadata/NWGNUuniqueid
index 42078edc955d4629771728ebbafb4146b3613a74..3928d31952314fe7ab9daef0102c37e0b91c94ef 100644 (file)
--- a/modules/metadata/NWGNUuniqueid
+++ b/modules/metadata/NWGNUuniqueid
@@ -19,9 +19,9 @@ XINCDIRS      += \
                        $(AP_WORK)/include \
                        $(NWOS) \
                        $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/apr-util/include \
-                       $(AP_WORK)/srclib/apr \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/modules/metadata/NWGNUusertrk b/modules/metadata/NWGNUusertrk
index 6059066fa43a4ea88000ebeee1fe980f56599ab1..0249a0f929a0564770566fa8b2e8fb26b10d8a59 100644 (file)
--- a/modules/metadata/NWGNUusertrk
+++ b/modules/metadata/NWGNUusertrk
@@ -19,9 +19,9 @@ XINCDIRS      += \
                        $(AP_WORK)/include \
                        $(NWOS) \
                        $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/apr-util/include \
-                       $(AP_WORK)/srclib/apr \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/modules/proxy/NWGNUproxy b/modules/proxy/NWGNUproxy
index 80585d6c0a9dc872333435ec7e09b20969a052d6..29eff8682fa9c368cb73ba6d161cbb37b43b389a 100644 (file)
--- a/modules/proxy/NWGNUproxy
+++ b/modules/proxy/NWGNUproxy
@@ -22,9 +22,9 @@ XINCDIRS      += \
                        $(AP_WORK)/modules/arch/netware \
                        $(AP_WORK)/modules/ssl \
                        $(AP_WORK)/modules/generators \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/apr-util/include \
-                       $(AP_WORK)/srclib/apr \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/modules/proxy/NWGNUproxyajp b/modules/proxy/NWGNUproxyajp
index 4f764ff9a663c64e6b3e68d621c852b2e5c6cc70..5d4baf2f8c59209c77253000c6e76d72f133602e 100644 (file)
--- a/modules/proxy/NWGNUproxyajp
+++ b/modules/proxy/NWGNUproxyajp
@@ -20,9 +20,9 @@ XINCDIRS      += \
                        $(NWOS) \
                        $(AP_WORK)/modules/http \
                        $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/apr-util/include \
-                       $(AP_WORK)/srclib/apr \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/modules/proxy/NWGNUproxybalancer b/modules/proxy/NWGNUproxybalancer
index 66f86fd87646a0bc9863de6ebf02dc97360cf258..c856f15fcabf67857e31769c0b641b9c67889455 100644 (file)
--- a/modules/proxy/NWGNUproxybalancer
+++ b/modules/proxy/NWGNUproxybalancer
@@ -20,9 +20,9 @@ XINCDIRS      += \
                        $(NWOS) \
                        $(AP_WORK)/modules/http \
                        $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/apr-util/include \
-                       $(AP_WORK)/srclib/apr \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/modules/proxy/NWGNUproxycon b/modules/proxy/NWGNUproxycon
index 241ca3ffdc54206e989f91be424c13f82af140f0..a31f5fcd81e56902e77ea245c0ee2eaad3a8c5b2 100644 (file)
--- a/modules/proxy/NWGNUproxycon
+++ b/modules/proxy/NWGNUproxycon
@@ -20,9 +20,9 @@ XINCDIRS      += \
                        $(NWOS) \
                        $(AP_WORK)/modules/http \
                        $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/apr-util/include \
-                       $(AP_WORK)/srclib/apr \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/modules/proxy/NWGNUproxyftp b/modules/proxy/NWGNUproxyftp
index 86285ebfbafd63abbaeb57d1d527246015cc6b9c..118258cfab183bf52f4910dbf51cd5a5d00dcd89 100644 (file)
--- a/modules/proxy/NWGNUproxyftp
+++ b/modules/proxy/NWGNUproxyftp
@@ -20,9 +20,9 @@ XINCDIRS      += \
                        $(NWOS) \
                        $(AP_WORK)/modules/http \
                        $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/apr-util/include \
-                       $(AP_WORK)/srclib/apr \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/modules/proxy/NWGNUproxyhtp b/modules/proxy/NWGNUproxyhtp
index f605a03564af28546d28dd9b607701078e884eec..b24bf293f06a0af7a4db2803d70f224b20df8271 100644 (file)
--- a/modules/proxy/NWGNUproxyhtp
+++ b/modules/proxy/NWGNUproxyhtp
@@ -20,9 +20,9 @@ XINCDIRS      += \
                        $(NWOS) \
                        $(AP_WORK)/modules/http \
                        $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/apr-util/include \
-                       $(AP_WORK)/srclib/apr \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/support/NWGNUab b/support/NWGNUab
index d0ca39d1ba1f8aa328096c423bf8f6cfd1cfe537..d7cd3211ee6d1dc2fb556a87bf6a7d7a96e088fa 100644 (file)
--- a/support/NWGNUab
+++ b/support/NWGNUab
@@ -18,10 +18,10 @@ endif
 XINCDIRS       += \
                        $(NWOS) \
                        $(AP_WORK)/include \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/apr-util/include \
-                       $(AP_WORK)/srclib/apr/misc/netware \
-                       $(AP_WORK)/srclib/apr \
+                       $(APR)/include \
+                       $(APRUTIL)/../apr-util/include \
+                       $(APR)/misc/netware \
+                       $(APR_WORK) \
                        $(EOLIST)
 
 #

diff --git a/support/NWGNUhtcacheclean b/support/NWGNUhtcacheclean
index d55ddeef4b0acf081c3509955ff6dbfdf1e85a5d..17d03d362ac1768684f5fa7c4e3d1b026d36f8db 100644 (file)
--- a/support/NWGNUhtcacheclean
+++ b/support/NWGNUhtcacheclean
@@ -1,252 +1,252 @@
-#\r
-# Make sure all needed macro's are defined\r
-#\r
-\r
-#\r
-# Get the 'head' of the build environment if necessary.  This includes default\r
-# targets and paths to tools\r
-#\r
-\r
-ifndef EnvironmentDefined\r
-include $(AP_WORK)\build\NWGNUhead.inc\r
-endif\r
-\r
-#\r
-# These directories will be at the beginning of the include list, followed by\r
-# INCDIRS\r
-#\r
-XINCDIRS       += \\r
-                       $(NWOS) \\r
-                       $(AP_WORK)/srclib/apr/include \\r
-                       $(AP_WORK)/srclib/apr-util/include \\r
-                       $(AP_WORK)/srclib/apr/misc/netware \\r
-                       $(AP_WORK)/srclib/apr \\r
-                       $(EOLIST)\r
-\r
-#\r
-# These flags will come after CFLAGS\r
-#\r
-XCFLAGS                += \\r
-                       $(EOLIST)\r
-\r
-#\r
-# These defines will come after DEFINES\r
-#\r
-XDEFINES       += \\r
-                       $(EOLIST)\r
-\r
-#\r
-# These flags will be added to the link.opt file\r
-#\r
-XLFLAGS                += \\r
-                       $(EOLIST)\r
-\r
-#\r
-# These values will be appended to the correct variables based on the value of\r
-# RELEASE\r
-#\r
-ifeq "$(RELEASE)" "debug"\r
-XINCDIRS       += \\r
-                       $(EOLIST)\r
-\r
-XCFLAGS                += \\r
-                       $(EOLIST)\r
-\r
-XDEFINES       += \\r
-                       $(EOLIST)\r
-\r
-XLFLAGS                += \\r
-                       $(EOLIST)\r
-endif\r
-\r
-ifeq "$(RELEASE)" "noopt"\r
-XINCDIRS       += \\r
-                       $(EOLIST)\r
-\r
-XCFLAGS                += \\r
-                       $(EOLIST)\r
-\r
-XDEFINES       += \\r
-                       $(EOLIST)\r
-\r
-XLFLAGS                += \\r
-                       $(EOLIST)\r
-endif\r
-\r
-ifeq "$(RELEASE)" "release"\r
-XINCDIRS       += \\r
-                       $(EOLIST)\r
-\r
-XCFLAGS                += \\r
-                       $(EOLIST)\r
-\r
-XDEFINES       += \\r
-                       $(EOLIST)\r
-\r
-XLFLAGS                += \\r
-                       $(EOLIST)\r
-endif\r
-\r
-#\r
-# These are used by the link target if an NLM is being generated\r
-# This is used by the link 'name' directive to name the nlm.  If left blank\r
-# TARGET_nlm (see below) will be used.\r
-#\r
-NLM_NAME               = htcacheclean\r
-\r
-#\r
-# This is used by the link '-desc ' directive. \r
-# If left blank, NLM_NAME will be used.\r
-#\r
-NLM_DESCRIPTION        = Apache $(VERSION_STR) HT Disk Cache Cleanup Utility for NetWare\r
-\r
-#\r
-# This is used by the '-threadname' directive.  If left blank,\r
-# NLM_NAME Thread will be used.\r
-#\r
-NLM_THREAD_NAME        = htcacheclean\r
-\r
-#\r
-# This is used by the '-screenname' directive.  If left blank,\r
-# 'Apache for NetWare' Thread will be used.\r
-#\r
-NLM_SCREEN_NAME = DEFAULT\r
-\r
-#\r
-# If this is specified, it will override VERSION value in \r
-# $(AP_WORK)\build\NWGNUenvironment.inc\r
-#\r
-NLM_VERSION            =\r
-\r
-#\r
-# If this is specified, it will override the default of 64K\r
-#\r
-NLM_STACK_SIZE = 8192\r
-\r
-\r
-#\r
-# If this is specified it will be used by the link '-entry' directive\r
-#\r
-NLM_ENTRY_SYM  = _LibCPrelude\r
-\r
-#\r
-# If this is specified it will be used by the link '-exit' directive\r
-#\r
-NLM_EXIT_SYM   = _LibCPostlude\r
-\r
-#\r
-# If this is specified it will be used by the link '-check' directive\r
-#\r
-NLM_CHECK_SYM  =\r
-\r
-#\r
-# If these are specified it will be used by the link '-flags' directive\r
-#\r
-NLM_FLAGS              =  AUTOUNLOAD, PSEUDOPREEMPTION\r
-\r
-#\r
-# If this is specified it will be linked in with the XDCData option in the def \r
-# file instead of the default of $(NWOS)/apache.xdc.  XDCData can be disabled\r
-# by setting APACHE_UNIPROC in the environment\r
-#\r
-XDCDATA         = \r
-\r
-#\r
-# If there is an NLM target, put it here\r
-#\r
-TARGET_nlm = \\r
-       $(OBJDIR)/htcacheclean.nlm \\r
-       $(EOLIST)\r
-\r
-#\r
-# If there is an LIB target, put it here\r
-#\r
-TARGET_lib = \\r
-       $(EOLIST)\r
-\r
-#\r
-# These are the OBJ files needed to create the NLM target above.\r
-# Paths must all use the '/' character\r
-#\r
-FILES_nlm_objs = \\r
-       $(OBJDIR)/htcacheclean.o \\r
-       $(EOLIST)\r
-\r
-#\r
-# These are the LIB files needed to create the NLM target above.\r
-# These will be added as a library command in the link.opt file.\r
-#\r
-FILES_nlm_libs = \\r
-       libcpre.o \\r
-       $(EOLIST)\r
-\r
-#\r
-# These are the modules that the above NLM target depends on to load.\r
-# These will be added as a module command in the link.opt file.\r
-#\r
-FILES_nlm_modules = \\r
-       aprlib \\r
-       libc \\r
-       $(EOLIST)\r
-\r
-#\r
-# If the nlm has a msg file, put it's path here\r
-#\r
-FILE_nlm_msg =\r
- \r
-#\r
-# If the nlm has a hlp file put it's path here\r
-#\r
-FILE_nlm_hlp =\r
-\r
-#\r
-# If this is specified, it will override $(NWOS)\copyright.txt.\r
-#\r
-FILE_nlm_copyright =\r
-\r
-#\r
-# Any additional imports go here\r
-#\r
-FILES_nlm_Ximports = \\r
-       @$(APR)/aprlib.imp \\r
-       @libc.imp \\r
-       $(EOLIST)\r
- \r
-#   \r
-# Any symbols exported to here\r
-#\r
-FILES_nlm_exports = \\r
-       $(EOLIST)\r
-       \r
-#   \r
-# These are the OBJ files needed to create the LIB target above.\r
-# Paths must all use the '/' character\r
-#\r
-FILES_lib_objs = \\r
-               $(EOLIST)\r
-\r
-#\r
-# implement targets and dependancies (leave this section alone)\r
-#\r
-\r
-libs :: $(OBJDIR) $(TARGET_lib)\r
-\r
-nlms :: libs $(TARGET_nlm)\r
-\r
-#\r
-# Updated this target to create necessary directories and copy files to the \r
-# correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)\r
-#\r
-install :: nlms FORCE\r
-\r
-#\r
-# Any specialized rules here\r
-#\r
-\r
-#\r
-# Include the 'tail' makefile that has targets that depend on variables defined\r
-# in this makefile\r
-#\r
-\r
-include $(AP_WORK)\build\NWGNUtail.inc\r
-\r
+#
+# Make sure all needed macro's are defined
+#
+
+#
+# Get the 'head' of the build environment if necessary.  This includes default
+# targets and paths to tools
+#
+
+ifndef EnvironmentDefined
+include $(AP_WORK)\build\NWGNUhead.inc
+endif
+
+#
+# These directories will be at the beginning of the include list, followed by
+# INCDIRS
+#
+XINCDIRS       += \
+                       $(NWOS) \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR)/misc/netware \
+                       $(APR) \
+                       $(EOLIST)
+
+#
+# These flags will come after CFLAGS
+#
+XCFLAGS                += \
+                       $(EOLIST)
+
+#
+# These defines will come after DEFINES
+#
+XDEFINES       += \
+                       $(EOLIST)
+
+#
+# These flags will be added to the link.opt file
+#
+XLFLAGS                += \
+                       $(EOLIST)
+
+#
+# These values will be appended to the correct variables based on the value of
+# RELEASE
+#
+ifeq "$(RELEASE)" "debug"
+XINCDIRS       += \
+                       $(EOLIST)
+
+XCFLAGS                += \
+                       $(EOLIST)
+
+XDEFINES       += \
+                       $(EOLIST)
+
+XLFLAGS                += \
+                       $(EOLIST)
+endif
+
+ifeq "$(RELEASE)" "noopt"
+XINCDIRS       += \
+                       $(EOLIST)
+
+XCFLAGS                += \
+                       $(EOLIST)
+
+XDEFINES       += \
+                       $(EOLIST)
+
+XLFLAGS                += \
+                       $(EOLIST)
+endif
+
+ifeq "$(RELEASE)" "release"
+XINCDIRS       += \
+                       $(EOLIST)
+
+XCFLAGS                += \
+                       $(EOLIST)
+
+XDEFINES       += \
+                       $(EOLIST)
+
+XLFLAGS                += \
+                       $(EOLIST)
+endif
+
+#
+# These are used by the link target if an NLM is being generated
+# This is used by the link 'name' directive to name the nlm.  If left blank
+# TARGET_nlm (see below) will be used.
+#
+NLM_NAME               = htcacheclean
+
+#
+# This is used by the link '-desc ' directive. 
+# If left blank, NLM_NAME will be used.
+#
+NLM_DESCRIPTION        = Apache $(VERSION_STR) HT Disk Cache Cleanup Utility for NetWare
+
+#
+# This is used by the '-threadname' directive.  If left blank,
+# NLM_NAME Thread will be used.
+#
+NLM_THREAD_NAME        = htcacheclean
+
+#
+# This is used by the '-screenname' directive.  If left blank,
+# 'Apache for NetWare' Thread will be used.
+#
+NLM_SCREEN_NAME = DEFAULT
+
+#
+# If this is specified, it will override VERSION value in 
+# $(AP_WORK)\build\NWGNUenvironment.inc
+#
+NLM_VERSION            =
+
+#
+# If this is specified, it will override the default of 64K
+#
+NLM_STACK_SIZE = 8192
+
+
+#
+# If this is specified it will be used by the link '-entry' directive
+#
+NLM_ENTRY_SYM  = _LibCPrelude
+
+#
+# If this is specified it will be used by the link '-exit' directive
+#
+NLM_EXIT_SYM   = _LibCPostlude
+
+#
+# If this is specified it will be used by the link '-check' directive
+#
+NLM_CHECK_SYM  =
+
+#
+# If these are specified it will be used by the link '-flags' directive
+#
+NLM_FLAGS              =  AUTOUNLOAD, PSEUDOPREEMPTION
+
+#
+# If this is specified it will be linked in with the XDCData option in the def 
+# file instead of the default of $(NWOS)/apache.xdc.  XDCData can be disabled
+# by setting APACHE_UNIPROC in the environment
+#
+XDCDATA         = 
+
+#
+# If there is an NLM target, put it here
+#
+TARGET_nlm = \
+       $(OBJDIR)/htcacheclean.nlm \
+       $(EOLIST)
+
+#
+# If there is an LIB target, put it here
+#
+TARGET_lib = \
+       $(EOLIST)
+
+#
+# These are the OBJ files needed to create the NLM target above.
+# Paths must all use the '/' character
+#
+FILES_nlm_objs = \
+       $(OBJDIR)/htcacheclean.o \
+       $(EOLIST)
+
+#
+# These are the LIB files needed to create the NLM target above.
+# These will be added as a library command in the link.opt file.
+#
+FILES_nlm_libs = \
+       libcpre.o \
+       $(EOLIST)
+
+#
+# These are the modules that the above NLM target depends on to load.
+# These will be added as a module command in the link.opt file.
+#
+FILES_nlm_modules = \
+       aprlib \
+       libc \
+       $(EOLIST)
+
+#
+# If the nlm has a msg file, put it's path here
+#
+FILE_nlm_msg =
+ 
+#
+# If the nlm has a hlp file put it's path here
+#
+FILE_nlm_hlp =
+
+#
+# If this is specified, it will override $(NWOS)\copyright.txt.
+#
+FILE_nlm_copyright =
+
+#
+# Any additional imports go here
+#
+FILES_nlm_Ximports = \
+       @$(APR)/aprlib.imp \
+       @libc.imp \
+       $(EOLIST)
+ 
+#   
+# Any symbols exported to here
+#
+FILES_nlm_exports = \
+       $(EOLIST)
+       
+#   
+# These are the OBJ files needed to create the LIB target above.
+# Paths must all use the '/' character
+#
+FILES_lib_objs = \
+               $(EOLIST)
+
+#
+# implement targets and dependancies (leave this section alone)
+#
+
+libs :: $(OBJDIR) $(TARGET_lib)
+
+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
+
+#
+# Any specialized rules here
+#
+
+#
+# Include the 'tail' makefile that has targets that depend on variables defined
+# in this makefile
+#
+
+include $(AP_WORK)\build\NWGNUtail.inc
+

diff --git a/support/NWGNUhtdbm b/support/NWGNUhtdbm
index efb2475a9e1801aa8e5babec45752d2e6fa349c8..492d22924e4618e718b4c84a7e602abab8a73995 100644 (file)
--- a/support/NWGNUhtdbm
+++ b/support/NWGNUhtdbm
@@ -17,10 +17,10 @@ endif
 #
 XINCDIRS       += \
                        $(NWOS) \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/apr-util/include \
-                       $(AP_WORK)/srclib/apr/misc/netware \
-                       $(AP_WORK)/srclib/apr \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR)/misc/netware \
+                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/support/NWGNUhtdigest b/support/NWGNUhtdigest
index ae702e0ee2c548540dfcf36e31f2658ab1e6112e..4fbdc040cce1113f1088af0605487f298ff5b09d 100644 (file)
--- a/support/NWGNUhtdigest
+++ b/support/NWGNUhtdigest
@@ -17,10 +17,10 @@ endif
 #
 XINCDIRS       += \
                        $(NWOS) \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/apr-util/include \
-                       $(AP_WORK)/srclib/apr/misc/netware \
-                       $(AP_WORK)/srclib/apr \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR)/misc/netware \
+                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/support/NWGNUhtpasswd b/support/NWGNUhtpasswd
index 53c7e511d5904ba003b45de4f7022045c4c835f7..2b692db4b8b781c887e718d94a8e1f0cf1f856e2 100644 (file)
--- a/support/NWGNUhtpasswd
+++ b/support/NWGNUhtpasswd
@@ -17,10 +17,10 @@ endif
 #
 XINCDIRS       += \
                        $(NWOS) \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/apr-util/include \
-                       $(AP_WORK)/srclib/apr/misc/netware \
-                       $(AP_WORK)/srclib/apr \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR)/misc/netware \
+                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/support/NWGNUlogres b/support/NWGNUlogres
index 0c717f7137b3506abc9932b3717bd7469235d7cd..023c8e44da33209cbd04c6b02d9c8e9b9e114ee4 100644 (file)
--- a/support/NWGNUlogres
+++ b/support/NWGNUlogres
@@ -18,10 +18,10 @@ endif
 XINCDIRS       += \
                        $(NWOS) \
                        $(AP_WORK)/include \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/apr-util/include \
-                       $(AP_WORK)/srclib/apr/misc/netware \
-                       $(AP_WORK)/srclib/apr \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
+                       $(APR)/misc/netware \
+                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/support/NWGNUrotlogs b/support/NWGNUrotlogs
index ab8d76b1f4e35d2303cb8a01fe9864388e77236e..9a55095208e294947550559ac4b180ff2fe49dc5 100644 (file)
--- a/support/NWGNUrotlogs
+++ b/support/NWGNUrotlogs
@@ -17,9 +17,9 @@ endif
 #
 XINCDIRS       += \
                        $(NWOS) \
-                       $(AP_WORK)/srclib/apr/include \
-                       $(AP_WORK)/srclib/apr/misc/netware \
-                       $(AP_WORK)/srclib/apr \
+                       $(APR)/include \
+                       $(APR)/misc/netware \
+                       $(APR) \
                        $(EOLIST)
 
 #