cleaned up NetWare makefile includes.

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

diff --git a/NWGNUmakefile b/NWGNUmakefile
index 018d7abfe059ece052caffb4d78c7d003b8f9a48..31ee905e22b27e182d2a9a3ace909cc8d83fdfb0 100644 (file)
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -68,9 +68,8 @@ XINCDIRS      += \
                        $(AP_WORK)/modules/loggers/ \
                        $(AP_WORK)/modules/mappers/ \
                        $(AP_WORK)/modules/proxy/ \
-                       $(AP_WORK)/os/NetWare \
                        $(AP_WORK)/server/mpm/NetWare \
-                       $(AP_WORK)/srclib/pcre \
+                       $(PCRE) \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/cache/NWGNUdsk_cach b/modules/cache/NWGNUdsk_cach
index b91823dd8a58d8507c4f555296af8de497d77729..a2fb7d06d05f884d20ea5a0cbe5030b6eaf783f4 100644 (file)
--- a/modules/cache/NWGNUdsk_cach
+++ b/modules/cache/NWGNUdsk_cach
@@ -26,9 +26,7 @@ XINCDIRS      += \
                        $(APR)/include \
                        $(APRUTIL)/include \
                        $(AP_WORK)/include \
-                       $(AP_WORK)/os/NetWare \
                        $(AP_WORK)/server/mpm/NetWare \
-                       $(AP_WORK)/srclib/pcre \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/cache/NWGNUmem_cach b/modules/cache/NWGNUmem_cach
index bcf98e7f304dce22b55b6ac1de15e72bc581586d..19e329a73e579c154dc0f319bc87a7dee8144f12 100644 (file)
--- a/modules/cache/NWGNUmem_cach
+++ b/modules/cache/NWGNUmem_cach
@@ -26,9 +26,7 @@ XINCDIRS      += \
                        $(APR)/include \
                        $(APRUTIL)/include \
                        $(AP_WORK)/include \
-                       $(AP_WORK)/os/NetWare \
                        $(AP_WORK)/server/mpm/NetWare \
-                       $(AP_WORK)/srclib/pcre \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/cache/NWGNUmod_cach b/modules/cache/NWGNUmod_cach
index ff0a9667174edb52f5c7ff491a4714b21d5a326a..424da5226840f98d55d0e69f357d2c59624baac3 100644 (file)
--- a/modules/cache/NWGNUmod_cach
+++ b/modules/cache/NWGNUmod_cach
@@ -26,9 +26,7 @@ XINCDIRS      += \
                        $(APR)/include \
                        $(APRUTIL)/include \
                        $(AP_WORK)/include \
-                       $(AP_WORK)/os/NetWare \
                        $(AP_WORK)/server/mpm/NetWare \
-                       $(AP_WORK)/srclib/pcre \
                        $(NWOS) \
                        $(EOLIST)
 

diff --git a/modules/dav/fs/NWGNUmakefile b/modules/dav/fs/NWGNUmakefile
index e9c27aea92a24405f777b45e5e70705572f2a917..f15b2dd63dc31d40f052b0cd7094b9621bad8414 100644 (file)
--- a/modules/dav/fs/NWGNUmakefile
+++ b/modules/dav/fs/NWGNUmakefile
@@ -27,9 +27,7 @@ XINCDIRS      += \
                        $(APR)/include \
                        $(APRUTIL)/include \
                        $(AP_WORK)/include \
-                       $(AP_WORK)/os/NetWare \
                        $(AP_WORK)/server/mpm/NetWare \
-                       $(AP_WORK)/srclib/pcre \
                        $(AP_WORK)/modules/dav/main \
                        $(AP_WORK)/modules/arch/netware \
                        $(NWOS) \

diff --git a/modules/dav/lock/NWGNUmakefile b/modules/dav/lock/NWGNUmakefile
index 66e22eae934dcc4d6f34a9c817682b6e6d6fbf54..e36a5237e5021cfa695f4820c5bca7db1cbec444 100644 (file)
--- a/modules/dav/lock/NWGNUmakefile
+++ b/modules/dav/lock/NWGNUmakefile
@@ -27,9 +27,7 @@ XINCDIRS      += \
                        $(APR)/include \
                        $(APRUTIL)/include \
                        $(AP_WORK)/include \
-                       $(AP_WORK)/os/NetWare \
                        $(AP_WORK)/server/mpm/NetWare \
-                       $(AP_WORK)/srclib/pcre \
                        $(AP_WORK)/modules/dav/main \
                        $(NWOS) \
                        $(EOLIST)

diff --git a/modules/dav/main/NWGNUmakefile b/modules/dav/main/NWGNUmakefile
index c8626342f7953a2199e5bf265cec9e5ba560de16..812dc9e3ace64302de03112149e1c00d21f0ec41 100644 (file)
--- a/modules/dav/main/NWGNUmakefile
+++ b/modules/dav/main/NWGNUmakefile
@@ -26,9 +26,7 @@ XINCDIRS      += \
                        $(APR)/include \
                        $(APRUTIL)/include \
                        $(AP_WORK)/include \
-                       $(AP_WORK)/os/NetWare \
                        $(AP_WORK)/server/mpm/NetWare \
-                       $(AP_WORK)/srclib/pcre \
                        $(NWOS) \
                        $(EOLIST)