From 7814748ab324b8d7329fb3fcbbd8032fb2dcb6a7 Mon Sep 17 00:00:00 2001 From: Guenter Knauf Date: Thu, 9 Aug 2012 12:11:09 +0000 Subject: [PATCH] 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 --- NWGNUmakefile | 8 -------- modules/aaa/NWGNUaccesscompat | 2 +- modules/aaa/NWGNUallowmethods | 2 +- modules/aaa/NWGNUauthbasc | 2 +- modules/aaa/NWGNUauthdigt | 2 +- modules/aaa/NWGNUauthform | 2 +- modules/aaa/NWGNUauthnano | 2 +- modules/aaa/NWGNUauthndbd | 4 ++-- modules/aaa/NWGNUauthndbm | 2 +- modules/aaa/NWGNUauthnfil | 2 +- modules/aaa/NWGNUauthnsocache | 2 +- modules/aaa/NWGNUauthnzldap | 2 +- modules/aaa/NWGNUauthzdbd | 2 +- modules/aaa/NWGNUauthzdbm | 2 +- modules/aaa/NWGNUauthzgrp | 2 +- modules/aaa/NWGNUauthzusr | 2 +- modules/apreq/NWGNUmakefile | 2 +- modules/cache/NWGNUcach_dsk | 4 ++-- modules/cache/NWGNUmod_cach | 4 ++-- modules/cache/NWGNUsocachdbm | 4 ++-- modules/cache/NWGNUsocachmem | 4 ++-- modules/cache/NWGNUsocachshmcb | 4 ++-- modules/cluster/NWGNUmodheartbeat | 4 ++-- modules/cluster/NWGNUmodheartmonitor | 4 ++-- modules/database/NWGNUmakefile | 2 +- modules/dav/fs/NWGNUmakefile | 6 +++--- modules/dav/lock/NWGNUmakefile | 6 +++--- modules/dav/main/NWGNUmakefile | 4 ++-- modules/debugging/NWGNUmodbucketeer | 2 +- modules/debugging/NWGNUmoddumpio | 2 +- modules/debugging/NWGNUmodfirehose | 2 +- modules/echo/NWGNUmakefile | 2 +- modules/examples/NWGNUcase_flt | 2 +- modules/examples/NWGNUcase_flt_in | 2 +- modules/examples/NWGNUexample_hooks | 4 ++-- modules/examples/NWGNUexample_ipc | 4 ++-- modules/experimental/NWGNUnoloris | 2 +- modules/filters/NWGNUcharsetl | 2 +- modules/filters/NWGNUdeflate | 2 +- modules/filters/NWGNUextfiltr | 2 +- modules/filters/NWGNUmod_data | 2 +- modules/filters/NWGNUmod_filter | 2 +- modules/filters/NWGNUmod_request | 2 +- modules/filters/NWGNUmodbuffer | 2 +- modules/filters/NWGNUmodsed | 2 +- modules/filters/NWGNUproxyhtml | 4 ++-- modules/filters/NWGNUratelimit | 2 +- modules/filters/NWGNUreflector | 2 +- modules/filters/NWGNUreqtimeout | 2 +- modules/filters/NWGNUsubstitute | 2 +- modules/filters/NWGNUxml2enc | 2 +- modules/generators/NWGNUautoindex | 4 ++-- modules/generators/NWGNUinfo | 2 +- modules/generators/NWGNUmod_asis | 4 ++-- modules/generators/NWGNUmod_cgi | 6 +++--- modules/generators/NWGNUstatus | 2 +- modules/ldap/NWGNUmakefile | 2 +- modules/loggers/NWGNUforensic | 4 ++-- modules/loggers/NWGNUlogdebug | 4 ++-- modules/loggers/NWGNUmodlogio | 4 ++-- modules/lua/NWGNUmakefile | 6 +++--- modules/mappers/NWGNUactions | 2 +- modules/mappers/NWGNUimagemap | 4 ++-- modules/mappers/NWGNUrewrite | 6 +++--- modules/mappers/NWGNUspeling | 2 +- modules/mappers/NWGNUuserdir | 4 ++-- modules/mappers/NWGNUvhost | 4 ++-- modules/metadata/NWGNUcernmeta | 2 +- modules/metadata/NWGNUexpires | 2 +- modules/metadata/NWGNUheaders | 4 ++-- modules/metadata/NWGNUmimemagi | 2 +- modules/metadata/NWGNUmodident | 2 +- modules/metadata/NWGNUmodversion | 2 +- modules/metadata/NWGNUremoteip | 2 +- modules/metadata/NWGNUuniqueid | 2 +- modules/metadata/NWGNUusertrk | 2 +- modules/proxy/NWGNUproxy | 8 ++++---- modules/proxy/NWGNUproxyajp | 4 ++-- modules/proxy/NWGNUproxybalancer | 4 ++-- modules/proxy/NWGNUproxycon | 4 ++-- modules/proxy/NWGNUproxyexpress | 4 ++-- modules/proxy/NWGNUproxyfcgi | 4 ++-- modules/proxy/NWGNUproxyftp | 4 ++-- modules/proxy/NWGNUproxyhtp | 4 ++-- modules/proxy/NWGNUproxylbm_busy | 6 +++--- modules/proxy/NWGNUproxylbm_hb | 6 +++--- modules/proxy/NWGNUproxylbm_req | 6 +++--- modules/proxy/NWGNUproxylbm_traf | 6 +++--- modules/proxy/NWGNUproxyscgi | 4 ++-- modules/proxy/NWGNUserf | 8 ++++---- modules/slotmem/NWGNUslotmem_plain | 2 +- modules/slotmem/NWGNUslotmem_shm | 2 +- modules/ssl/NWGNUmakefile | 10 +++++----- modules/test/NWGNUoptfnexport | 2 +- modules/test/NWGNUoptfnimport | 2 +- modules/test/NWGNUopthookexport | 2 +- modules/test/NWGNUopthookimport | 2 +- server/NWGNUmakefile | 4 ++-- support/NWGNUab | 2 +- support/NWGNUfirehose | 2 +- support/NWGNUhtcacheclean | 2 +- support/NWGNUlogres | 2 +- 102 files changed, 159 insertions(+), 167 deletions(-) diff --git a/NWGNUmakefile b/NWGNUmakefile index 0ceff3eea5..7c3b5aaa29 100644 --- 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 bfa7b20105..24b129652d 100644 --- 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 c2373f574b..aef151ba87 100644 --- 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 1f434640bb..16fe37f710 100644 --- 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 39738f2199..0450bdf8ca 100644 --- 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 5b42ab50c4..28239b7e53 100644 --- 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 b115314d8b..0618223fd0 100644 --- 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 151bc1c2d0..859c034aa6 100644 --- 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 1f9880e9aa..1c1a1153dd 100644 --- 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 cfab287697..acd6981f0f 100644 --- 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 8d1b347e26..df8150c53a 100644 --- 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 bfe21dbede..473640de0d 100644 --- 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 3ea2ba72ba..65c3bf7f0a 100644 --- 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 3d0ed8f57b..dd987ba4d1 100644 --- 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 4a8df2cb9b..6e6e8ea13c 100644 --- 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 aa790538ad..c878133e1b 100644 --- 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 0e46e3c4ac..8a0cc00d6b 100644 --- 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 1c45f344f0..e75b4ee3d6 100644 --- 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 b17b6b69b3..4da6fed216 100644 --- 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 dc06af7df9..3213e36448 100644 --- 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 d8d10d8a34..5a032f62fe 100644 --- 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 8f11c4b648..02f6cab83f 100644 --- 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 b2c3ece219..bbabe566e3 100644 --- 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 2436b277fd..59fae08115 100644 --- 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 7a96c04e83..c5a3f206a0 100644 --- 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 e402428781..9f609dbf29 100644 --- 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 b515d272c5..28e6c953ad 100644 --- 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 bc94a2215b..a5b28c92c5 100644 --- 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 22a2d1101e..788cd7ceac 100644 --- 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 b09fa05c86..50ac42239c 100644 --- 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 585fd4c1a2..962b6730f1 100644 --- 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 7add53d637..6fbb1836b5 100644 --- 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 df9a86f498..469fd0f611 100644 --- 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 7429a44a03..3e7b85bf3f 100644 --- 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 06bc16ad05..6888f3057e 100644 --- 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 605794b2a4..45fc48c2fe 100644 --- 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 d1a9a96c04..5f3af566d2 100644 --- 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 99326354d6..c0ef69e372 100644 --- 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 7f7204d13e..3d72a00b72 100644 --- 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 1fd57cb00c..d138148120 100644 --- 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 7f46e9aaf7..98ea0017f6 100644 --- 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 bf323ee753..b8b2b3cfb6 100644 --- 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 21f53cc140..83274ac807 100644 --- 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 7652a358f4..9c73a6cb05 100644 --- 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 158acb9d77..351f3f2487 100644 --- 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 5337f3b1a9..3976fbdd10 100644 --- 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 f75c81408d..89e7a64d1d 100644 --- 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 67ca26d9de..12787116f6 100644 --- 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 a99f82c424..91e579e294 100644 --- 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 e5775f285d..898e6a59c3 100644 --- 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 117832eb48..bfbb5583b8 100644 --- 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 e8080c3659..514d935db4 100644 --- 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 810db8a235..ae6f902ed8 100644 --- 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 c7df5ae8e6..504e870d51 100644 --- 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 bbb95784b8..77683eb6fa 100644 --- 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 1dc850e28a..5fa0a8eb41 100644 --- 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 ef830253f3..dd5890ea78 100644 --- 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 c55f036cee..3882ba0891 100644 --- 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 e92839a1e5..091c6de8d1 100644 --- 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 fa376db73a..9fa045264a 100644 --- 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 36d0a699b4..ac962c9e93 100644 --- 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 3a94773cd1..8867246251 100644 --- 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 7f6608600c..ea8b7dff87 100644 --- 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 d16dd8e2bb..d8ff191a29 100644 --- 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 6982988dad..6d8303416a 100644 --- 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 b0fc7a01de..c986e4f863 100644 --- 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 d3b655c698..db7b1b3c04 100644 --- 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 64a7cb7a91..b204e00331 100644 --- 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 e9601b0edb..e80e5d1aba 100644 --- 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 77ae60d1b8..69464ec1a9 100644 --- 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 ae508fffab..0e3225ea42 100644 --- 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 8ce871d832..b8f364fe8b 100644 --- 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 756b57212b..12a7671623 100644 --- 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 8e9ddb5921..115bbb9f7c 100644 --- 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 d39a57e1fa..bb72a6bb3d 100644 --- 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 1be79de157..10c9f2e69e 100644 --- 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 cade4acbf5..deb5232c34 100644 --- 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 0f41248444..9fc0ef2212 100644 --- 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 976fd50c0f..277dcbd490 100644 --- 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 0215a499dc..614293181a 100644 --- 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 84bb5036a8..1c34133a8b 100644 --- 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 a4412225cc..a3ecf4cb85 100644 --- 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 ee7fbf89ec..27fee00a69 100644 --- 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 0257d52a3f..5c4f8932b3 100644 --- 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 c1b91f6b4f..fff1db7561 100644 --- 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 19563da6df..35a7348a2c 100644 --- 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 6a2c4cd0fb..5d41f78a1a 100644 --- 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 1927d6263c..61b14c0960 100644 --- 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 9068c69e14..2445fd3f20 100644 --- 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 0ea3810640..6c36e7164b 100644 --- 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 a66504a696..96c925e3ff 100644 --- 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 515569318d..fe353fca71 100644 --- 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 933180f14a..836a6d8345 100644 --- 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 449d26e943..cdd68b710f 100644 --- 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 cd09d392e4..316cba7dc9 100644 --- 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 04723869f1..fd4790a79b 100644 --- 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 ef4d3dcd7a..ee9fe59e8a 100644 --- 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 7f96e81e12..3a61094f8e 100644 --- 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 c22b6c16ed..aa10aab42f 100644 --- 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 2b81c15505..1ad7a7cf5a 100644 --- 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 f81352781d..ffee90b828 100644 --- 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 33ccfe0e32..a19c20d0aa 100644 --- 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 \