NetWare build tweaks.

Make more use of internal makefile macros;
axed now obsolete include paths.
Submitted by: normw gknw net.

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

diff --git a/NWGNUmakefile b/NWGNUmakefile
index 0ceff3eea5dcea21e78825b8aef654955376b198..7c3b5aaa296af02e131af2d16413958e70f505c5 100644 (file)
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -62,18 +62,10 @@ XINCDIRS    += \
                        $(APR)/include \
                        $(APRUTIL)/include \
                        $(SRC)/include \
-                       $(STDMOD)/aaa \
                        $(STDMOD)/core \
                        $(STDMOD)/filters \
                        $(STDMOD)/generators \
-                       $(STDMOD)/http \
-                       $(STDMOD)/loggers \
-                       $(STDMOD)/mappers \
                        $(STDMOD)/proxy \
-                       $(STDMOD)/ssl \
-                       $(SERVER) \
-                       $(SERVER)/mpm/netware \
-                       $(PCRE) \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/aaa/NWGNUaccesscompat b/modules/aaa/NWGNUaccesscompat
index bfa7b2010517e14375d1414fdb19e0fb13c2dc05..24b129652d1d8f0f7ff021f13d409516b6d7c740 100644 (file)
--- a/modules/aaa/NWGNUaccesscompat
+++ b/modules/aaa/NWGNUaccesscompat
@@ -18,7 +18,7 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/aaa/NWGNUallowmethods b/modules/aaa/NWGNUallowmethods
index c2373f574b12d6f6b136ed8a17c880b5f04d7ff1..aef151ba87656f0f1a8c818671cda35043445549 100644 (file)
--- a/modules/aaa/NWGNUallowmethods
+++ b/modules/aaa/NWGNUallowmethods
@@ -18,7 +18,7 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/aaa/NWGNUauthbasc b/modules/aaa/NWGNUauthbasc
index 1f434640bbbc31b7599cb14a71af07ce1a077a41..16fe37f71048223551138675316a9257b3b51bc9 100644 (file)
--- a/modules/aaa/NWGNUauthbasc
+++ b/modules/aaa/NWGNUauthbasc
@@ -18,7 +18,7 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/aaa/NWGNUauthdigt b/modules/aaa/NWGNUauthdigt
index 39738f219963c5cf5943e53eb1a79c4d0a1b00db..0450bdf8ca4adc74f3b87e778d1a9ba3cf86963f 100644 (file)
--- a/modules/aaa/NWGNUauthdigt
+++ b/modules/aaa/NWGNUauthdigt
@@ -18,7 +18,7 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/aaa/NWGNUauthform b/modules/aaa/NWGNUauthform
index 5b42ab50c4495ce1a8d524b0e6d776f356f5b206..28239b7e5318a86cab4efca573f609bfc4bd6637 100644 (file)
--- a/modules/aaa/NWGNUauthform
+++ b/modules/aaa/NWGNUauthform
@@ -18,7 +18,7 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(STDMOD)/session \
                        $(STDMOD)/filters \

diff --git a/modules/aaa/NWGNUauthnano b/modules/aaa/NWGNUauthnano
index b115314d8bfed5e92e2e0d4753bafda33f1c6916..0618223fd0ed221cabf59e1ea5ff576ea8818e67 100644 (file)
--- a/modules/aaa/NWGNUauthnano
+++ b/modules/aaa/NWGNUauthnano
@@ -18,7 +18,7 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/aaa/NWGNUauthndbd b/modules/aaa/NWGNUauthndbd
index 151bc1c2d08b45d9bd55adc5ee9b6f97f8dc31ef..859c034aa6421d1d90d4d611d26c1187022d8cc1 100644 (file)
--- a/modules/aaa/NWGNUauthndbd
+++ b/modules/aaa/NWGNUauthndbd
@@ -18,9 +18,9 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
-                       $(AP_WORK)/modules/database \
+                       $(STDMOD)/database \
                        $(EOLIST)
 
 #

diff --git a/modules/aaa/NWGNUauthndbm b/modules/aaa/NWGNUauthndbm
index 1f9880e9aabb45a9916964862486db95834bf11d..1c1a1153dddd7f0acd6b2108758c3bc6a6b0e918 100644 (file)
--- a/modules/aaa/NWGNUauthndbm
+++ b/modules/aaa/NWGNUauthndbm
@@ -18,7 +18,7 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/aaa/NWGNUauthnfil b/modules/aaa/NWGNUauthnfil
index cfab287697158bfe31d72691dbc41d64ff8f674e..acd6981f0f89f4eff17690005901f3748514eaf8 100644 (file)
--- a/modules/aaa/NWGNUauthnfil
+++ b/modules/aaa/NWGNUauthnfil
@@ -18,7 +18,7 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/aaa/NWGNUauthnsocache b/modules/aaa/NWGNUauthnsocache
index 8d1b347e266c28c9be43625ac645f0efed747d81..df8150c53aa0b3e03b20655822fe4a24fdd42da0 100644 (file)
--- a/modules/aaa/NWGNUauthnsocache
+++ b/modules/aaa/NWGNUauthnsocache
@@ -18,7 +18,7 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/aaa/NWGNUauthnzldap b/modules/aaa/NWGNUauthnzldap
index bfe21dbedef296dbe19b2fafd4ce0df18423b353..473640de0dc8dbaf630a3bfdf0e85c93b8c1d1d8 100644 (file)
--- a/modules/aaa/NWGNUauthnzldap
+++ b/modules/aaa/NWGNUauthnzldap
@@ -18,7 +18,7 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/aaa/NWGNUauthzdbd b/modules/aaa/NWGNUauthzdbd
index 3ea2ba72ba49bce85ba35b0b229fea068a9579c7..65c3bf7f0a46dd85b3d0173e0dc892c885b9b566 100644 (file)
--- a/modules/aaa/NWGNUauthzdbd
+++ b/modules/aaa/NWGNUauthzdbd
@@ -18,7 +18,7 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(STDMOD)/database \
                        $(EOLIST)

diff --git a/modules/aaa/NWGNUauthzdbm b/modules/aaa/NWGNUauthzdbm
index 3d0ed8f57bcf5440e80713e2b270c5a1bfc76924..dd987ba4d174a1fc0e1c1902fc8ac7ea1cd536bc 100644 (file)
--- a/modules/aaa/NWGNUauthzdbm
+++ b/modules/aaa/NWGNUauthzdbm
@@ -18,7 +18,7 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/aaa/NWGNUauthzgrp b/modules/aaa/NWGNUauthzgrp
index 4a8df2cb9b40ee09e9758cabec7b02818e2fab89..6e6e8ea13c04fd7e105e23f4aa016d2b685913e9 100644 (file)
--- a/modules/aaa/NWGNUauthzgrp
+++ b/modules/aaa/NWGNUauthzgrp
@@ -18,7 +18,7 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/aaa/NWGNUauthzusr b/modules/aaa/NWGNUauthzusr
index aa790538ad42e4613deb046b526cf432ccfa3ece..c878133e1b614d01e3fa00a1beabb50562afd126 100644 (file)
--- a/modules/aaa/NWGNUauthzusr
+++ b/modules/aaa/NWGNUauthzusr
@@ -18,7 +18,7 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/apreq/NWGNUmakefile b/modules/apreq/NWGNUmakefile
index 0e46e3c4acf1406efb01d2d93edae71099d5df4f..8a0cc00d6bc8e13511818a7194cb45e8dd180734 100644 (file)
--- a/modules/apreq/NWGNUmakefile
+++ b/modules/apreq/NWGNUmakefile
@@ -18,7 +18,7 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/cache/NWGNUcach_dsk b/modules/cache/NWGNUcach_dsk
index 1c45f344f0a1b2888677dceba671c6574ecf1b72..e75b4ee3d6030c04abe1c432dc1a751345c09d9e 100644 (file)
--- a/modules/cache/NWGNUcach_dsk
+++ b/modules/cache/NWGNUcach_dsk
@@ -25,8 +25,8 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
-                       $(AP_WORK)/server/mpm/netware \
+                       $(SRC)/include \
+                       $(SERVER)/mpm/netware \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/cache/NWGNUmod_cach b/modules/cache/NWGNUmod_cach
index b17b6b69b3b683232611667fcd77535e883c9c15..4da6fed216c950b155cd21a9cf78d5fa99786ef7 100644 (file)
--- a/modules/cache/NWGNUmod_cach
+++ b/modules/cache/NWGNUmod_cach
@@ -25,8 +25,8 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
-                       $(AP_WORK)/server/mpm/netware \
+                       $(SRC)/include \
+                       $(SERVER)/mpm/netware \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/cache/NWGNUsocachdbm b/modules/cache/NWGNUsocachdbm
index dc06af7df91433fe66ebc29ec308c69d488e5ebf..3213e36448fecac6bdd8984501c37ceaac2971e5 100644 (file)
--- a/modules/cache/NWGNUsocachdbm
+++ b/modules/cache/NWGNUsocachdbm
@@ -25,8 +25,8 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
-                       $(AP_WORK)/server/mpm/netware \
+                       $(SRC)/include \
+                       $(SERVER)/mpm/netware \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/cache/NWGNUsocachmem b/modules/cache/NWGNUsocachmem
index d8d10d8a34506f0a30c6c20eac858bc4376696db..5a032f62fe37964722420704b2997deb9ff21dcc 100644 (file)
--- a/modules/cache/NWGNUsocachmem
+++ b/modules/cache/NWGNUsocachmem
@@ -25,8 +25,8 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
-                       $(AP_WORK)/server/mpm/netware \
+                       $(SRC)/include \
+                       $(SERVER)/mpm/netware \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/cache/NWGNUsocachshmcb b/modules/cache/NWGNUsocachshmcb
index 8f11c4b648d91272fd425f883cd104f357ea5a0d..02f6cab83fd3898e095a353155f64ef3bb258203 100644 (file)
--- a/modules/cache/NWGNUsocachshmcb
+++ b/modules/cache/NWGNUsocachshmcb
@@ -25,8 +25,8 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
-                       $(AP_WORK)/server/mpm/netware \
+                       $(SRC)/include \
+                       $(SERVER)/mpm/netware \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/cluster/NWGNUmodheartbeat b/modules/cluster/NWGNUmodheartbeat
index b2c3ece2192ac33c09d4131750ecebabe309fef4..bbabe566e359c7a03f2e8aec77b9f42259793436 100644 (file)
--- a/modules/cluster/NWGNUmodheartbeat
+++ b/modules/cluster/NWGNUmodheartbeat
@@ -26,8 +26,8 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
-                       $(AP_WORK)/modules/core \
+                       $(SRC)/include \
+                       $(STDMOD)/core \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/cluster/NWGNUmodheartmonitor b/modules/cluster/NWGNUmodheartmonitor
index 2436b277fdee649c2a72ddf9f951e695d6a4e8bb..59fae081156de32aef807da1895900d9ca29226b 100644 (file)
--- a/modules/cluster/NWGNUmodheartmonitor
+++ b/modules/cluster/NWGNUmodheartmonitor
@@ -26,8 +26,8 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
-                       $(AP_WORK)/modules/core \
+                       $(SRC)/include \
+                       $(STDMOD)/core \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/database/NWGNUmakefile b/modules/database/NWGNUmakefile
index 7a96c04e83c2680ca60104973697e3b0579f4128..c5a3f206a05c395072388bed6806053afb9cc270 100644 (file)
--- a/modules/database/NWGNUmakefile
+++ b/modules/database/NWGNUmakefile
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/dav/fs/NWGNUmakefile b/modules/dav/fs/NWGNUmakefile
index e402428781577bbde51857d518e53c7bcdf9b71c..9f609dbf2928ede637115b47e8c9a91aa70c1c88 100644 (file)
--- a/modules/dav/fs/NWGNUmakefile
+++ b/modules/dav/fs/NWGNUmakefile
@@ -26,9 +26,9 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
-                       $(AP_WORK)/server/mpm/netware \
-                       $(AP_WORK)/modules/dav/main \
+                       $(SRC)/include \
+                       $(SERVER)/mpm/netware \
+                       $(STDMOD)/dav/main \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/dav/lock/NWGNUmakefile b/modules/dav/lock/NWGNUmakefile
index b515d272c5bc59dbb22ef3ab90e0a3c15df4b92b..28e6c953ad70d301afbacec2326ef39d9ee710da 100644 (file)
--- a/modules/dav/lock/NWGNUmakefile
+++ b/modules/dav/lock/NWGNUmakefile
@@ -26,9 +26,9 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
-                       $(AP_WORK)/server/mpm/netware \
-                       $(AP_WORK)/modules/dav/main \
+                       $(SRC)/include \
+                       $(SERVER)/mpm/netware \
+                       $(STDMOD)/dav/main \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/dav/main/NWGNUmakefile b/modules/dav/main/NWGNUmakefile
index bc94a2215b425a6a127317427be908829fe143cf..a5b28c92c5330bfc1e6dad67cd8a2f448e3766f5 100644 (file)
--- a/modules/dav/main/NWGNUmakefile
+++ b/modules/dav/main/NWGNUmakefile
@@ -25,8 +25,8 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
-                       $(AP_WORK)/server/mpm/netware \
+                       $(SRC)/include \
+                       $(SERVER)/mpm/netware \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/debugging/NWGNUmodbucketeer b/modules/debugging/NWGNUmodbucketeer
index 22a2d1101ed6cd73e19be904deb62da41f511516..788cd7ceac72a6139f680b17a1b67e61505754ab 100644 (file)
--- a/modules/debugging/NWGNUmodbucketeer
+++ b/modules/debugging/NWGNUmodbucketeer
@@ -18,7 +18,7 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/debugging/NWGNUmoddumpio b/modules/debugging/NWGNUmoddumpio
index b09fa05c8697ca920e9b7345702ec793dc0262f2..50ac42239c67b9ffba15a39c8927d09ecf98eb92 100644 (file)
--- a/modules/debugging/NWGNUmoddumpio
+++ b/modules/debugging/NWGNUmoddumpio
@@ -18,7 +18,7 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/debugging/NWGNUmodfirehose b/modules/debugging/NWGNUmodfirehose
index 585fd4c1a2200eb6850565be66082fa284e89510..962b6730f1b04542ccc265d8d80888bbe937ea2e 100644 (file)
--- a/modules/debugging/NWGNUmodfirehose
+++ b/modules/debugging/NWGNUmodfirehose
@@ -18,7 +18,7 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(STDMOD)/proxy \
                        $(NWOS) \
                        $(EOLIST)

diff --git a/modules/echo/NWGNUmakefile b/modules/echo/NWGNUmakefile
index 7add53d6371d7aca1b1b28215d0f89b9e010413f..6fbb1836b5fbee5225567c2db312aeceb96acb27 100644 (file)
--- a/modules/echo/NWGNUmakefile
+++ b/modules/echo/NWGNUmakefile
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/examples/NWGNUcase_flt b/modules/examples/NWGNUcase_flt
index df9a86f49892d09546f8c61a4a0f52dfc4ffcb1e..469fd0f611ca4489f262c23f213fbf7bef6c8dd2 100644 (file)
--- a/modules/examples/NWGNUcase_flt
+++ b/modules/examples/NWGNUcase_flt
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/examples/NWGNUcase_flt_in b/modules/examples/NWGNUcase_flt_in
index 7429a44a03d71b7f5bad4fee90dde238c72271fb..3e7b85bf3f659ca84af50e9441a356da3401bf1c 100644 (file)
--- a/modules/examples/NWGNUcase_flt_in
+++ b/modules/examples/NWGNUcase_flt_in
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/examples/NWGNUexample_hooks b/modules/examples/NWGNUexample_hooks
index 06bc16ad056a7100362d6c0796ebd9ee802b4f2f..6888f3057eabedfedb9606445bec7e54d2617660 100644 (file)
--- a/modules/examples/NWGNUexample_hooks
+++ b/modules/examples/NWGNUexample_hooks
@@ -26,8 +26,8 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
-                       $(AP_WORK)/server/mpm/netware \
+                       $(SRC)/include \
+                       $(SERVER)/mpm/netware \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/examples/NWGNUexample_ipc b/modules/examples/NWGNUexample_ipc
index 605794b2a4a81619e3e1cd5625a8e9c382a90d46..45fc48c2fe71294aa32d1856116cc4bd989f6f22 100644 (file)
--- a/modules/examples/NWGNUexample_ipc
+++ b/modules/examples/NWGNUexample_ipc
@@ -26,8 +26,8 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
-                       $(AP_WORK)/server/mpm/netware \
+                       $(SRC)/include \
+                       $(SERVER)/mpm/netware \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/experimental/NWGNUnoloris b/modules/experimental/NWGNUnoloris
index d1a9a96c04636a62490a5ff1f8100cef24cee1b5..5f3af566d2e08a9b43ba99036c94e01d799d5cce 100644 (file)
--- a/modules/experimental/NWGNUnoloris
+++ b/modules/experimental/NWGNUnoloris
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/filters/NWGNUcharsetl b/modules/filters/NWGNUcharsetl
index 99326354d66be61e7a408c5537c587401585e944..c0ef69e3721e91c7b7a9fcbbe143dc7e5ec2751d 100644 (file)
--- a/modules/filters/NWGNUcharsetl
+++ b/modules/filters/NWGNUcharsetl
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/filters/NWGNUdeflate b/modules/filters/NWGNUdeflate
index 7f7204d13e76f63605293f5e5eb64fec66323067..3d72a00b722eb0df2d4bc3e67b068809d1503251 100644 (file)
--- a/modules/filters/NWGNUdeflate
+++ b/modules/filters/NWGNUdeflate
@@ -29,7 +29,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(STDMOD)/ssl \
                        $(NWOS) \
                        $(EOLIST)

diff --git a/modules/filters/NWGNUextfiltr b/modules/filters/NWGNUextfiltr
index 1fd57cb00c8abd75df84862279c5e53ba5cc7c33..d138148120f06cbb80bc1fafd8d2c24d76613392 100644 (file)
--- a/modules/filters/NWGNUextfiltr
+++ b/modules/filters/NWGNUextfiltr
@@ -18,7 +18,7 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/filters/NWGNUmod_data b/modules/filters/NWGNUmod_data
index 7f46e9aaf7469e4d9c0ef0fbf212870a6522f942..98ea0017f633f530ae6b5d5da821ab9c432a2519 100644 (file)
--- a/modules/filters/NWGNUmod_data
+++ b/modules/filters/NWGNUmod_data
@@ -18,7 +18,7 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/filters/NWGNUmod_filter b/modules/filters/NWGNUmod_filter
index bf323ee753b4710517ddab66c0c1744e0169a64d..b8b2b3cfb6a8a242df6a600c3bd442a707cc95a2 100644 (file)
--- a/modules/filters/NWGNUmod_filter
+++ b/modules/filters/NWGNUmod_filter
@@ -18,7 +18,7 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/filters/NWGNUmod_request b/modules/filters/NWGNUmod_request
index 21f53cc140cd937f17e648c0cc69d3a1a7e1dd48..83274ac8074f7b0a1d6f9d431d2cd0c23e75bf4f 100644 (file)
--- a/modules/filters/NWGNUmod_request
+++ b/modules/filters/NWGNUmod_request
@@ -18,7 +18,7 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/filters/NWGNUmodbuffer b/modules/filters/NWGNUmodbuffer
index 7652a358f401576ba27015a3767b52e2c484b655..9c73a6cb058aa73ee958bf9e88a9ebe0c41e087c 100644 (file)
--- a/modules/filters/NWGNUmodbuffer
+++ b/modules/filters/NWGNUmodbuffer
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/filters/NWGNUmodsed b/modules/filters/NWGNUmodsed
index 158acb9d77c46b907b82beb655aea5aee2f36ac8..351f3f24872365b5b691f02110e1e4548f7e1ca3 100644 (file)
--- a/modules/filters/NWGNUmodsed
+++ b/modules/filters/NWGNUmodsed
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/filters/NWGNUproxyhtml b/modules/filters/NWGNUproxyhtml
index 5337f3b1a989cd151db73fe51fca39da3beec7e6..3976fbdd10f0dd3faedd892ed353d1cc400ea3f1 100644 (file)
--- a/modules/filters/NWGNUproxyhtml
+++ b/modules/filters/NWGNUproxyhtml
@@ -19,8 +19,8 @@ XINCDIRS      += \
                        $(LIBXML2SDK)/include \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
-                       $(AP_WORK)/modules/http \
+                       $(SRC)/include \
+                       $(STDMOD)/http \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/filters/NWGNUratelimit b/modules/filters/NWGNUratelimit
index f75c81408dc4ff62c4039494909d7940a43829b9..89e7a64d1d1d9a3216d60b44e63cdc4f4b6101c3 100644 (file)
--- a/modules/filters/NWGNUratelimit
+++ b/modules/filters/NWGNUratelimit
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/filters/NWGNUreflector b/modules/filters/NWGNUreflector
index 67ca26d9de3b528a5dda47db4819b1bff19c6abe..12787116f677b3b47e66b43563b612aefc4f03fe 100644 (file)
--- a/modules/filters/NWGNUreflector
+++ b/modules/filters/NWGNUreflector
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/filters/NWGNUreqtimeout b/modules/filters/NWGNUreqtimeout
index a99f82c4247dcd572cef5e14021783df576dc74e..91e579e2940d764a67862f8c5b2dec31237b4f43 100644 (file)
--- a/modules/filters/NWGNUreqtimeout
+++ b/modules/filters/NWGNUreqtimeout
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/filters/NWGNUsubstitute b/modules/filters/NWGNUsubstitute
index e5775f285dc92d4702f6a2002bb556cf321348b8..898e6a59c3168b7e52c116ca8d43d45aff9ea336 100644 (file)
--- a/modules/filters/NWGNUsubstitute
+++ b/modules/filters/NWGNUsubstitute
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/filters/NWGNUxml2enc b/modules/filters/NWGNUxml2enc
index 117832eb48ce0008ee219aa003a91f3887dc5a90..bfbb5583b865ff1c9f47d24568891082f808bbea 100644 (file)
--- a/modules/filters/NWGNUxml2enc
+++ b/modules/filters/NWGNUxml2enc
@@ -27,7 +27,7 @@ XINCDIRS      += \
                        $(LIBXML2SDK)/include \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/generators/NWGNUautoindex b/modules/generators/NWGNUautoindex
index e8080c365975683f16115462719a61edf00ed24c..514d935db4654ee17c9f021ea38143a18fb4ed14 100644 (file)
--- a/modules/generators/NWGNUautoindex
+++ b/modules/generators/NWGNUautoindex
@@ -18,8 +18,8 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
-                       $(AP_WORK)/modules/http \
+                       $(SRC)/include \
+                       $(STDMOD)/http \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/generators/NWGNUinfo b/modules/generators/NWGNUinfo
index 810db8a2351a4e5c8ee4f55187cc36a2fc771ae8..ae6f902ed8172c1ac2713506e5a63b5f5dd09107 100644 (file)
--- a/modules/generators/NWGNUinfo
+++ b/modules/generators/NWGNUinfo
@@ -18,7 +18,7 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/generators/NWGNUmod_asis b/modules/generators/NWGNUmod_asis
index c7df5ae8e68f1bf0f13a6fd7a3b3159297ca18b2..504e870d515b52bf9d3b2c78c898c3b836c8b9f4 100644 (file)
--- a/modules/generators/NWGNUmod_asis
+++ b/modules/generators/NWGNUmod_asis
@@ -18,8 +18,8 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
-                       $(AP_WORK)/modules/http \
+                       $(SRC)/include \
+                       $(STDMOD)/http \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/generators/NWGNUmod_cgi b/modules/generators/NWGNUmod_cgi
index bbb95784b842b43f519f49b2868db6dcb8a66c2a..77683eb6fa3a6bb1d7365f129700da3e92be384d 100644 (file)
--- a/modules/generators/NWGNUmod_cgi
+++ b/modules/generators/NWGNUmod_cgi
@@ -18,9 +18,9 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
-                       $(AP_WORK)/modules/http \
-                       $(AP_WORK)/modules/filters \
+                       $(SRC)/include \
+                       $(STDMOD)/http \
+                       $(STDMOD)/filters \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/generators/NWGNUstatus b/modules/generators/NWGNUstatus
index 1dc850e28aa7b96795594210d9434decdfcbfd83..5fa0a8eb4185eae8916d4883b3fa333e20f6d8ee 100644 (file)
--- a/modules/generators/NWGNUstatus
+++ b/modules/generators/NWGNUstatus
@@ -18,7 +18,7 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/ldap/NWGNUmakefile b/modules/ldap/NWGNUmakefile
index ef830253f3f95eae8798daded2a3401adead8f8f..dd5890ea784d9db1e1685ed68e1659a1d7a6ad00 100644 (file)
--- a/modules/ldap/NWGNUmakefile
+++ b/modules/ldap/NWGNUmakefile
@@ -18,7 +18,7 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(LDAPSDK)/inc \
                        $(EOLIST)

diff --git a/modules/loggers/NWGNUforensic b/modules/loggers/NWGNUforensic
index c55f036cee55353e4f4a239ab1c2f630bb7b0fd7..3882ba089178229e0327999e72915acd3de7a1f1 100644 (file)
--- a/modules/loggers/NWGNUforensic
+++ b/modules/loggers/NWGNUforensic
@@ -26,8 +26,8 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
-                       $(AP_WORK)/modules/http \
+                       $(SRC)/include \
+                       $(STDMOD)/http \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/loggers/NWGNUlogdebug b/modules/loggers/NWGNUlogdebug
index e92839a1e5546e5cae4643256132655686049540..091c6de8d1bc2ea6be5296c43ec8647449b9f8c2 100644 (file)
--- a/modules/loggers/NWGNUlogdebug
+++ b/modules/loggers/NWGNUlogdebug
@@ -26,8 +26,8 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
-                       $(AP_WORK)/modules/http \
+                       $(SRC)/include \
+                       $(STDMOD)/http \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/loggers/NWGNUmodlogio b/modules/loggers/NWGNUmodlogio
index fa376db73adc4594171a555c2c4e370bf22f8247..9fa045264a5d33e857bbcf317140f05b9f037039 100644 (file)
--- a/modules/loggers/NWGNUmodlogio
+++ b/modules/loggers/NWGNUmodlogio
@@ -26,8 +26,8 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
-                       $(AP_WORK)/modules/http \
+                       $(SRC)/include \
+                       $(STDMOD)/http \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/lua/NWGNUmakefile b/modules/lua/NWGNUmakefile
index 36d0a699b489416cd3f35f597a38e2f66df8c1c1..ac962c9e93c49aab9a19e4fce31572e958b8691e 100644 (file)
--- a/modules/lua/NWGNUmakefile
+++ b/modules/lua/NWGNUmakefile
@@ -26,9 +26,9 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
-                       $(AP_WORK)/modules/http \
-                       $(AP_WORK)/modules/ssl \
+                       $(SRC)/include \
+                       $(STDMOD)/http \
+                       $(STDMOD)/ssl \
                        $(NWOS) \
                        $(LUASRC)/src \
                        $(EOLIST)

diff --git a/modules/mappers/NWGNUactions b/modules/mappers/NWGNUactions
index 3a94773cd1a1a150baf94282c1c05e075233f161..8867246251ebf5a86e3767f585ccccb2cdfd5bc6 100644 (file)
--- a/modules/mappers/NWGNUactions
+++ b/modules/mappers/NWGNUactions
@@ -18,7 +18,7 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/mappers/NWGNUimagemap b/modules/mappers/NWGNUimagemap
index 7f6608600cf5eedb42897b487b6e4f914428cb18..ea8b7dff87805524e81f65f471e5b32f6a49c548 100644 (file)
--- a/modules/mappers/NWGNUimagemap
+++ b/modules/mappers/NWGNUimagemap
@@ -18,8 +18,8 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
-                       $(AP_WORK)/modules/http \
+                       $(SRC)/include \
+                       $(STDMOD)/http \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/mappers/NWGNUrewrite b/modules/mappers/NWGNUrewrite
index d16dd8e2bb9e995d3f7b453e36d277a8f45e1eef..d8ff191a2920efb5a405700b7e670105e596d57c 100644 (file)
--- a/modules/mappers/NWGNUrewrite
+++ b/modules/mappers/NWGNUrewrite
@@ -18,9 +18,9 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
-                       $(AP_WORK)/modules/database \
-                       $(AP_WORK)/modules/ssl \
+                       $(SRC)/include \
+                       $(STDMOD)/database \
+                       $(STDMOD)/ssl \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/mappers/NWGNUspeling b/modules/mappers/NWGNUspeling
index 6982988dad0ef8de713f5948455372dda8ff23f6..6d8303416aab23754b0763a604a808bcf0831aee 100644 (file)
--- a/modules/mappers/NWGNUspeling
+++ b/modules/mappers/NWGNUspeling
@@ -18,7 +18,7 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/mappers/NWGNUuserdir b/modules/mappers/NWGNUuserdir
index b0fc7a01ded46e0ea8e67fa55195a56664b73a21..c986e4f86314c4dfcc669162471acdbfab2a6c73 100644 (file)
--- a/modules/mappers/NWGNUuserdir
+++ b/modules/mappers/NWGNUuserdir
@@ -18,8 +18,8 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
-                       $(AP_WORK)/modules/http \
+                       $(SRC)/include \
+                       $(STDMOD)/http \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/mappers/NWGNUvhost b/modules/mappers/NWGNUvhost
index d3b655c698ce6ebc4d8ee31170b923dd04a9f08f..db7b1b3c0404193fb6fa6f08bbc2018df308cae1 100644 (file)
--- a/modules/mappers/NWGNUvhost
+++ b/modules/mappers/NWGNUvhost
@@ -18,8 +18,8 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
-                       $(AP_WORK)/modules/http \
+                       $(SRC)/include \
+                       $(STDMOD)/http \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/metadata/NWGNUcernmeta b/modules/metadata/NWGNUcernmeta
index 64a7cb7a9115acf9577538a10f71d8478410209e..b204e00331dcbcfedbe7ccb5f15afb05223d2a91 100644 (file)
--- a/modules/metadata/NWGNUcernmeta
+++ b/modules/metadata/NWGNUcernmeta
@@ -18,7 +18,7 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/metadata/NWGNUexpires b/modules/metadata/NWGNUexpires
index e9601b0edb1cc20db935406c3befd7dd64b998e2..e80e5d1abad75596e7b03d649bf821534a096e3b 100644 (file)
--- a/modules/metadata/NWGNUexpires
+++ b/modules/metadata/NWGNUexpires
@@ -18,7 +18,7 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/metadata/NWGNUheaders b/modules/metadata/NWGNUheaders
index 77ae60d1b8a737dd14a35607d6471015e48b230a..69464ec1a9657e910f817c97fc53ee15cd197bcf 100644 (file)
--- a/modules/metadata/NWGNUheaders
+++ b/modules/metadata/NWGNUheaders
@@ -18,8 +18,8 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
-                       $(AP_WORK)/modules/ssl \
+                       $(SRC)/include \
+                       $(STDMOD)/ssl \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/metadata/NWGNUmimemagi b/modules/metadata/NWGNUmimemagi
index ae508fffab13dc891c7775d88afe9c865f2a72cc..0e3225ea42a702448a0692c84fbafe34b1ba2b30 100644 (file)
--- a/modules/metadata/NWGNUmimemagi
+++ b/modules/metadata/NWGNUmimemagi
@@ -18,7 +18,7 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/metadata/NWGNUmodident b/modules/metadata/NWGNUmodident
index 8ce871d83261923f6a3f88ca96e71d5d4ed70c36..b8f364fe8bb393859b61ad764b1433b751953a87 100644 (file)
--- a/modules/metadata/NWGNUmodident
+++ b/modules/metadata/NWGNUmodident
@@ -18,7 +18,7 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/metadata/NWGNUmodversion b/modules/metadata/NWGNUmodversion
index 756b57212bae69845bfeaaedad65976f464bc4e9..12a76716239cb2b305fd20421d286c5373831242 100644 (file)
--- a/modules/metadata/NWGNUmodversion
+++ b/modules/metadata/NWGNUmodversion
@@ -18,7 +18,7 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/metadata/NWGNUremoteip b/modules/metadata/NWGNUremoteip
index 8e9ddb5921dc73cf7f61e40ebdf13391ca0a5443..115bbb9f7cc90ba32ff8c0dc53d87fd8ccca901d 100644 (file)
--- a/modules/metadata/NWGNUremoteip
+++ b/modules/metadata/NWGNUremoteip
@@ -18,7 +18,7 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/metadata/NWGNUuniqueid b/modules/metadata/NWGNUuniqueid
index d39a57e1fa5b92284864b1a93e1d2e8e28712ef6..bb72a6bb3d1a1bb501b7b14fe1ee82ed6a36045d 100644 (file)
--- a/modules/metadata/NWGNUuniqueid
+++ b/modules/metadata/NWGNUuniqueid
@@ -18,7 +18,7 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/metadata/NWGNUusertrk b/modules/metadata/NWGNUusertrk
index 1be79de1570556a1c8b283488b95304e87273f84..10c9f2e69e17aa894618c800ce2bb261a56d4511 100644 (file)
--- a/modules/metadata/NWGNUusertrk
+++ b/modules/metadata/NWGNUusertrk
@@ -18,7 +18,7 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/proxy/NWGNUproxy b/modules/proxy/NWGNUproxy
index cade4acbf59e664620b31ef31376cbd8999bd17d..deb5232c340f56d5ae2e63a7d0d13be73e3a7c52 100644 (file)
--- a/modules/proxy/NWGNUproxy
+++ b/modules/proxy/NWGNUproxy
@@ -18,10 +18,10 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
-                       $(AP_WORK)/modules/http \
-                       $(AP_WORK)/modules/generators \
-                       $(AP_WORK)/modules/ssl \
+                       $(SRC)/include \
+                       $(STDMOD)/http \
+                       $(STDMOD)/generators \
+                       $(STDMOD)/ssl \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/proxy/NWGNUproxyajp b/modules/proxy/NWGNUproxyajp
index 0f41248444e8b96973df035bfdfa6fba67638b64..9fc0ef22120a7d68bba8cff40977a6543b9d826a 100644 (file)
--- a/modules/proxy/NWGNUproxyajp
+++ b/modules/proxy/NWGNUproxyajp
@@ -18,8 +18,8 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
-                       $(AP_WORK)/modules/http \
+                       $(SRC)/include \
+                       $(STDMOD)/http \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/proxy/NWGNUproxybalancer b/modules/proxy/NWGNUproxybalancer
index 976fd50c0f0847e29da04ef7ce4a7dc90fc4d766..277dcbd490fefcf8bd94b58867e9e8808d490302 100644 (file)
--- a/modules/proxy/NWGNUproxybalancer
+++ b/modules/proxy/NWGNUproxybalancer
@@ -18,8 +18,8 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
-                       $(AP_WORK)/modules/http \
+                       $(SRC)/include \
+                       $(STDMOD)/http \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/proxy/NWGNUproxycon b/modules/proxy/NWGNUproxycon
index 0215a499dc83f8613937ef35c09708229621e9d5..614293181a34cc18f8218af5e305d1caeb4816a1 100644 (file)
--- a/modules/proxy/NWGNUproxycon
+++ b/modules/proxy/NWGNUproxycon
@@ -18,8 +18,8 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
-                       $(AP_WORK)/modules/http \
+                       $(SRC)/include \
+                       $(STDMOD)/http \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/proxy/NWGNUproxyexpress b/modules/proxy/NWGNUproxyexpress
index 84bb5036a82b76f05a9cb09a7b93c24146b7e4fe..1c34133a8b5cb3fb765cacfa3c326707506c3e0d 100644 (file)
--- a/modules/proxy/NWGNUproxyexpress
+++ b/modules/proxy/NWGNUproxyexpress
@@ -18,8 +18,8 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
-                       $(AP_WORK)/modules/http \
+                       $(SRC)/include \
+                       $(STDMOD)/http \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/proxy/NWGNUproxyfcgi b/modules/proxy/NWGNUproxyfcgi
index a4412225cce2e769580e54489f4662e745b37dcb..a3ecf4cb8599348b4c9213a8846a8311db1201da 100644 (file)
--- a/modules/proxy/NWGNUproxyfcgi
+++ b/modules/proxy/NWGNUproxyfcgi
@@ -18,8 +18,8 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
-                       $(AP_WORK)/modules/http \
+                       $(SRC)/include \
+                       $(STDMOD)/http \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/proxy/NWGNUproxyftp b/modules/proxy/NWGNUproxyftp
index ee7fbf89ec685e55a3ab617d8db13773ef4061c4..27fee00a69d30ece4c1bd6a375d7c89a54c5f210 100644 (file)
--- a/modules/proxy/NWGNUproxyftp
+++ b/modules/proxy/NWGNUproxyftp
@@ -18,8 +18,8 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
-                       $(AP_WORK)/modules/http \
+                       $(SRC)/include \
+                       $(STDMOD)/http \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/proxy/NWGNUproxyhtp b/modules/proxy/NWGNUproxyhtp
index 0257d52a3f6c36d09a686a80ffdcb2d3f9e3bfc3..5c4f8932b3faf0b859d7ceb757e9e73c1a861252 100644 (file)
--- a/modules/proxy/NWGNUproxyhtp
+++ b/modules/proxy/NWGNUproxyhtp
@@ -18,8 +18,8 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
-                       $(AP_WORK)/modules/http \
+                       $(SRC)/include \
+                       $(STDMOD)/http \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/proxy/NWGNUproxylbm_busy b/modules/proxy/NWGNUproxylbm_busy
index c1b91f6b4f0e0e7719605347af33fabb6d879d2e..fff1db75617560a6522943aa8c2ba9e02cc922d0 100644 (file)
--- a/modules/proxy/NWGNUproxylbm_busy
+++ b/modules/proxy/NWGNUproxylbm_busy
@@ -18,9 +18,9 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
-                       $(AP_WORK)/modules/proxy \
-                       $(AP_WORK)/modules/http \
+                       $(SRC)/include \
+                       $(STDMOD)/http \
+                       $(STDMOD)/proxy \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/proxy/NWGNUproxylbm_hb b/modules/proxy/NWGNUproxylbm_hb
index 19563da6df4a9590f8f8145d5184900f42957479..35a7348a2c3e30cdcab57b75e196b4dfd91853ae 100644 (file)
--- a/modules/proxy/NWGNUproxylbm_hb
+++ b/modules/proxy/NWGNUproxylbm_hb
@@ -18,9 +18,9 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
-                       $(AP_WORK)/modules/proxy \
-                       $(AP_WORK)/modules/http \
+                       $(SRC)/include \
+                       $(STDMOD)/http \
+                       $(STDMOD)/proxy \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/proxy/NWGNUproxylbm_req b/modules/proxy/NWGNUproxylbm_req
index 6a2c4cd0fb0cf30c517b06f49417a1effd3d66df..5d41f78a1a9d5c3b87384bb5840fd5708b24afe2 100644 (file)
--- a/modules/proxy/NWGNUproxylbm_req
+++ b/modules/proxy/NWGNUproxylbm_req
@@ -18,9 +18,9 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
-                       $(AP_WORK)/modules/proxy \
-                       $(AP_WORK)/modules/http \
+                       $(SRC)/include \
+                       $(STDMOD)/http \
+                       $(STDMOD)/proxy \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/proxy/NWGNUproxylbm_traf b/modules/proxy/NWGNUproxylbm_traf
index 1927d6263c1749c44f34b64065863faa9ccb0cf8..61b14c096056f9a9d314fce59dd1b2d08e7c1a05 100644 (file)
--- a/modules/proxy/NWGNUproxylbm_traf
+++ b/modules/proxy/NWGNUproxylbm_traf
@@ -18,9 +18,9 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
-                       $(AP_WORK)/modules/proxy \
-                       $(AP_WORK)/modules/http \
+                       $(SRC)/include \
+                       $(STDMOD)/http \
+                       $(STDMOD)/proxy \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/proxy/NWGNUproxyscgi b/modules/proxy/NWGNUproxyscgi
index 9068c69e14769903991bda9618bc4de9efee3ad4..2445fd3f20ef181e50ba7055153c81c3f2a43521 100644 (file)
--- a/modules/proxy/NWGNUproxyscgi
+++ b/modules/proxy/NWGNUproxyscgi
@@ -18,8 +18,8 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
-                       $(AP_WORK)/modules/http \
+                       $(SRC)/include \
+                       $(STDMOD)/http \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/proxy/NWGNUserf b/modules/proxy/NWGNUserf
index 0ea3810640fa93cec49b6b91cc7c2786476b1151..6c36e7164bb2ec7de912f51a1607c00c865f0f49 100644 (file)
--- a/modules/proxy/NWGNUserf
+++ b/modules/proxy/NWGNUserf
@@ -37,10 +37,10 @@ XINCDIRS    += \
                        $(OSSLINC)/openssl \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
-                       $(AP_WORK)/modules/http \
-                       $(AP_WORK)/modules/generators \
-                       $(AP_WORK)/modules/ssl \
+                       $(SRC)/include \
+                       $(STDMOD)/http \
+                       $(STDMOD)/generators \
+                       $(STDMOD)/ssl \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/slotmem/NWGNUslotmem_plain b/modules/slotmem/NWGNUslotmem_plain
index a66504a69617aec35814ef40ef6dec685158513f..96c925e3ffb12fc7ddfab0b963f6ded00bea872c 100644 (file)
--- a/modules/slotmem/NWGNUslotmem_plain
+++ b/modules/slotmem/NWGNUslotmem_plain
@@ -18,7 +18,7 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/slotmem/NWGNUslotmem_shm b/modules/slotmem/NWGNUslotmem_shm
index 515569318dac6699056c4b45dd649d8a3fb9f0d8..fe353fca71e9e4c1a757d64a4c75f21252059153 100644 (file)
--- a/modules/slotmem/NWGNUslotmem_shm
+++ b/modules/slotmem/NWGNUslotmem_shm
@@ -18,7 +18,7 @@ endif
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/ssl/NWGNUmakefile b/modules/ssl/NWGNUmakefile
index 933180f14a6a86fefb01686165e383e393a996dd..836a6d83454181b42faac787523eff2230bcee67 100644 (file)
--- a/modules/ssl/NWGNUmakefile
+++ b/modules/ssl/NWGNUmakefile
@@ -52,10 +52,10 @@ XINCDIRS    += \
                        $(SSL_INC) \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
-                       $(AP_WORK)/modules/cache \
-                       $(AP_WORK)/modules/generators \
-                       $(AP_WORK)/server/mpm/NetWare \
+                       $(SRC)/include \
+                       $(STDMOD)/cache \
+                       $(STDMOD)/generators \
+                       $(SERVER)/mpm/NetWare \
                        $(NWOS) \
                        $(EOLIST)
 
@@ -315,7 +315,7 @@ install :: nlms FORCE
 #
 # Any specialized rules here
 #
-vpath %.c $(AP_WORK)/modules/arch/netware
+vpath %.c $(STDMOD)/arch/netware
 
 #
 # Include the 'tail' makefile that has targets that depend on variables defined

diff --git a/modules/test/NWGNUoptfnexport b/modules/test/NWGNUoptfnexport
index 449d26e943ac22f2cf99c19f728b1e5814d21583..cdd68b710f8e8cda317c4ca690caa6e120ca3bb9 100644 (file)
--- a/modules/test/NWGNUoptfnexport
+++ b/modules/test/NWGNUoptfnexport
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/test/NWGNUoptfnimport b/modules/test/NWGNUoptfnimport
index cd09d392e482f5c3157cf47aedb400378296fb4c..316cba7dc987a027aa59647dbab1f73d3eb04c86 100644 (file)
--- a/modules/test/NWGNUoptfnimport
+++ b/modules/test/NWGNUoptfnimport
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/test/NWGNUopthookexport b/modules/test/NWGNUopthookexport
index 04723869f17386f752f397f6ec275304a55898f5..fd4790a79b3cc267f7b38aca3643d74f57aca509 100644 (file)
--- a/modules/test/NWGNUopthookexport
+++ b/modules/test/NWGNUopthookexport
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/test/NWGNUopthookimport b/modules/test/NWGNUopthookimport
index ef4d3dcd7ab1bd32dd45c93473f6367edd497529..ee9fe59e8afa53958ed224bb8f0bb24952770bde 100644 (file)
--- a/modules/test/NWGNUopthookimport
+++ b/modules/test/NWGNUopthookimport
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS       += \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/server/NWGNUmakefile b/server/NWGNUmakefile
index 7f96e81e126fd79cd572d13e15168e18935678ec..3a61094f8e92e1f0b5035df83b349302434fab17 100644 (file)
--- a/server/NWGNUmakefile
+++ b/server/NWGNUmakefile
@@ -23,7 +23,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS       += \
                        $(NWOS) \
                        $(APR)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(APRUTIL)/include \
                        $(EOLIST)
 
@@ -112,7 +112,7 @@ NLM_THREAD_NAME     = genchars
 
 #
 # If this is specified, it will override VERSION value in 
-# $(AP_WORK)\NWGNUNetWare.rul
+# $(AP_WORK)/build/NWGNUenvironment.inc
 #
 NLM_VERSION    = 1,0,0
 

diff --git a/support/NWGNUab b/support/NWGNUab
index c22b6c16edbc4f09d4fd6275f1cf2ac872bac51d..aa10aab42f9b5acfad154ea6478204aabc13d3e4 100644 (file)
--- a/support/NWGNUab
+++ b/support/NWGNUab
@@ -51,7 +51,7 @@ endif
 
 XINCDIRS       += \
                        $(NWOS) \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(APR)/include \
                        $(APRUTIL)/include \
                        $(APR)/misc/netware \

diff --git a/support/NWGNUfirehose b/support/NWGNUfirehose
index 2b81c15505fcef5ac9f347315c966e5401a1e061..1ad7a7cf5ad7cd239e20bca964700e788db884ca 100644 (file)
--- a/support/NWGNUfirehose
+++ b/support/NWGNUfirehose
@@ -20,7 +20,7 @@ XINCDIRS      += \
                        $(APR)/include \
                        $(APRUTIL)/include \
                        $(APR)/misc/netware \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(EOLIST)
 
 #

diff --git a/support/NWGNUhtcacheclean b/support/NWGNUhtcacheclean
index f81352781def41b151166440d43f16be1febf8fa..ffee90b82810b32cfffb926c3b1dba164f9beca0 100644 (file)
--- a/support/NWGNUhtcacheclean
+++ b/support/NWGNUhtcacheclean
@@ -19,7 +19,7 @@ XINCDIRS      += \
                        $(STDMOD)/cache \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(APR)/misc/netware \
                        $(NWOS) \
                        $(EOLIST)

diff --git a/support/NWGNUlogres b/support/NWGNUlogres
index 33ccfe0e32d97a25a726b20d96286f202dd7da08..a19c20d0aaa39c8422f923e6adb966c4ff1f2cc3 100644 (file)
--- a/support/NWGNUlogres
+++ b/support/NWGNUlogres
@@ -17,7 +17,7 @@ endif
 #
 XINCDIRS       += \
                        $(NWOS) \
-                       $(AP_WORK)/include \
+                       $(SRC)/include \
                        $(APR)/include \
                        $(APRUTIL)/include \
                        $(APR)/misc/netware \