Another NetWare makefile cleanup.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1026826 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/NWGNUmakefile b/NWGNUmakefile
index 13e573c1a48fff8a42608ef1edac319e7cac4c82..61a3526046b5564d95d6add13b30e263e6693b47 100644 (file)
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -62,13 +62,13 @@ XINCDIRS    += \
                        $(APR)/include \
                        $(APRUTIL)/include \
                        $(AP_WORK)/include \
-                       $(AP_WORK)/modules/filters \
-                       $(AP_WORK)/modules/generators \
-                       $(AP_WORK)/modules/http \
-                       $(AP_WORK)/modules/loggers \
-                       $(AP_WORK)/modules/mappers \
-                       $(AP_WORK)/modules/proxy \
-                       $(AP_WORK)/server/mpm/NetWare \
+                       $(HTTPD) \
+                       $(STDMOD)/filters \
+                       $(STDMOD)/generators \
+                       $(STDMOD)/loggers \
+                       $(STDMOD)/mappers \
+                       $(STDMOD)/proxy \
+                       $(SERVER)/mpm/NetWare \
                        $(PCRE) \
                        $(NWOS) \
                        $(EOLIST)

diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc
index 9e6a5d83cb2b9514d69fcc40ca6b240167a2e5df..e318b0e295b3eb73db8484436e43baa2ad748d90 100644 (file)
--- a/build/NWGNUenvironment.inc
+++ b/build/NWGNUenvironment.inc
@@ -181,6 +181,10 @@ WIN_CFLAGS += -lMSL_All_x86.lib -lkernel32.lib -luser32.lib
 
 CFLAGS = -c -nosyspath -Cpp_exceptions off -RTTI off -align 4 -w nocmdline -proc PII 
 
+ifeq "$(REQUIRE_PROTOTYPES)" "1"
+CFLAGS += -r
+endif
+
 # -g                    generate debugging information
 # -O0                   level 0 optimizations
 

diff --git a/modules/aaa/NWGNUauthbasc b/modules/aaa/NWGNUauthbasc
index e445bf8519b783be99598d83ace3dbc0ada05b54..f1f1cbae9b101f607f160f0b6cf3e606d18534fc 100644 (file)
--- a/modules/aaa/NWGNUauthbasc
+++ b/modules/aaa/NWGNUauthbasc
@@ -16,12 +16,10 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/aaa/NWGNUauthdigt b/modules/aaa/NWGNUauthdigt
index 762c85335029e8dd4f2943cd49df07ca75c4f625..bb6b01cad00e191d3e5b1e008ff8ff8b1902bf06 100644 (file)
--- a/modules/aaa/NWGNUauthdigt
+++ b/modules/aaa/NWGNUauthdigt
@@ -16,12 +16,10 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/aaa/NWGNUauthnalias b/modules/aaa/NWGNUauthnalias
index 6dfbef6aa37cbb16e94b1fdd2915710c974f6cca..5432563fd9e9aec47d09d85e17657fd1a10cf53e 100644 (file)
--- a/modules/aaa/NWGNUauthnalias
+++ b/modules/aaa/NWGNUauthnalias
@@ -16,12 +16,10 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/aaa/NWGNUauthnano b/modules/aaa/NWGNUauthnano
index 0879e4a565cf3687420b12f331a05de3e34a5e03..446eaae9fd1c0d639efe8cc4601bb79d79075789 100644 (file)
--- a/modules/aaa/NWGNUauthnano
+++ b/modules/aaa/NWGNUauthnano
@@ -16,12 +16,10 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/aaa/NWGNUauthndbd b/modules/aaa/NWGNUauthndbd
index 10e3782bb2e3b72570670b4d962bad48c896d491..0128fe2b14197b6ac25b9ca4422dd1c67d83faa3 100644 (file)
--- a/modules/aaa/NWGNUauthndbd
+++ b/modules/aaa/NWGNUauthndbd
@@ -16,13 +16,11 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/modules/database \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
+                       $(STDMOD)/database \
                        $(EOLIST)
 
 #

diff --git a/modules/aaa/NWGNUauthndbm b/modules/aaa/NWGNUauthndbm
index 6dbe67f03171092bda230ed9187a92f5618d3481..a429c126e878b8d40db1a6c8fbfbf1c1385cda01 100644 (file)
--- a/modules/aaa/NWGNUauthndbm
+++ b/modules/aaa/NWGNUauthndbm
@@ -16,12 +16,10 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/aaa/NWGNUauthndef b/modules/aaa/NWGNUauthndef
index c6d2ce2f9088c9da6d35948ca32e7675129366a5..753d0149365089c4817d0f446d88b8d8b393aec6 100644 (file)
--- a/modules/aaa/NWGNUauthndef
+++ b/modules/aaa/NWGNUauthndef
@@ -16,12 +16,10 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/aaa/NWGNUauthnfil b/modules/aaa/NWGNUauthnfil
index 5bcb536d3d9e53fa5329b1bb62de313c749c7d76..54d2b37facf87379ec6fbad6bbb3e46263668284 100644 (file)
--- a/modules/aaa/NWGNUauthnfil
+++ b/modules/aaa/NWGNUauthnfil
@@ -16,12 +16,10 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/aaa/NWGNUauthnzldap b/modules/aaa/NWGNUauthnzldap
index ffb475dbdf64c74090bfe576fb68b67ebab274cf..ef4527e7c0465c50cddb0e7724115ebd1a696a30 100644 (file)
--- a/modules/aaa/NWGNUauthnzldap
+++ b/modules/aaa/NWGNUauthnzldap
@@ -16,11 +16,10 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/aaa/NWGNUauthzdbm b/modules/aaa/NWGNUauthzdbm
index 74a0d3dabd9549f11762e0ef309159301ea09c53..58db1d23e72108a71eadace25bf328ce14f13a7f 100644 (file)
--- a/modules/aaa/NWGNUauthzdbm
+++ b/modules/aaa/NWGNUauthzdbm
@@ -16,12 +16,10 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/aaa/NWGNUauthzdef b/modules/aaa/NWGNUauthzdef
index 8b5104eff67822734ace1dcf78fc3016bc4b72f2..8cafe81d09803b1ade058c375b5c994540c90f07 100644 (file)
--- a/modules/aaa/NWGNUauthzdef
+++ b/modules/aaa/NWGNUauthzdef
@@ -16,12 +16,10 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/aaa/NWGNUauthzgrp b/modules/aaa/NWGNUauthzgrp
index 7ed5dff30d3912f957fe70769e2968e0d2917859..2db5fae6da638e31dcd010067907fbcefd64b862 100644 (file)
--- a/modules/aaa/NWGNUauthzgrp
+++ b/modules/aaa/NWGNUauthzgrp
@@ -16,12 +16,10 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/aaa/NWGNUauthzusr b/modules/aaa/NWGNUauthzusr
index a97c253ce4a5685c296b8f33cb7c3e5bc45c0523..7e597e7ab9c8a5f034b35778a58d861a6def43f0 100644 (file)
--- a/modules/aaa/NWGNUauthzusr
+++ b/modules/aaa/NWGNUauthzusr
@@ -16,12 +16,10 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/cache/NWGNUdsk_cach b/modules/cache/NWGNUdsk_cach
index a2fb7d06d05f884d20ea5a0cbe5030b6eaf783f4..9eb83be290f3422c8384aa98eb03496d9526facc 100644 (file)
--- a/modules/cache/NWGNUdsk_cach
+++ b/modules/cache/NWGNUdsk_cach
@@ -26,8 +26,8 @@ XINCDIRS      += \
                        $(APR)/include \
                        $(APRUTIL)/include \
                        $(AP_WORK)/include \
-                       $(AP_WORK)/server/mpm/NetWare \
                        $(NWOS) \
+                       $(SERVER)/mpm/NetWare \
                        $(EOLIST)
 
 #

diff --git a/modules/cache/NWGNUmem_cach b/modules/cache/NWGNUmem_cach
index 19e329a73e579c154dc0f319bc87a7dee8144f12..3d7c6b32e001ed941dfbb2a900ba044b2fed2ee8 100644 (file)
--- a/modules/cache/NWGNUmem_cach
+++ b/modules/cache/NWGNUmem_cach
@@ -26,8 +26,8 @@ XINCDIRS      += \
                        $(APR)/include \
                        $(APRUTIL)/include \
                        $(AP_WORK)/include \
-                       $(AP_WORK)/server/mpm/NetWare \
                        $(NWOS) \
+                       $(SERVER)/mpm/NetWare \
                        $(EOLIST)
 
 #

diff --git a/modules/cache/NWGNUmod_cach b/modules/cache/NWGNUmod_cach
index 424da5226840f98d55d0e69f357d2c59624baac3..138c6a795c6a6920bf8d424fd75c692b058bdebc 100644 (file)
--- a/modules/cache/NWGNUmod_cach
+++ b/modules/cache/NWGNUmod_cach
@@ -26,8 +26,8 @@ XINCDIRS      += \
                        $(APR)/include \
                        $(APRUTIL)/include \
                        $(AP_WORK)/include \
-                       $(AP_WORK)/server/mpm/NetWare \
                        $(NWOS) \
+                       $(SERVER)/mpm/NetWare \
                        $(EOLIST)
 
 #

diff --git a/modules/database/NWGNUmakefile b/modules/database/NWGNUmakefile
index a418f1227462ae10c26a75b545ee237b28b42a25..fcaf2433037a694783e8d1bbf85c0125c943c75b 100644 (file)
--- a/modules/database/NWGNUmakefile
+++ b/modules/database/NWGNUmakefile
@@ -24,12 +24,10 @@ include $(AP_WORK)\build\NWGNUhead.inc
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/dav/fs/NWGNUmakefile b/modules/dav/fs/NWGNUmakefile
index f15b2dd63dc31d40f052b0cd7094b9621bad8414..5ade06a437f446fa90571fb93f565154700f2eca 100644 (file)
--- a/modules/dav/fs/NWGNUmakefile
+++ b/modules/dav/fs/NWGNUmakefile
@@ -27,10 +27,9 @@ XINCDIRS     += \
                        $(APR)/include \
                        $(APRUTIL)/include \
                        $(AP_WORK)/include \
-                       $(AP_WORK)/server/mpm/NetWare \
-                       $(AP_WORK)/modules/dav/main \
-                       $(AP_WORK)/modules/arch/netware \
                        $(NWOS) \
+                       $(STDMOD)/dav/main \
+                       $(SERVER)/mpm/NetWare \
                        $(EOLIST)
 
 #

diff --git a/modules/dav/lock/NWGNUmakefile b/modules/dav/lock/NWGNUmakefile
index e36a5237e5021cfa695f4820c5bca7db1cbec444..0d278ff8782035221b31854eabb8c1f4328fa28d 100644 (file)
--- a/modules/dav/lock/NWGNUmakefile
+++ b/modules/dav/lock/NWGNUmakefile
@@ -27,9 +27,9 @@ XINCDIRS      += \
                        $(APR)/include \
                        $(APRUTIL)/include \
                        $(AP_WORK)/include \
-                       $(AP_WORK)/server/mpm/NetWare \
-                       $(AP_WORK)/modules/dav/main \
                        $(NWOS) \
+                       $(STDMOD)/dav/main \
+                       $(SERVER)/mpm/NetWare \
                        $(EOLIST)
 
 #

diff --git a/modules/dav/main/NWGNUmakefile b/modules/dav/main/NWGNUmakefile
index 812dc9e3ace64302de03112149e1c00d21f0ec41..a002e3100fcd41f2f200527263d4b85e09245d0d 100644 (file)
--- a/modules/dav/main/NWGNUmakefile
+++ b/modules/dav/main/NWGNUmakefile
@@ -26,8 +26,8 @@ XINCDIRS      += \
                        $(APR)/include \
                        $(APRUTIL)/include \
                        $(AP_WORK)/include \
-                       $(AP_WORK)/server/mpm/NetWare \
                        $(NWOS) \
+                       $(SERVER)/mpm/NetWare \
                        $(EOLIST)
 
 #

diff --git a/modules/debug/NWGNUmodbucketeer b/modules/debug/NWGNUmodbucketeer
index 739ba354ab3208f6cc4f6b753383a0bb93ee1e99..0a37555a8440fb18dd4abc73d4861c3b12b4d02c 100644 (file)
--- a/modules/debug/NWGNUmodbucketeer
+++ b/modules/debug/NWGNUmodbucketeer
@@ -16,12 +16,10 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/debug/NWGNUmoddumpio b/modules/debug/NWGNUmoddumpio
index 349db536980b89b61806d3e4dfb8651ad43c8280..0be87ef53078fe792edca257cf8aadc6bbe10b00 100644 (file)
--- a/modules/debug/NWGNUmoddumpio
+++ b/modules/debug/NWGNUmoddumpio
@@ -16,12 +16,10 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/echo/NWGNUmakefile b/modules/echo/NWGNUmakefile
index d456bf197c1560b541c950f8116b3be9ba2ef5dd..623d8ed397a6f88806a7b1bca3b2c6c6b3d798cc 100644 (file)
--- a/modules/echo/NWGNUmakefile
+++ b/modules/echo/NWGNUmakefile
@@ -24,12 +24,10 @@ include $(AP_WORK)\build\NWGNUhead.inc
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/experimental/NWGNUcase_flt b/modules/experimental/NWGNUcase_flt
index f696b86369f093003cde53bafca00c2b780832be..18f55f3dc012cd8d1647338ca72bb8a4b8d9098c 100644 (file)
--- a/modules/experimental/NWGNUcase_flt
+++ b/modules/experimental/NWGNUcase_flt
@@ -24,12 +24,10 @@ include $(AP_WORK)\build\NWGNUhead.inc
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/experimental/NWGNUcase_flt_in b/modules/experimental/NWGNUcase_flt_in
index d9ec3113a68fa79dbd9d45412e8510226503352e..fedecb769f20ac77c2d5d9374cce441d2706385c 100644 (file)
--- a/modules/experimental/NWGNUcase_flt_in
+++ b/modules/experimental/NWGNUcase_flt_in
@@ -24,12 +24,10 @@ include $(AP_WORK)\build\NWGNUhead.inc
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/experimental/NWGNUexample b/modules/experimental/NWGNUexample
index 8979261698efe923e47171a632a649fbc97ba662..913f7453775166d2bf41047bf73ae7c2e3fec154 100644 (file)
--- a/modules/experimental/NWGNUexample
+++ b/modules/experimental/NWGNUexample
@@ -24,12 +24,10 @@ include $(AP_WORK)\build\NWGNUhead.inc
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/filters/NWGNUcharsetl b/modules/filters/NWGNUcharsetl
index 8e28c2855f5209f31769a6c36b889960bdeed5bf..b4e4f5959ff35a923483c4e18a20204665b06d76 100644 (file)
--- a/modules/filters/NWGNUcharsetl
+++ b/modules/filters/NWGNUcharsetl
@@ -24,12 +24,10 @@ include $(AP_WORK)\build\NWGNUhead.inc
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/filters/NWGNUdeflate b/modules/filters/NWGNUdeflate
index 635746d676dd4f94b30e70c4c30fc43dee7894a7..03138e3561a4d2bfc43e99393d6ee39f10758708 100644 (file)
--- a/modules/filters/NWGNUdeflate
+++ b/modules/filters/NWGNUdeflate
@@ -27,12 +27,10 @@ include $(AP_WORK)\build\NWGNUhead.inc
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/filters/NWGNUextfiltr b/modules/filters/NWGNUextfiltr
index c517f698118af0a20e889d69b0c7414683697539..6c9d5c15ea90593ff30be7818f8b4935100f6469 100644 (file)
--- a/modules/filters/NWGNUextfiltr
+++ b/modules/filters/NWGNUextfiltr
@@ -16,12 +16,10 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/filters/NWGNUmod_filter b/modules/filters/NWGNUmod_filter
index 386960557ba6b634bf4d8edbf2adb02eae0cda4f..9d46586fb33037eda89f8792e54bd38aaa43e172 100644 (file)
--- a/modules/filters/NWGNUmod_filter
+++ b/modules/filters/NWGNUmod_filter
@@ -16,12 +16,10 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/filters/NWGNUreqtimeout b/modules/filters/NWGNUreqtimeout
index bb682fa1dfb1a578ddc1000316dd9031dcbb76b2..f48540ba4433486b96f5a3e8124c1bc51597e81d 100644 (file)
--- a/modules/filters/NWGNUreqtimeout
+++ b/modules/filters/NWGNUreqtimeout
@@ -24,12 +24,10 @@ include $(AP_WORK)\build\NWGNUhead.inc
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/filters/NWGNUsubstitute b/modules/filters/NWGNUsubstitute
index ca19eb11632bc46163dd08d583c9d043713dab95..6c0d0db422680c2eb57ccedeb951eb70af5ddb75 100644 (file)
--- a/modules/filters/NWGNUsubstitute
+++ b/modules/filters/NWGNUsubstitute
@@ -24,12 +24,10 @@ include $(AP_WORK)\build\NWGNUhead.inc
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/generators/NWGNUautoindex b/modules/generators/NWGNUautoindex
index cc9619a626f8db1c2a84797dab51b16fdc8b46f1..69a59eda20dab7a94cbf5cc40abed0a928d996a4 100644 (file)
--- a/modules/generators/NWGNUautoindex
+++ b/modules/generators/NWGNUautoindex
@@ -16,13 +16,11 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/modules/http \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
+                       $(HTTPD) \
                        $(EOLIST)
 
 #

diff --git a/modules/generators/NWGNUinfo b/modules/generators/NWGNUinfo
index e718539f0892edf0dd68ebcd9fb1beb0d31663fe..737af629eda1f3141df461821102da3566e8d1b9 100644 (file)
--- a/modules/generators/NWGNUinfo
+++ b/modules/generators/NWGNUinfo
@@ -16,12 +16,10 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/generators/NWGNUmod_asis b/modules/generators/NWGNUmod_asis
index 62ce6eedb79135b090487aa7694f6d53d2390061..51778f15eec40771c4439634de4ddef71095d20f 100644 (file)
--- a/modules/generators/NWGNUmod_asis
+++ b/modules/generators/NWGNUmod_asis
@@ -16,13 +16,11 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/modules/http \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
+                       $(HTTPD) \
                        $(EOLIST)
 
 #

diff --git a/modules/generators/NWGNUmod_cgi b/modules/generators/NWGNUmod_cgi
index 70d62558aa7e063094a448e68bda2e2925ba5ea2..3463e636bd743677d952ad676866a63969524a51 100644 (file)
--- a/modules/generators/NWGNUmod_cgi
+++ b/modules/generators/NWGNUmod_cgi
@@ -16,14 +16,12 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/modules/http \
-                       $(AP_WORK)/modules/filters \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
+                       $(HTTPD) \
+                       $(STDMOD)/filters \
                        $(EOLIST)
 
 #

diff --git a/modules/generators/NWGNUstatus b/modules/generators/NWGNUstatus
index e161e4387f04ecf1bc082bd034d2f0f910c1e22e..e7519ac9b415bb55ab446dd40b19395516c9f2e7 100644 (file)
--- a/modules/generators/NWGNUstatus
+++ b/modules/generators/NWGNUstatus
@@ -16,12 +16,10 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/ldap/NWGNUmakefile b/modules/ldap/NWGNUmakefile
index ad7956e661529e18be529ce0b58a90762e74d2b7..e3adacdae12c42f6b6dff44f79d16a45825b952b 100644 (file)
--- a/modules/ldap/NWGNUmakefile
+++ b/modules/ldap/NWGNUmakefile
@@ -16,11 +16,10 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
                        $(LDAPSDK)/inc \
                        $(EOLIST)
 

diff --git a/modules/loggers/NWGNUforensic b/modules/loggers/NWGNUforensic
index 18851819f36b250b2c24a33941d795f545e3ef02..eda7f83e47e600b8cbbbaae33b7b4850689fea03 100644 (file)
--- a/modules/loggers/NWGNUforensic
+++ b/modules/loggers/NWGNUforensic
@@ -24,12 +24,10 @@ include $(AP_WORK)\build\NWGNUhead.inc
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/loggers/NWGNUmodlogio b/modules/loggers/NWGNUmodlogio
index 80ac8041568933378b7b0b542845d8c0174f17d0..4588c824a903fcfeec90bcc6f4febc2fe607a5f7 100644 (file)
--- a/modules/loggers/NWGNUmodlogio
+++ b/modules/loggers/NWGNUmodlogio
@@ -24,12 +24,10 @@ include $(AP_WORK)\build\NWGNUhead.inc
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/mappers/NWGNUactions b/modules/mappers/NWGNUactions
index 6594ad62c64bd603ade174e49058f676bf6af650..7e0e4f61d461f4e79d78e4853edc5ef0a2e55b56 100644 (file)
--- a/modules/mappers/NWGNUactions
+++ b/modules/mappers/NWGNUactions
@@ -16,12 +16,10 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/mappers/NWGNUimagemap b/modules/mappers/NWGNUimagemap
index 087b490ca99ac4107d350b496b71e8a4bee8422e..b5d4cebb20b99423acfca037c2f548c16a022d16 100644 (file)
--- a/modules/mappers/NWGNUimagemap
+++ b/modules/mappers/NWGNUimagemap
@@ -16,13 +16,11 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/modules/http \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
+                       $(HTTPD) \
                        $(EOLIST)
 
 #

diff --git a/modules/mappers/NWGNUrewrite b/modules/mappers/NWGNUrewrite
index e3c378f114051f3fa3dc4172644ff391d1406b17..abccf0091de0216dfa8ba17c1b3fccba62e59c5b 100644 (file)
--- a/modules/mappers/NWGNUrewrite
+++ b/modules/mappers/NWGNUrewrite
@@ -16,13 +16,11 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/modules/ssl \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
+                       $(STDMOD)/ssl \
                        $(EOLIST)
 
 #

diff --git a/modules/mappers/NWGNUspeling b/modules/mappers/NWGNUspeling
index da1638ba6b22fefc783efcbadedc64b95a37cbe2..6a045bdc4fa73fe01907c9f7d179f6847d5770a0 100644 (file)
--- a/modules/mappers/NWGNUspeling
+++ b/modules/mappers/NWGNUspeling
@@ -16,12 +16,10 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/mappers/NWGNUuserdir b/modules/mappers/NWGNUuserdir
index 7f5ef0201658785775a2ffcd2c727a5e557d08bb..f8fdfc68d08aa0491b5c0134c3d1bdf542de4897 100644 (file)
--- a/modules/mappers/NWGNUuserdir
+++ b/modules/mappers/NWGNUuserdir
@@ -16,13 +16,11 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/modules/http \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
+                       $(HTTPD) \
                        $(EOLIST)
 
 #

diff --git a/modules/mappers/NWGNUvhost b/modules/mappers/NWGNUvhost
index a2f7eff2acab6b9f116d1de3c1e2af390ae998b3..54f2bc068fc65e35e9f6717109c626f1cc2d93bb 100644 (file)
--- a/modules/mappers/NWGNUvhost
+++ b/modules/mappers/NWGNUvhost
@@ -16,12 +16,10 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/metadata/NWGNUcernmeta b/modules/metadata/NWGNUcernmeta
index f7d65cbfbe1f5d8f7888d0e4e7708c144f22716b..dc529fd474a03d41f745c4918c58f03723485dff 100644 (file)
--- a/modules/metadata/NWGNUcernmeta
+++ b/modules/metadata/NWGNUcernmeta
@@ -16,12 +16,10 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/metadata/NWGNUexpires b/modules/metadata/NWGNUexpires
index e6c9a715d2c4afb76c5c29da0bde9d3c4b95a6ca..c3229d2b200a6f838c212cea8d1caebe9fbf0501 100644 (file)
--- a/modules/metadata/NWGNUexpires
+++ b/modules/metadata/NWGNUexpires
@@ -16,12 +16,10 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/metadata/NWGNUheaders b/modules/metadata/NWGNUheaders
index d68f2967e06fab70bb96fdc70984bc636937200a..10155967147a65239cb9ccd878907b6fec875800 100644 (file)
--- a/modules/metadata/NWGNUheaders
+++ b/modules/metadata/NWGNUheaders
@@ -16,13 +16,11 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/modules/ssl \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
+                       $(STDMOD)/ssl \
                        $(EOLIST)
 
 #

diff --git a/modules/metadata/NWGNUmimemagi b/modules/metadata/NWGNUmimemagi
index e7c6daadaa33f2455e8f1c962a5e3429e9d6c253..04d92dfe7fb0ff58c98df6737afb952a98be5462 100644 (file)
--- a/modules/metadata/NWGNUmimemagi
+++ b/modules/metadata/NWGNUmimemagi
@@ -16,12 +16,10 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/metadata/NWGNUmodident b/modules/metadata/NWGNUmodident
index dc7ef4089e393d0179f933161c20748c4d8fd567..42313e74058477cd82ef84a418b4eb769006ecf0 100644 (file)
--- a/modules/metadata/NWGNUmodident
+++ b/modules/metadata/NWGNUmodident
@@ -16,12 +16,10 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/metadata/NWGNUmodversion b/modules/metadata/NWGNUmodversion
index eab2d11e3941216122b199d6da537c98d5687e5d..e2a4adfe20400e7d34fa313e622b24c7648b5b64 100644 (file)
--- a/modules/metadata/NWGNUmodversion
+++ b/modules/metadata/NWGNUmodversion
@@ -16,12 +16,10 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/metadata/NWGNUuniqueid b/modules/metadata/NWGNUuniqueid
index 0e4058c26fcd631b330d8acb6f772ec57e20978a..2c31a903f6cde7c753fb894f35fdcab9acfd156c 100644 (file)
--- a/modules/metadata/NWGNUuniqueid
+++ b/modules/metadata/NWGNUuniqueid
@@ -16,12 +16,10 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/metadata/NWGNUusertrk b/modules/metadata/NWGNUusertrk
index 450bf652b510c421270c77c4d8613ee955a757d1..083d0b69634a6fe99ecc2571fb05d9eec54fe3ae 100644 (file)
--- a/modules/metadata/NWGNUusertrk
+++ b/modules/metadata/NWGNUusertrk
@@ -16,12 +16,10 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/proxy/NWGNUproxy b/modules/proxy/NWGNUproxy
index 4d3beee40fa0af6ca847358e1dfd2c1ac6dc2928..98d792751bf9eab22bb6d62f374ea99e1ed48d77 100644 (file)
--- a/modules/proxy/NWGNUproxy
+++ b/modules/proxy/NWGNUproxy
@@ -16,15 +16,13 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/http \
-                       $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/modules/ssl \
-                       $(AP_WORK)/modules/generators \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
+                       $(HTTPD) \
+                       $(STDMOD)/generators \
+                       $(STDMOD)/ssl \
                        $(EOLIST)
 
 #

diff --git a/modules/proxy/NWGNUproxyajp b/modules/proxy/NWGNUproxyajp
index 446549f81c041e0da9af5daa834ed6b1800faf03..74a7cbfbe4ed73551d9271eee21be0542b3fe96e 100644 (file)
--- a/modules/proxy/NWGNUproxyajp
+++ b/modules/proxy/NWGNUproxyajp
@@ -16,13 +16,11 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/http \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
+                       $(HTTPD) \
                        $(EOLIST)
 
 #

diff --git a/modules/proxy/NWGNUproxybalancer b/modules/proxy/NWGNUproxybalancer
index 7dc04b8ea39f17459e838776c5dd0724c062b7b3..147fc07a217b08c374fd8c62226938234995ee13 100644 (file)
--- a/modules/proxy/NWGNUproxybalancer
+++ b/modules/proxy/NWGNUproxybalancer
@@ -16,13 +16,11 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/http \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
+                       $(HTTPD) \
                        $(EOLIST)
 
 #

diff --git a/modules/proxy/NWGNUproxycon b/modules/proxy/NWGNUproxycon
index 4ce871cf34230e8bb34f3c8bf719a71eb12f85f1..84353496e00c41ce3ff61501603dd7f0496b570a 100644 (file)
--- a/modules/proxy/NWGNUproxycon
+++ b/modules/proxy/NWGNUproxycon
@@ -16,13 +16,11 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/http \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
+                       $(HTTPD) \
                        $(EOLIST)
 
 #

diff --git a/modules/proxy/NWGNUproxyftp b/modules/proxy/NWGNUproxyftp
index 653d9d7b1e7d85d911683c278c6a1f1814ae8ba1..4add9b0ac4d1896afc9aa0e837bb451fa8fe24d4 100644 (file)
--- a/modules/proxy/NWGNUproxyftp
+++ b/modules/proxy/NWGNUproxyftp
@@ -16,13 +16,11 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/http \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
+                       $(HTTPD) \
                        $(EOLIST)
 
 #

diff --git a/modules/proxy/NWGNUproxyhtp b/modules/proxy/NWGNUproxyhtp
index 21debea1cf91c8e6642a19d492efa50dae589cab..94b3865497b4979c08bfcc4b012a0f90bdf2572f 100644 (file)
--- a/modules/proxy/NWGNUproxyhtp
+++ b/modules/proxy/NWGNUproxyhtp
@@ -16,13 +16,11 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/http \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
+                       $(HTTPD) \
                        $(EOLIST)
 
 #

diff --git a/modules/proxy/NWGNUproxyscgi b/modules/proxy/NWGNUproxyscgi
index 4c51621f5b3c7ac6d0b4d7760a62455ad1970b63..34f306ff23fc8940d8c367e1ae2dec265c4b5f76 100644 (file)
--- a/modules/proxy/NWGNUproxyscgi
+++ b/modules/proxy/NWGNUproxyscgi
@@ -16,13 +16,11 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/http \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
+                       $(HTTPD) \
                        $(EOLIST)
 
 #

diff --git a/modules/ssl/NWGNUmakefile b/modules/ssl/NWGNUmakefile
index 6d2b838d79b2f884aa5f594178a31e43af31a5a2..7a8821957a6402011ede787288f5c24ddebffca1 100644 (file)
--- a/modules/ssl/NWGNUmakefile
+++ b/modules/ssl/NWGNUmakefile
@@ -32,16 +32,14 @@ OSSLAPP = $(OSSLSDK)/apps
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(OSSLINC) \
-                       $(OSSLINC)/openssl \
-                       $(AP_WORK)/include \
-                       $(AP_WORK)/server/mpm/NetWare \
-                       $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/modules/generators \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
                        $(NWOS) \
+                       $(STDMOD)/generators \
+                       $(SERVER)/mpm/NetWare \
+                       $(OSSLINC) \
+                       $(OSSLINC)/openssl \
                        $(EOLIST)
 
 #

diff --git a/srclib/pcre/NWGNUmakefile b/srclib/pcre/NWGNUmakefile
index c3ad458db1074b569954c48e2370645dfa761eb2..dbf54437cd0c1d7316311ba0749f103127c6f2d7 100644 (file)
--- a/srclib/pcre/NWGNUmakefile
+++ b/srclib/pcre/NWGNUmakefile
@@ -36,7 +36,7 @@ $(PCRE)/%.h: $(subst /,\,$(PCRE))\%.hw
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/os/netware \
+                       $(NWOS) \
                        $(APR)/include/arch/netware \
                        $(EOLIST)