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

55 files changed, 660 insertions, 667 deletions

diff --git a/NWGNUmakefile b/NWGNUmakefile
index ba31a12aef..ee85d857e5 100644
--- 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 206e0b4002..a84b9e246d 100644
--- 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 8b631f21aa..72dd90f659 100644
--- 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 dbc4d0fa9a..bc7e1ec92c 100644
--- 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 9dfa45b2e7..3b594b29c3 100644
--- 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 2e61075281..5bdd1c2f82 100644
--- 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 c9087bd540..9ebfd871a9 100644
--- 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 39710e6094..e77d40dc33 100644
--- 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 9e396a67de..1cfbb42273 100644
--- 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 6c36774dae..5b0ac89daf 100644
--- 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 65060a3cd0..1b7bd13760 100644
--- 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 e194678157..348785b04d 100644
--- 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 60eb244bdb..a104c4fd76 100644
--- 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 3a3a11d885..eb9e2c93c3 100644
--- 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 6780d12390..9dc385e77e 100644
--- 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 6d83d8ae69..782d8834cf 100644
--- 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 55e1a73323..125c456794 100644
--- 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 f4f7704440..d4307a7673 100644
--- 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 99dbc59283..6036fab3b8 100644
--- 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 a692a2f920..9fc46c030d 100644
--- 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 3fc4a12c10..d3d40e2814 100644
--- 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 e6b37ff25b..7094e9447f 100644
--- 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 adf0507955..13c97b1d66 100644
--- 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 49a75ea0de..ec671c5963 100644
--- a/modules/experimental/NWGNUmod_filter
+++ b/modules/experimental/NWGNUmod_filter
@@ -1,250 +1,250 @@
-#

-# 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 \

-			$(AP_WORK)/srclib/apr/include \

-			$(AP_WORK)/srclib/apr-util/include \

-			$(AP_WORK)/srclib/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

-

+#
+# 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 c828e1f6d5..53b4f78910 100644
--- 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 f17aea1e84..1de291ca2b 100644
--- 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 c24f9525a1..8d1a8972f9 100644
--- 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 f636edffcd..6e9c1d823a 100644
--- 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 98be959d06..21179fedfb 100644
--- 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 561922eae5..58bbbcee43 100644
--- 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 21d68b9673..77f42d52ef 100644
--- 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 5fc146afb1..153a2410b5 100644
--- 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 097a446bfb..16c6677d6f 100644
--- 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 5c466e779d..9f0bad4f64 100644
--- 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 14d6727e0d..ffcd42a239 100644
--- 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 bb59bef3fa..5dff127faf 100644
--- 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 04bf615aad..5c788a2f1c 100644
--- 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 a2ea5a24d9..3c5f11a430 100644
--- 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 dc7e031482..0677b43102 100644
--- 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 47b24699c9..9f97d64926 100644
--- 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 42078edc95..3928d31952 100644
--- 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 6059066fa4..0249a0f929 100644
--- 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 80585d6c0a..29eff8682f 100644
--- 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 4f764ff9a6..5d4baf2f8c 100644
--- 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 66f86fd876..c856f15fca 100644
--- 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 241ca3ffdc..a31f5fcd81 100644
--- 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 86285ebfba..118258cfab 100644
--- 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 f605a03564..b24bf293f0 100644
--- 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 d0ca39d1ba..d7cd3211ee 100644
--- 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 d55ddeef4b..17d03d362a 100644
--- a/support/NWGNUhtcacheclean
+++ b/support/NWGNUhtcacheclean
@@ -1,252 +1,252 @@
-#

-# 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) \

-			$(AP_WORK)/srclib/apr/include \

-			$(AP_WORK)/srclib/apr-util/include \

-			$(AP_WORK)/srclib/apr/misc/netware \

-			$(AP_WORK)/srclib/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

-

+#
+# 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 efb2475a9e..492d22924e 100644
--- 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 ae702e0ee2..4fbdc040cc 100644
--- 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 53c7e511d5..2b692db4b8 100644
--- 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 0c717f7137..023c8e44da 100644
--- 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 ab8d76b1f4..9a55095208 100644
--- 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)
 
 #