Removed obsolete include paths from NetWare makefiles.

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

diff --git a/modules/aaa/NWGNUaccesscompat b/modules/aaa/NWGNUaccesscompat
index ac2ab1d9e7c99d01b5d5911261fc6c4a9ab21909..5bdd2dc5ebd70051cb2d279519409dc220d926a8 100644 (file)
--- a/modules/aaa/NWGNUaccesscompat
+++ b/modules/aaa/NWGNUaccesscompat
@@ -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 7f42bdb6d239d61e85b22797af9a556c980ae66c..16fc021c566aecd11c7662d00e144ad5120ab2bb 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 81c6240660cca321d15c729282eb3b8ea1871f41..b514b31d158c0f20e587fe80f9804b8a2060f0f3 100644 (file)
--- a/modules/aaa/NWGNUauthndbd
+++ b/modules/aaa/NWGNUauthndbd
@@ -16,13 +16,11 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
                        $(AP_WORK)/include \
                        $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(AP_WORK)/modules/database \
-                       $(APR)/include \
-                       $(APRUTIL)/include \
-                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/modules/aaa/NWGNUauthndbm b/modules/aaa/NWGNUauthndbm
index 40f72be144e4b33243289550c1f123c162351b5f..3c4769d459880bf0329f3b39c3d10117dcdcd088 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/NWGNUauthnfil b/modules/aaa/NWGNUauthnfil
index 55e379560fa11a753287fc3148e903e406db704a..51ee57f157f6214ba3a61f5973fcdf98457dbe95 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/NWGNUauthnsocache b/modules/aaa/NWGNUauthnsocache
index 912b50473379d32ae134666ac4cbbd6c9e1706a5..2792f495d5c5b3e1f788a7f1ccb7d15c2aaa3726 100644 (file)
--- a/modules/aaa/NWGNUauthnsocache
+++ b/modules/aaa/NWGNUauthnsocache
@@ -16,13 +16,11 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
                        $(AP_WORK)/include \
                        $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(AP_WORK)/modules/database \
-                       $(APR)/include \
-                       $(APRUTIL)/include \
-                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/modules/aaa/NWGNUauthnzldap b/modules/aaa/NWGNUauthnzldap
index d86cc13ecae1231d86fe5cbbef7956cb32c2b750..8c1bd689b98232db2b822c6027ab32b796d6261c 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/NWGNUauthzdbd b/modules/aaa/NWGNUauthzdbd
index 11cf1260627cf4dd69e8e0efac21505e5ad0e1ea..115fbdb22fecb0c53b69a54a1b87715ab3fd55a1 100644 (file)
--- a/modules/aaa/NWGNUauthzdbd
+++ b/modules/aaa/NWGNUauthzdbd
@@ -16,13 +16,11 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
                        $(AP_WORK)/include \
                        $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(AP_WORK)/modules/database \
-                       $(APR)/include \
-                       $(APRUTIL)/include \
-                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/modules/aaa/NWGNUauthzdbm b/modules/aaa/NWGNUauthzdbm
index 4d4f7b44ad41db9d80a2cfd1590eb2dd1f1bdebb..9af94c5bc8719180346b0a0a140a30e49cd7272f 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/NWGNUauthzgrp b/modules/aaa/NWGNUauthzgrp
index 672d9c790df33c5eaa379186918db8d7ae5c34c6..837f6f359c293be99260ff9f858cc62db6ce91d3 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/cluster/NWGNUmodheartbeat b/modules/cluster/NWGNUmodheartbeat
index 6b069cd176d27c01fffb19808b96bc2a59733823..ba208472b02c8f25a83b6a4f1c82789d63d97893 100644 (file)
--- a/modules/cluster/NWGNUmodheartbeat
+++ b/modules/cluster/NWGNUmodheartbeat
@@ -24,13 +24,11 @@ include $(AP_WORK)\build\NWGNUhead.inc
 # INCDIRS\r
 #\r
 XINCDIRS       += \\r
-                       $(AP_WORK)/include \\r
-                       $(NWOS) \\r
-                       $(AP_WORK)/modules/arch/netware \\r
-                       $(AP_WORK)/modules/core \\r
                        $(APR)/include \\r
                        $(APRUTIL)/include \\r
-                       $(APR) \\r
+                       $(AP_WORK)/include \\r
+                       $(AP_WORK)/modules/core \\r
+                       $(NWOS) \\r
                        $(EOLIST)\r
 \r
 #\r

diff --git a/modules/cluster/NWGNUmodheartmonitor b/modules/cluster/NWGNUmodheartmonitor
index d5f01fd67ecd068c8e65c4fbf91d9f1c4703b84a..bdb96755c5af6167cfa8c62bbaa0893c97dd0281 100644 (file)
--- a/modules/cluster/NWGNUmodheartmonitor
+++ b/modules/cluster/NWGNUmodheartmonitor
@@ -24,13 +24,11 @@ include $(AP_WORK)\build\NWGNUhead.inc
 # INCDIRS\r
 #\r
 XINCDIRS       += \\r
-                       $(AP_WORK)/include \\r
-                       $(NWOS) \\r
-                       $(AP_WORK)/modules/arch/netware \\r
-                       $(AP_WORK)/modules/core \\r
                        $(APR)/include \\r
                        $(APRUTIL)/include \\r
-                       $(APR) \\r
+                       $(AP_WORK)/include \\r
+                       $(AP_WORK)/modules/core \\r
+                       $(NWOS) \\r
                        $(EOLIST)\r
 \r
 #\r

diff --git a/modules/database/NWGNUmakefile b/modules/database/NWGNUmakefile
index a5768dc13d9c7e2450881187f4542c419d7d6213..59d4e8234f3279d6582c7f61928f85fbe778e3d4 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 69bb334e715153349e4b7d1290df8c76f3db24ab..baa80576a7fdb72392d6b450c6d63220e2e471fc 100644 (file)
--- a/modules/dav/fs/NWGNUmakefile
+++ b/modules/dav/fs/NWGNUmakefile
@@ -29,7 +29,6 @@ XINCDIRS      += \
                        $(AP_WORK)/include \
                        $(AP_WORK)/server/mpm/netware \
                        $(AP_WORK)/modules/dav/main \
-                       $(AP_WORK)/modules/arch/netware \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/debugging/NWGNUmodbucketeer b/modules/debugging/NWGNUmodbucketeer
index 8c5415e8a8466a62e7de363019b9affda680b831..8dd4ce8d878981f6ad24b31390e97ed303de525a 100644 (file)
--- a/modules/debugging/NWGNUmodbucketeer
+++ b/modules/debugging/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/debugging/NWGNUmoddumpio b/modules/debugging/NWGNUmoddumpio
index ceb1cfb3ab781cb5a1a772fec3c3a5749caab0db..7801aae2f656fbab081a14307072cd8fe0869042 100644 (file)
--- a/modules/debugging/NWGNUmoddumpio
+++ b/modules/debugging/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 13a5beac11d76d58bf585e2e558ea98d162f4081..e6f661c8d24a47187dcf06f07d852712ebd0b063 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/examples/NWGNUcase_flt b/modules/examples/NWGNUcase_flt
index f696b86369f093003cde53bafca00c2b780832be..18f55f3dc012cd8d1647338ca72bb8a4b8d9098c 100644 (file)
--- a/modules/examples/NWGNUcase_flt
+++ b/modules/examples/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/examples/NWGNUcase_flt_in b/modules/examples/NWGNUcase_flt_in
index d9ec3113a68fa79dbd9d45412e8510226503352e..fedecb769f20ac77c2d5d9374cce441d2706385c 100644 (file)
--- a/modules/examples/NWGNUcase_flt_in
+++ b/modules/examples/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/examples/NWGNUexample_hooks b/modules/examples/NWGNUexample_hooks
index 007bde676fa70b7675ab680c8b49bfaa2cbc9c35..522ee887666df72445e87c577a125a0401c1786f 100644 (file)
--- a/modules/examples/NWGNUexample_hooks
+++ b/modules/examples/NWGNUexample_hooks
@@ -24,13 +24,11 @@ include $(AP_WORK)\build\NWGNUhead.inc
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/server/mpm/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(AP_WORK)/server/mpm/netware \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/examples/NWGNUexample_ipc b/modules/examples/NWGNUexample_ipc
index 5749439a0129ce5f18834438d2f695d9c6629818..7a9dc257560e350bf29a2781bcb7057cf2ea679e 100644 (file)
--- a/modules/examples/NWGNUexample_ipc
+++ b/modules/examples/NWGNUexample_ipc
@@ -24,13 +24,11 @@ include $(AP_WORK)\build\NWGNUhead.inc
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/server/mpm/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(AP_WORK)/server/mpm/netware \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

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

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 589fff3917261bf4f0b30c5c74a62cc937593dca..8aa5b2081b43c5d5e52bd6821e0735c63b8e82fc 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 9a01213bce0fe1e6ca9f8a41973cd614dcd12a8b..f6a78e0f629a71f419c68b467865b4b34336d31b 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/NWGNUmod_request b/modules/filters/NWGNUmod_request
index 9c8f4214d9b0e8bd9687981ab1c4c63a965491a6..fb53390d7eb5641583649b1ddb30f8fa9561600d 100644 (file)
--- a/modules/filters/NWGNUmod_request
+++ b/modules/filters/NWGNUmod_request
@@ -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/NWGNUmodbuffer b/modules/filters/NWGNUmodbuffer
index e82360539f322474b19f7c902661067bf06c4fe0..8bb11d4a0d19212d6cf501e73f7a7cc9e3c114ac 100644 (file)
--- a/modules/filters/NWGNUmodbuffer
+++ b/modules/filters/NWGNUmodbuffer
@@ -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/NWGNUmodsed b/modules/filters/NWGNUmodsed
index 0ae066c150557cb212e6e419dbe45252395e95e6..7b41439bd8f0a4cfc35710b4a10ad69b0d145812 100644 (file)
--- a/modules/filters/NWGNUmodsed
+++ b/modules/filters/NWGNUmodsed
@@ -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/NWGNUratelimit b/modules/filters/NWGNUratelimit
index bd2e2ac11461e8e91df70c5b9cb3401e200812d5..cbbf833e0022bf70da23fa02e8534a240f31505c 100644 (file)
--- a/modules/filters/NWGNUratelimit
+++ b/modules/filters/NWGNUratelimit
@@ -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/NWGNUreflector b/modules/filters/NWGNUreflector
index 9db5a02cbff49d8a639ffd3d0b9cf1ab2b1a89f8..81a59ebf4729752f6bf3195ca377ebbfa96db1fa 100644 (file)
--- a/modules/filters/NWGNUreflector
+++ b/modules/filters/NWGNUreflector
@@ -24,12 +24,10 @@ include $(AP_WORK)\build\NWGNUhead.inc
 # INCDIRS\r
 #\r
 XINCDIRS       += \\r
-                       $(AP_WORK)/include \\r
-                       $(NWOS) \\r
-                       $(AP_WORK)/modules/arch/netware \\r
                        $(APR)/include \\r
                        $(APRUTIL)/include \\r
-                       $(APR) \\r
+                       $(AP_WORK)/include \\r
+                       $(NWOS) \\r
                        $(EOLIST)\r
 \r
 #\r

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 8305c55444889bf8322a38800dc752fa1e5be7b5..2d310934ef1cd97b4a8359e682457d0b1e1bcfe6 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 \
+                       $(AP_WORK)/modules/http \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/generators/NWGNUinfo b/modules/generators/NWGNUinfo
index 0477dbf9770222a1165e76110d1cfc47c50c9fb8..ae6c25e4a09c8b3033c33ae8e0c52446b6d8ed77 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 58f6ce203fbee4a984fcbc4a35e5586c7770139e..d1f209a06eef257438c1d126a84a814c0f25adb8 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 \
+                       $(AP_WORK)/modules/http \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/generators/NWGNUmod_cgi b/modules/generators/NWGNUmod_cgi
index 341fac02b4e683c13345cb6db386da420833b977..4763d0d0f7fc2956c6a5a85bd75817fdf962504a 100644 (file)
--- a/modules/generators/NWGNUmod_cgi
+++ b/modules/generators/NWGNUmod_cgi
@@ -16,14 +16,12 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
                        $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(AP_WORK)/modules/http \
                        $(AP_WORK)/modules/filters \
-                       $(APR)/include \
-                       $(APRUTIL)/include \
-                       $(APR) \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/generators/NWGNUstatus b/modules/generators/NWGNUstatus
index a6658ad28231ea2e0dddde293dde17acdfad3dfb..01cbef5af87f327979ba84803d06f7d999d5dd34 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 91818800351f2a298576a1e21a4610e1bbfb0105..4a92ef2837b875e1f5f09f66fa456ec77e1ac578 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 0a979dae06dced1f0dc72c59eb651df4458e9465..7abee9b06bbae8d932b1f58c549afa606ab8eb9e 100644 (file)
--- a/modules/loggers/NWGNUforensic
+++ b/modules/loggers/NWGNUforensic
@@ -24,12 +24,11 @@ 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 \
+                       $(AP_WORK)/modules/http \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/loggers/NWGNUmodlogio b/modules/loggers/NWGNUmodlogio
index ee367f3598aaa24949c5983cf4da47d8c4c6c017..7d18cf7d712ab4f18bb92e7f043b3c67e04073d3 100644 (file)
--- a/modules/loggers/NWGNUmodlogio
+++ b/modules/loggers/NWGNUmodlogio
@@ -24,12 +24,11 @@ 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 \
+                       $(AP_WORK)/modules/http \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/lua/NWGNUmakefile b/modules/lua/NWGNUmakefile
index 58385dff97b16166f9c48158459f06083e65e60a..d1adaa8668011cc5d817b4d4f6cfc5ad371998b3 100644 (file)
--- a/modules/lua/NWGNUmakefile
+++ b/modules/lua/NWGNUmakefile
@@ -24,13 +24,12 @@ include $(AP_WORK)\build\NWGNUhead.inc
 # INCDIRS\r
 #\r
 XINCDIRS       += \\r
-                       $(LUASRC)/src \\r
-                       $(AP_WORK)/include \\r
-                       $(NWOS) \\r
-                       $(AP_WORK)/modules/arch/netware \\r
                        $(APR)/include \\r
                        $(APRUTIL)/include \\r
-                       $(APR) \\r
+                       $(AP_WORK)/include \\r
+                       $(AP_WORK)/modules/http \\r
+                       $(NWOS) \\r
+                       $(LUASRC)/src \\r
                        $(EOLIST)\r
 \r
 #\r

diff --git a/modules/mappers/NWGNUactions b/modules/mappers/NWGNUactions
index 0429f7809d0fdd39850dac03b6ed5e164728c81e..04c8fd33a1d495b190a067894b6e1c1f39d0c6a6 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 a5e7f37c00c10ca0724fcd9fe8a8d4baebf8206f..fa511589a0ee05a9fbf2434fb41ddaa4a4df9735 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 \
+                       $(AP_WORK)/modules/http \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/mappers/NWGNUrewrite b/modules/mappers/NWGNUrewrite
index f03d00537eca9d19ac8fdbab3cf7169893e57b0c..ae91a2d588b5ba4bb7c14ae141e675172430ec31 100644 (file)
--- a/modules/mappers/NWGNUrewrite
+++ b/modules/mappers/NWGNUrewrite
@@ -16,14 +16,12 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
                        $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(AP_WORK)/modules/database \
                        $(AP_WORK)/modules/ssl \
-                       $(APR)/include \
-                       $(APRUTIL)/include \
-                       $(APR) \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/mappers/NWGNUspeling b/modules/mappers/NWGNUspeling
index 57ca91f08fe56c77670ef5135780b55a871dbc93..550def1a8f278acfd71f0991e20ca517417a68f2 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 269722bf836de06f651c017fe1ef8a2000f8cbda..7b230180d581b49e3e170f71e4d72380c34f6846 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 \
+                       $(AP_WORK)/modules/http \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/mappers/NWGNUvhost b/modules/mappers/NWGNUvhost
index 886bd1d372c7d0a4b77f2a16b6a0c0bfd9e49ed3..65ea2c188fe30cd89973717ded5415ea2009f221 100644 (file)
--- a/modules/mappers/NWGNUvhost
+++ b/modules/mappers/NWGNUvhost
@@ -16,12 +16,11 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(AP_WORK)/modules/http \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/metadata/NWGNUcernmeta b/modules/metadata/NWGNUcernmeta
index d92e0ac49eee4fe7058c14feb40a3f33b00a111b..b194cdba78499f94a5000f42b33855b79757581f 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 ea98ce4eb51c72b9774fcdcb01c27f5d077e7b46..07de9e892c496e83d1677069799b4829b4e8c0bf 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 7283c33c535f8665fc9adccf0e815c077be4478d..bd5487196e0276b40548808dfb5c742c2bb14f84 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 \
+                       $(AP_WORK)/modules/ssl \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/metadata/NWGNUmimemagi b/modules/metadata/NWGNUmimemagi
index 4bfac168ca3f728a9ceca28a4dc9c674f3ebf707..c2aa84daa7cf9a4632b3d917b465947cb733f488 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 ef80af9e3f252c3725e71a024200701ece75eca1..e06ef8d883387dc4a76aea42cf28ecfe332326c0 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 c06cd657e93fe2e971b2ab4699bd4e2f99fc5034..fdece687ebbd3ef821a04066e75ee6e71885b7fe 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/NWGNUremoteip b/modules/metadata/NWGNUremoteip
index 23df23af8b5d5eb9e5b454f437a101dcc46136e1..2ad383b10b0a959ef4a70e30de2245e04367bac9 100644 (file)
--- a/modules/metadata/NWGNUremoteip
+++ b/modules/metadata/NWGNUremoteip
@@ -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 52c5086da21857fd0c5ebe26f0dfed61c78bafcd..6c7ccb05ff4418cc3b05ff41198e34275971d23b 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 41cb1a5fe54483971e24e186035550025b4f9342..49ee8f847d18eccd0c6a9bc2b762d7c61aec9ddc 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 bc284fc73975d759744f613ed8c905ad8b18ff1c..925e2364a5df75e632b920a4a5686d868ccee373 100644 (file)
--- a/modules/proxy/NWGNUproxy
+++ b/modules/proxy/NWGNUproxy
@@ -16,15 +16,13 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
                        $(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)/modules/ssl \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/proxy/NWGNUproxyajp b/modules/proxy/NWGNUproxyajp
index 506de20aca8d9776ed72965de2f613e92cd69066..5ba2af654357c1dd73812d1e8e889e859625f9a2 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 \
+                       $(AP_WORK)/modules/http \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/proxy/NWGNUproxybalancer b/modules/proxy/NWGNUproxybalancer
index 52824cfd8bdf31b30118b22aa1527eb08f492c06..c59b1bc8cd41d2e4e14715b28e787011668677df 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 \
+                       $(AP_WORK)/modules/http \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/proxy/NWGNUproxycon b/modules/proxy/NWGNUproxycon
index 45d8b4b47265d74957bfa60eedb170bd728bbb5b..f474a4f1e2af7f177ec5cdf2ec16a8a21884f7a2 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 \
+                       $(AP_WORK)/modules/http \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/proxy/NWGNUproxyfcgi b/modules/proxy/NWGNUproxyfcgi
index 959d18001422c636e6182968abb996e74c52025d..acb9a36498463fcbb36b1081a8a4c8a6f10390e5 100644 (file)
--- a/modules/proxy/NWGNUproxyfcgi
+++ b/modules/proxy/NWGNUproxyfcgi
@@ -16,13 +16,11 @@ endif
 # INCDIRS\r
 #\r
 XINCDIRS       += \\r
-                       $(AP_WORK)/include \\r
-                       $(NWOS) \\r
-                       $(AP_WORK)/modules/http \\r
-                       $(AP_WORK)/modules/arch/netware \\r
                        $(APR)/include \\r
                        $(APRUTIL)/include \\r
-                       $(APR) \\r
+                       $(AP_WORK)/include \\r
+                       $(AP_WORK)/modules/http \\r
+                       $(NWOS) \\r
                        $(EOLIST)\r
 \r
 #\r

diff --git a/modules/proxy/NWGNUproxyftp b/modules/proxy/NWGNUproxyftp
index aee359d483bdcb6ee9c1d6a92729c67ade4fc662..5d4019fedd3bb83202075908aa70cb3c681543fd 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 \
+                       $(AP_WORK)/modules/http \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/proxy/NWGNUproxyhtp b/modules/proxy/NWGNUproxyhtp
index f7b0e2116724ae2d1e7106a36d8f50545781a7b5..98acbd9d57ac51da7b89173b1293e2870b675c98 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 \
+                       $(AP_WORK)/modules/http \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/proxy/NWGNUproxyscgi b/modules/proxy/NWGNUproxyscgi
index 4c51621f5b3c7ac6d0b4d7760a62455ad1970b63..152d1aa7700d5aeb3e30bae878e3c9d3238bb021 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 \
+                       $(AP_WORK)/modules/http \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/proxy/NWGNUserf b/modules/proxy/NWGNUserf
index 9f869af55fa5f556aa11f256d32513f81beecc6f..8bdd4befc519abacefa252a4d92eb0784ea15359 100644 (file)
--- a/modules/proxy/NWGNUserf
+++ b/modules/proxy/NWGNUserf
@@ -28,15 +28,13 @@ XINCDIRS    += \
                        $(V_PATH) \
                        $(OSSLINC) \
                        $(OSSLINC)/openssl \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
                        $(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)/modules/ssl \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/session/NWGNUsession b/modules/session/NWGNUsession
index dc30233bea9d831e0f1ce792ad866ca96da1fefe..448d3da94f509c353ff64f046065f0a9f3c6aa28 100644 (file)
--- a/modules/session/NWGNUsession
+++ b/modules/session/NWGNUsession
@@ -16,15 +16,13 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
                        $(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)/modules/ssl \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/session/NWGNUsession_cookie b/modules/session/NWGNUsession_cookie
index b90950048a753539ed38a70c15469df88d944407..ddf0ad4f44d3f1ddc07f20cbeaa13903d514ad7a 100644 (file)
--- a/modules/session/NWGNUsession_cookie
+++ b/modules/session/NWGNUsession_cookie
@@ -16,15 +16,13 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
                        $(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)/modules/ssl \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/session/NWGNUsession_crypto b/modules/session/NWGNUsession_crypto
index 8abea5882974d05e4dd5158b9ff00f7775d62e5e..df791acaf39dfee7c2c507b57c404c36d05e211f 100644 (file)
--- a/modules/session/NWGNUsession_crypto
+++ b/modules/session/NWGNUsession_crypto
@@ -16,15 +16,13 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
                        $(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)/modules/ssl \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/session/NWGNUsession_dbd b/modules/session/NWGNUsession_dbd
index 876694a8a6602f98d0791a35ae26dad80313f915..a70a88f6d35ef9c466e61a852fb5b368dc95d321 100644 (file)
--- a/modules/session/NWGNUsession_dbd
+++ b/modules/session/NWGNUsession_dbd
@@ -16,18 +16,15 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
                        $(AP_WORK)/include \
-                       $(NWOS) \
                        $(AP_WORK)/modules/http \
-                       $(AP_WORK)/modules/arch/netware \
                        $(AP_WORK)/modules/database \
-                       $(AP_WORK)/modules/ssl \
                        $(AP_WORK)/modules/generators \
+                       $(AP_WORK)/modules/ssl \
                        $(AP_WORK)/server/mpm/netware \
-                       $(APR)/include \
-                       $(APRUTIL)/include \
-                       $(APR) \
-                       $(EOLIST)
+                       $(NWOS) \
 
 #
 # These flags will come after CFLAGS

diff --git a/modules/ssl/NWGNUmakefile b/modules/ssl/NWGNUmakefile
index 419844429cf327ca78b0927d9a035e4d40377242..a63b6e48bf57eeeb05b9b53e10a5ef01c4e4ed43 100644 (file)
--- a/modules/ssl/NWGNUmakefile
+++ b/modules/ssl/NWGNUmakefile
@@ -1,6 +1,9 @@
 #
 # This Makefile requires the environment var OSSLSDK
 # pointing to the base directory of your OpenSSL SDK.
+# If you want to use the Novell NTLS SDK instead then
+# define NTLSSDK pointing to the base directory of the
+# SDK, and also set USE_NTLS=1
 #
 
 #
@@ -23,25 +26,37 @@ include $(AP_WORK)\build\NWGNUhead.inc
 # Make sure all needed macro's are defined
 #
 
-OSSLINC = $(OSSLSDK)/outinc_nw_libc
-OSSLLIB = $(OSSLSDK)/out_nw_libc
-OSSLAPP = $(OSSLSDK)/apps
+ifeq "$(USE_NTLS)" "1"
+SSL_INC = $(NTLSSDK)/inc
+SSL_LIB = $(NTLSSDK)/imp
+SSL_BIN = $(NTLSSDK)/bin
+SSL_APP = $(NTLSSDK)/apps
+ifneq "$(wildcard $(SSL_INC)/openssl/opensslv.h)" "$(SSL_INC)/openssl/opensslv.h"
+$(error '$(NTLSSDK)' does NOT point to a valid NTLS SDK!)
+endif
+else
+SSL_INC = $(OSSLSDK)/outinc_nw_libc
+SSL_LIB = $(OSSLSDK)/out_nw_libc
+SSL_BIN = $(OSSLSDK)/out_nw_libc
+SSL_APP = $(OSSLSDK)/apps
+ifneq "$(wildcard $(SSL_INC)/openssl/opensslv.h)" "$(SSL_INC)/openssl/opensslv.h"
+$(error '$(OSSLSDK)' does NOT point to a valid OpenSSL SDK!)
+endif
+endif
 
 #
 # These directories will be at the beginning of the include list, followed by
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(OSSLINC) \
-                       $(OSSLINC)/openssl \
+                       $(SSL_INC) \
+                       $(SSL_INC)/openssl \
+                       $(APR)/include \
+                       $(APRUTIL)/include \
                        $(AP_WORK)/include \
-                       $(AP_WORK)/server/mpm/NetWare \
-                       $(AP_WORK)/modules/arch/netware \
                        $(AP_WORK)/modules/cache \
                        $(AP_WORK)/modules/generators \
-                       $(APR)/include \
-                       $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/server/mpm/NetWare \
                        $(NWOS) \
                        $(EOLIST)
 
@@ -62,7 +77,7 @@ XDEFINES      += \
 # These flags will be added to the link.opt file
 #
 XLFLAGS                += \
-                       -l $(OSSLLIB) \
+                       -l $(SSL_LIB) \
                        $(EOLIST)
 
 #
@@ -122,7 +137,11 @@ NLM_NAME   = mod_ssl
 # This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
+ifeq "$(USE_NTLS)" "1"
+NLM_DESCRIPTION        = Apache $(VERSION_STR) SSL module (NTLS)
+else
 NLM_DESCRIPTION        = Apache $(VERSION_STR) SSL module
+endif
 
 #
 # This is used by the '-threadname' directive.  If left blank,
@@ -199,10 +218,15 @@ FILES_nlm_objs := $(patsubst %.c,$(OBJDIR)/%.o,$(wildcard *.c))
 #
 FILES_nlm_libs = \
        libcpre.o \
-       $(OSSLLIB)/crypto.lib \
-       $(OSSLLIB)/ssl.lib \
        $(EOLIST)
 
+ifneq "$(USE_NTLS)" "1"
+FILES_nlm_libs += \
+       $(SSL_LIB)/crypto.lib \
+       $(SSL_LIB)/ssl.lib \
+       $(EOLIST)
+endif
+
 #
 # These are the modules that the above NLM target depends on to load.
 # These will be added as a module command in the link.opt file.
@@ -212,6 +236,11 @@ FILES_nlm_modules = \
        Libc \
        $(EOLIST)
 
+ifeq "$(USE_NTLS)" "1"
+FILES_nlm_modules += ntls \
+       $(EOLIST)
+endif
+
 #
 # If the nlm has a msg file, put it's path here
 #
@@ -234,17 +263,25 @@ FILES_nlm_Ximports = \
        @libc.imp \
        @$(APR)/aprlib.imp \
        @httpd.imp \
-       GetProcessSwitchCount \
-       RunningProcess \
-       GetSuperHighResolutionTimer \
        $(EOLIST)
 
 # Don't link with Winsock if standard sockets are being used
-ifndef USE_STDSOCKETS
+ifneq "$(USE_STDSOCKETS)" "1"
 FILES_nlm_Ximports += @ws2nlm.imp \
        $(EOLIST)
 endif
 
+ifeq "$(USE_NTLS)" "1"
+FILES_nlm_Ximports += @ntls.imp \
+       $(EOLIST)
+else
+FILES_nlm_Ximports += \
+       GetProcessSwitchCount \
+       RunningProcess \
+       GetSuperHighResolutionTimer \
+       $(EOLIST)
+endif
+
 #
 # Any symbols exported to here
 #
@@ -273,8 +310,8 @@ nlms :: libs $(TARGET_nlm)
 #
 install :: nlms FORCE
        copy $(OBJDIR)\mod_ssl.nlm $(INSTALL)\$(BASEDIR)\modules\*.*
-       -copy $(subst /,\,$(OSSLLIB))\openssl.nlm $(INSTALL)\$(BASEDIR)\bin\*.*
-       -copy $(subst /,\,$(OSSLAPP))\openssl.cnf $(INSTALL)\$(BASEDIR)\bin\*.*
+       -copy $(subst /,\,$(SSL_BIN))\openssl.nlm $(INSTALL)\$(BASEDIR)\bin\*.*
+       -copy $(subst /,\,$(SSL_APP))\openssl.cnf $(INSTALL)\$(BASEDIR)\bin\*.*
 
 #
 # Any specialized rules here

diff --git a/modules/test/NWGNUoptfnexport b/modules/test/NWGNUoptfnexport
index 0b85ff715404711f9fde20f8b423db4408874522..5ec813267eb4a514bf1af0af9f880ad14bf22f3f 100644 (file)
--- a/modules/test/NWGNUoptfnexport
+++ b/modules/test/NWGNUoptfnexport
@@ -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/test/NWGNUoptfnimport b/modules/test/NWGNUoptfnimport
index 3466b9a44f65840c558986640c42d9bdcc7f38ef..233edbcad57e45d025a7251957c1adfac0422f7e 100644 (file)
--- a/modules/test/NWGNUoptfnimport
+++ b/modules/test/NWGNUoptfnimport
@@ -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/test/NWGNUopthookexport b/modules/test/NWGNUopthookexport
index f3d728e674b47a6bfc6fd64300411f70d20f15d5..23427cc4b9e719abcd9c20521e70fbc6b7b678ae 100644 (file)
--- a/modules/test/NWGNUopthookexport
+++ b/modules/test/NWGNUopthookexport
@@ -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/test/NWGNUopthookimport b/modules/test/NWGNUopthookimport
index cc3745b5eeb5463f760ff1ce7fed82e8b29c4799..73a01292564c4d79480ba138d31ea97e9a8f61a0 100644 (file)
--- a/modules/test/NWGNUopthookimport
+++ b/modules/test/NWGNUopthookimport
@@ -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/support/NWGNUab b/support/NWGNUab
index ea22b8fadab3f702246699dd6dfb055403a9c272..25114cb09cb5300d98b296d71290de605d0f1820 100644 (file)
--- a/support/NWGNUab
+++ b/support/NWGNUab
@@ -55,7 +55,6 @@ XINCDIRS      += \
                        $(APR)/include \
                        $(APRUTIL)/include \
                        $(APR)/misc/netware \
-                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/support/NWGNUhtcacheclean b/support/NWGNUhtcacheclean
index 17d03d362ac1768684f5fa7c4e3d1b026d36f8db..aa9e6ea852b9d636ce5a90bcbd3886d0a0af0772 100644 (file)
--- a/support/NWGNUhtcacheclean
+++ b/support/NWGNUhtcacheclean
@@ -20,7 +20,6 @@ XINCDIRS      += \
                        $(APR)/include \
                        $(APRUTIL)/include \
                        $(APR)/misc/netware \
-                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/support/NWGNUhtdbm b/support/NWGNUhtdbm
index 492d22924e4618e718b4c84a7e602abab8a73995..e427d5295e3effe4355ca652d1343042ced1056a 100644 (file)
--- a/support/NWGNUhtdbm
+++ b/support/NWGNUhtdbm
@@ -20,7 +20,6 @@ XINCDIRS      += \
                        $(APR)/include \
                        $(APRUTIL)/include \
                        $(APR)/misc/netware \
-                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/support/NWGNUhtdigest b/support/NWGNUhtdigest
index 4fbdc040cce1113f1088af0605487f298ff5b09d..21a4f0974e684a702169b13b9b37480832a7a6fb 100644 (file)
--- a/support/NWGNUhtdigest
+++ b/support/NWGNUhtdigest
@@ -20,7 +20,6 @@ XINCDIRS      += \
                        $(APR)/include \
                        $(APRUTIL)/include \
                        $(APR)/misc/netware \
-                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/support/NWGNUhtpasswd b/support/NWGNUhtpasswd
index 2b692db4b8b781c887e718d94a8e1f0cf1f856e2..daa1d39e1adec0804de5c0c4603ade6d50d4480d 100644 (file)
--- a/support/NWGNUhtpasswd
+++ b/support/NWGNUhtpasswd
@@ -20,7 +20,6 @@ XINCDIRS      += \
                        $(APR)/include \
                        $(APRUTIL)/include \
                        $(APR)/misc/netware \
-                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/support/NWGNUhttxt2dbm b/support/NWGNUhttxt2dbm
index 17710de6bbbbaa254127dac0f0d569cc762c1644..a97ddcdb38963bbcdb8a67650c74931cba460af4 100644 (file)
--- a/support/NWGNUhttxt2dbm
+++ b/support/NWGNUhttxt2dbm
@@ -20,7 +20,6 @@ XINCDIRS      += \
                        $(APR)/include \
                        $(APRUTIL)/include \
                        $(APR)/misc/netware \
-                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/support/NWGNUlogres b/support/NWGNUlogres
index 982cdb78b1f1350c679541ff8811f09386d8b6ba..e861d63e234179b1367c37c558f0f1c701da8bb8 100644 (file)
--- a/support/NWGNUlogres
+++ b/support/NWGNUlogres
@@ -21,7 +21,6 @@ XINCDIRS      += \
                        $(APR)/include \
                        $(APRUTIL)/include \
                        $(APR)/misc/netware \
-                       $(APR) \
                        $(EOLIST)
 
 #

diff --git a/support/NWGNUrotlogs b/support/NWGNUrotlogs
index 9a55095208e294947550559ac4b180ff2fe49dc5..83b46a8378b0fffc5e946e53d6964c7944e6185e 100644 (file)
--- a/support/NWGNUrotlogs
+++ b/support/NWGNUrotlogs
@@ -19,7 +19,6 @@ XINCDIRS      += \
                        $(NWOS) \
                        $(APR)/include \
                        $(APR)/misc/netware \
-                       $(APR) \
                        $(EOLIST)
 
 #