From: Guenter Knauf Date: Sun, 24 Oct 2010 15:56:10 +0000 (+0000) Subject: Another NetWare makefile cleanup. X-Git-Tag: 2.2.18~354 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f56bf50c38b82f3c0029708013d8c05328be64ab;p=thirdparty%2Fapache%2Fhttpd.git Another NetWare makefile cleanup. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1026826 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/NWGNUmakefile b/NWGNUmakefile index 13e573c1a48..61a3526046b 100644 --- a/NWGNUmakefile +++ b/NWGNUmakefile @@ -62,13 +62,13 @@ XINCDIRS += \ $(APR)/include \ $(APRUTIL)/include \ $(AP_WORK)/include \ - $(AP_WORK)/modules/filters \ - $(AP_WORK)/modules/generators \ - $(AP_WORK)/modules/http \ - $(AP_WORK)/modules/loggers \ - $(AP_WORK)/modules/mappers \ - $(AP_WORK)/modules/proxy \ - $(AP_WORK)/server/mpm/NetWare \ + $(HTTPD) \ + $(STDMOD)/filters \ + $(STDMOD)/generators \ + $(STDMOD)/loggers \ + $(STDMOD)/mappers \ + $(STDMOD)/proxy \ + $(SERVER)/mpm/NetWare \ $(PCRE) \ $(NWOS) \ $(EOLIST) diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc index 9e6a5d83cb2..e318b0e295b 100644 --- a/build/NWGNUenvironment.inc +++ b/build/NWGNUenvironment.inc @@ -181,6 +181,10 @@ WIN_CFLAGS += -lMSL_All_x86.lib -lkernel32.lib -luser32.lib CFLAGS = -c -nosyspath -Cpp_exceptions off -RTTI off -align 4 -w nocmdline -proc PII +ifeq "$(REQUIRE_PROTOTYPES)" "1" +CFLAGS += -r +endif + # -g generate debugging information # -O0 level 0 optimizations diff --git a/modules/aaa/NWGNUauthbasc b/modules/aaa/NWGNUauthbasc index e445bf8519b..f1f1cbae9b1 100644 --- a/modules/aaa/NWGNUauthbasc +++ b/modules/aaa/NWGNUauthbasc @@ -16,12 +16,10 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/aaa/NWGNUauthdigt b/modules/aaa/NWGNUauthdigt index 762c8533502..bb6b01cad00 100644 --- a/modules/aaa/NWGNUauthdigt +++ b/modules/aaa/NWGNUauthdigt @@ -16,12 +16,10 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/aaa/NWGNUauthnalias b/modules/aaa/NWGNUauthnalias index 6dfbef6aa37..5432563fd9e 100644 --- a/modules/aaa/NWGNUauthnalias +++ b/modules/aaa/NWGNUauthnalias @@ -16,12 +16,10 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/aaa/NWGNUauthnano b/modules/aaa/NWGNUauthnano index 0879e4a565c..446eaae9fd1 100644 --- 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 10e3782bb2e..0128fe2b141 100644 --- a/modules/aaa/NWGNUauthndbd +++ b/modules/aaa/NWGNUauthndbd @@ -16,13 +16,11 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/modules/database \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ + $(STDMOD)/database \ $(EOLIST) # diff --git a/modules/aaa/NWGNUauthndbm b/modules/aaa/NWGNUauthndbm index 6dbe67f0317..a429c126e87 100644 --- a/modules/aaa/NWGNUauthndbm +++ b/modules/aaa/NWGNUauthndbm @@ -16,12 +16,10 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/aaa/NWGNUauthndef b/modules/aaa/NWGNUauthndef index c6d2ce2f908..753d0149365 100644 --- a/modules/aaa/NWGNUauthndef +++ b/modules/aaa/NWGNUauthndef @@ -16,12 +16,10 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/aaa/NWGNUauthnfil b/modules/aaa/NWGNUauthnfil index 5bcb536d3d9..54d2b37facf 100644 --- a/modules/aaa/NWGNUauthnfil +++ b/modules/aaa/NWGNUauthnfil @@ -16,12 +16,10 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/aaa/NWGNUauthnzldap b/modules/aaa/NWGNUauthnzldap index ffb475dbdf6..ef4527e7c04 100644 --- a/modules/aaa/NWGNUauthnzldap +++ b/modules/aaa/NWGNUauthnzldap @@ -16,11 +16,10 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/aaa/NWGNUauthzdbm b/modules/aaa/NWGNUauthzdbm index 74a0d3dabd9..58db1d23e72 100644 --- a/modules/aaa/NWGNUauthzdbm +++ b/modules/aaa/NWGNUauthzdbm @@ -16,12 +16,10 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/aaa/NWGNUauthzdef b/modules/aaa/NWGNUauthzdef index 8b5104eff67..8cafe81d098 100644 --- a/modules/aaa/NWGNUauthzdef +++ b/modules/aaa/NWGNUauthzdef @@ -16,12 +16,10 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/aaa/NWGNUauthzgrp b/modules/aaa/NWGNUauthzgrp index 7ed5dff30d3..2db5fae6da6 100644 --- a/modules/aaa/NWGNUauthzgrp +++ b/modules/aaa/NWGNUauthzgrp @@ -16,12 +16,10 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/aaa/NWGNUauthzusr b/modules/aaa/NWGNUauthzusr index a97c253ce4a..7e597e7ab9c 100644 --- a/modules/aaa/NWGNUauthzusr +++ b/modules/aaa/NWGNUauthzusr @@ -16,12 +16,10 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/cache/NWGNUdsk_cach b/modules/cache/NWGNUdsk_cach index a2fb7d06d05..9eb83be290f 100644 --- a/modules/cache/NWGNUdsk_cach +++ b/modules/cache/NWGNUdsk_cach @@ -26,8 +26,8 @@ XINCDIRS += \ $(APR)/include \ $(APRUTIL)/include \ $(AP_WORK)/include \ - $(AP_WORK)/server/mpm/NetWare \ $(NWOS) \ + $(SERVER)/mpm/NetWare \ $(EOLIST) # diff --git a/modules/cache/NWGNUmem_cach b/modules/cache/NWGNUmem_cach index 19e329a73e5..3d7c6b32e00 100644 --- a/modules/cache/NWGNUmem_cach +++ b/modules/cache/NWGNUmem_cach @@ -26,8 +26,8 @@ XINCDIRS += \ $(APR)/include \ $(APRUTIL)/include \ $(AP_WORK)/include \ - $(AP_WORK)/server/mpm/NetWare \ $(NWOS) \ + $(SERVER)/mpm/NetWare \ $(EOLIST) # diff --git a/modules/cache/NWGNUmod_cach b/modules/cache/NWGNUmod_cach index 424da522684..138c6a795c6 100644 --- a/modules/cache/NWGNUmod_cach +++ b/modules/cache/NWGNUmod_cach @@ -26,8 +26,8 @@ XINCDIRS += \ $(APR)/include \ $(APRUTIL)/include \ $(AP_WORK)/include \ - $(AP_WORK)/server/mpm/NetWare \ $(NWOS) \ + $(SERVER)/mpm/NetWare \ $(EOLIST) # diff --git a/modules/database/NWGNUmakefile b/modules/database/NWGNUmakefile index a418f122746..fcaf2433037 100644 --- 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 f15b2dd63dc..5ade06a437f 100644 --- a/modules/dav/fs/NWGNUmakefile +++ b/modules/dav/fs/NWGNUmakefile @@ -27,10 +27,9 @@ XINCDIRS += \ $(APR)/include \ $(APRUTIL)/include \ $(AP_WORK)/include \ - $(AP_WORK)/server/mpm/NetWare \ - $(AP_WORK)/modules/dav/main \ - $(AP_WORK)/modules/arch/netware \ $(NWOS) \ + $(STDMOD)/dav/main \ + $(SERVER)/mpm/NetWare \ $(EOLIST) # diff --git a/modules/dav/lock/NWGNUmakefile b/modules/dav/lock/NWGNUmakefile index e36a5237e50..0d278ff8782 100644 --- a/modules/dav/lock/NWGNUmakefile +++ b/modules/dav/lock/NWGNUmakefile @@ -27,9 +27,9 @@ XINCDIRS += \ $(APR)/include \ $(APRUTIL)/include \ $(AP_WORK)/include \ - $(AP_WORK)/server/mpm/NetWare \ - $(AP_WORK)/modules/dav/main \ $(NWOS) \ + $(STDMOD)/dav/main \ + $(SERVER)/mpm/NetWare \ $(EOLIST) # diff --git a/modules/dav/main/NWGNUmakefile b/modules/dav/main/NWGNUmakefile index 812dc9e3ace..a002e3100fc 100644 --- a/modules/dav/main/NWGNUmakefile +++ b/modules/dav/main/NWGNUmakefile @@ -26,8 +26,8 @@ XINCDIRS += \ $(APR)/include \ $(APRUTIL)/include \ $(AP_WORK)/include \ - $(AP_WORK)/server/mpm/NetWare \ $(NWOS) \ + $(SERVER)/mpm/NetWare \ $(EOLIST) # diff --git a/modules/debug/NWGNUmodbucketeer b/modules/debug/NWGNUmodbucketeer index 739ba354ab3..0a37555a844 100644 --- a/modules/debug/NWGNUmodbucketeer +++ b/modules/debug/NWGNUmodbucketeer @@ -16,12 +16,10 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/debug/NWGNUmoddumpio b/modules/debug/NWGNUmoddumpio index 349db536980..0be87ef5307 100644 --- a/modules/debug/NWGNUmoddumpio +++ b/modules/debug/NWGNUmoddumpio @@ -16,12 +16,10 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/echo/NWGNUmakefile b/modules/echo/NWGNUmakefile index d456bf197c1..623d8ed397a 100644 --- a/modules/echo/NWGNUmakefile +++ b/modules/echo/NWGNUmakefile @@ -24,12 +24,10 @@ include $(AP_WORK)\build\NWGNUhead.inc # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/experimental/NWGNUcase_flt b/modules/experimental/NWGNUcase_flt index f696b86369f..18f55f3dc01 100644 --- a/modules/experimental/NWGNUcase_flt +++ b/modules/experimental/NWGNUcase_flt @@ -24,12 +24,10 @@ include $(AP_WORK)\build\NWGNUhead.inc # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/experimental/NWGNUcase_flt_in b/modules/experimental/NWGNUcase_flt_in index d9ec3113a68..fedecb769f2 100644 --- a/modules/experimental/NWGNUcase_flt_in +++ b/modules/experimental/NWGNUcase_flt_in @@ -24,12 +24,10 @@ include $(AP_WORK)\build\NWGNUhead.inc # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/experimental/NWGNUexample b/modules/experimental/NWGNUexample index 8979261698e..913f7453775 100644 --- a/modules/experimental/NWGNUexample +++ b/modules/experimental/NWGNUexample @@ -24,12 +24,10 @@ include $(AP_WORK)\build\NWGNUhead.inc # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/filters/NWGNUcharsetl b/modules/filters/NWGNUcharsetl index 8e28c2855f5..b4e4f5959ff 100644 --- 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 635746d676d..03138e3561a 100644 --- 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 c517f698118..6c9d5c15ea9 100644 --- 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 386960557ba..9d46586fb33 100644 --- a/modules/filters/NWGNUmod_filter +++ b/modules/filters/NWGNUmod_filter @@ -16,12 +16,10 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/filters/NWGNUreqtimeout b/modules/filters/NWGNUreqtimeout index bb682fa1dfb..f48540ba443 100644 --- 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 ca19eb11632..6c0d0db4226 100644 --- 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 cc9619a626f..69a59eda20d 100644 --- a/modules/generators/NWGNUautoindex +++ b/modules/generators/NWGNUautoindex @@ -16,13 +16,11 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/modules/http \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ + $(HTTPD) \ $(EOLIST) # diff --git a/modules/generators/NWGNUinfo b/modules/generators/NWGNUinfo index e718539f089..737af629eda 100644 --- 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 62ce6eedb79..51778f15eec 100644 --- a/modules/generators/NWGNUmod_asis +++ b/modules/generators/NWGNUmod_asis @@ -16,13 +16,11 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/modules/http \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ + $(HTTPD) \ $(EOLIST) # diff --git a/modules/generators/NWGNUmod_cgi b/modules/generators/NWGNUmod_cgi index 70d62558aa7..3463e636bd7 100644 --- a/modules/generators/NWGNUmod_cgi +++ b/modules/generators/NWGNUmod_cgi @@ -16,14 +16,12 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/modules/http \ - $(AP_WORK)/modules/filters \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ + $(HTTPD) \ + $(STDMOD)/filters \ $(EOLIST) # diff --git a/modules/generators/NWGNUstatus b/modules/generators/NWGNUstatus index e161e4387f0..e7519ac9b41 100644 --- 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 ad7956e6615..e3adacdae12 100644 --- 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 18851819f36..eda7f83e47e 100644 --- a/modules/loggers/NWGNUforensic +++ b/modules/loggers/NWGNUforensic @@ -24,12 +24,10 @@ include $(AP_WORK)\build\NWGNUhead.inc # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/loggers/NWGNUmodlogio b/modules/loggers/NWGNUmodlogio index 80ac8041568..4588c824a90 100644 --- a/modules/loggers/NWGNUmodlogio +++ b/modules/loggers/NWGNUmodlogio @@ -24,12 +24,10 @@ include $(AP_WORK)\build\NWGNUhead.inc # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/mappers/NWGNUactions b/modules/mappers/NWGNUactions index 6594ad62c64..7e0e4f61d46 100644 --- 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 087b490ca99..b5d4cebb20b 100644 --- a/modules/mappers/NWGNUimagemap +++ b/modules/mappers/NWGNUimagemap @@ -16,13 +16,11 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/modules/http \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ + $(HTTPD) \ $(EOLIST) # diff --git a/modules/mappers/NWGNUrewrite b/modules/mappers/NWGNUrewrite index e3c378f1140..abccf0091de 100644 --- a/modules/mappers/NWGNUrewrite +++ b/modules/mappers/NWGNUrewrite @@ -16,13 +16,11 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/modules/ssl \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ + $(STDMOD)/ssl \ $(EOLIST) # diff --git a/modules/mappers/NWGNUspeling b/modules/mappers/NWGNUspeling index da1638ba6b2..6a045bdc4fa 100644 --- 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 7f5ef020165..f8fdfc68d08 100644 --- a/modules/mappers/NWGNUuserdir +++ b/modules/mappers/NWGNUuserdir @@ -16,13 +16,11 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/modules/http \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ + $(HTTPD) \ $(EOLIST) # diff --git a/modules/mappers/NWGNUvhost b/modules/mappers/NWGNUvhost index a2f7eff2aca..54f2bc068fc 100644 --- a/modules/mappers/NWGNUvhost +++ b/modules/mappers/NWGNUvhost @@ -16,12 +16,10 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/metadata/NWGNUcernmeta b/modules/metadata/NWGNUcernmeta index f7d65cbfbe1..dc529fd474a 100644 --- 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 e6c9a715d2c..c3229d2b200 100644 --- 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 d68f2967e06..10155967147 100644 --- a/modules/metadata/NWGNUheaders +++ b/modules/metadata/NWGNUheaders @@ -16,13 +16,11 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/modules/ssl \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ + $(STDMOD)/ssl \ $(EOLIST) # diff --git a/modules/metadata/NWGNUmimemagi b/modules/metadata/NWGNUmimemagi index e7c6daadaa3..04d92dfe7fb 100644 --- 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 dc7ef4089e3..42313e74058 100644 --- 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 eab2d11e394..e2a4adfe204 100644 --- a/modules/metadata/NWGNUmodversion +++ b/modules/metadata/NWGNUmodversion @@ -16,12 +16,10 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # diff --git a/modules/metadata/NWGNUuniqueid b/modules/metadata/NWGNUuniqueid index 0e4058c26fc..2c31a903f6c 100644 --- 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 450bf652b51..083d0b69634 100644 --- 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 4d3beee40fa..98d792751bf 100644 --- a/modules/proxy/NWGNUproxy +++ b/modules/proxy/NWGNUproxy @@ -16,15 +16,13 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/http \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/modules/ssl \ - $(AP_WORK)/modules/generators \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ + $(HTTPD) \ + $(STDMOD)/generators \ + $(STDMOD)/ssl \ $(EOLIST) # diff --git a/modules/proxy/NWGNUproxyajp b/modules/proxy/NWGNUproxyajp index 446549f81c0..74a7cbfbe4e 100644 --- a/modules/proxy/NWGNUproxyajp +++ b/modules/proxy/NWGNUproxyajp @@ -16,13 +16,11 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/http \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ + $(HTTPD) \ $(EOLIST) # diff --git a/modules/proxy/NWGNUproxybalancer b/modules/proxy/NWGNUproxybalancer index 7dc04b8ea39..147fc07a217 100644 --- a/modules/proxy/NWGNUproxybalancer +++ b/modules/proxy/NWGNUproxybalancer @@ -16,13 +16,11 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/http \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ + $(HTTPD) \ $(EOLIST) # diff --git a/modules/proxy/NWGNUproxycon b/modules/proxy/NWGNUproxycon index 4ce871cf342..84353496e00 100644 --- a/modules/proxy/NWGNUproxycon +++ b/modules/proxy/NWGNUproxycon @@ -16,13 +16,11 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/http \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ + $(HTTPD) \ $(EOLIST) # diff --git a/modules/proxy/NWGNUproxyftp b/modules/proxy/NWGNUproxyftp index 653d9d7b1e7..4add9b0ac4d 100644 --- a/modules/proxy/NWGNUproxyftp +++ b/modules/proxy/NWGNUproxyftp @@ -16,13 +16,11 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/http \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ + $(HTTPD) \ $(EOLIST) # diff --git a/modules/proxy/NWGNUproxyhtp b/modules/proxy/NWGNUproxyhtp index 21debea1cf9..94b3865497b 100644 --- a/modules/proxy/NWGNUproxyhtp +++ b/modules/proxy/NWGNUproxyhtp @@ -16,13 +16,11 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/http \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ + $(HTTPD) \ $(EOLIST) # diff --git a/modules/proxy/NWGNUproxyscgi b/modules/proxy/NWGNUproxyscgi index 4c51621f5b3..34f306ff23f 100644 --- a/modules/proxy/NWGNUproxyscgi +++ b/modules/proxy/NWGNUproxyscgi @@ -16,13 +16,11 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/http \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ + $(HTTPD) \ $(EOLIST) # diff --git a/modules/ssl/NWGNUmakefile b/modules/ssl/NWGNUmakefile index 6d2b838d79b..7a8821957a6 100644 --- a/modules/ssl/NWGNUmakefile +++ b/modules/ssl/NWGNUmakefile @@ -32,16 +32,14 @@ OSSLAPP = $(OSSLSDK)/apps # INCDIRS # XINCDIRS += \ - $(OSSLINC) \ - $(OSSLINC)/openssl \ - $(AP_WORK)/include \ - $(AP_WORK)/server/mpm/NetWare \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/modules/generators \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ $(NWOS) \ + $(STDMOD)/generators \ + $(SERVER)/mpm/NetWare \ + $(OSSLINC) \ + $(OSSLINC)/openssl \ $(EOLIST) # diff --git a/srclib/pcre/NWGNUmakefile b/srclib/pcre/NWGNUmakefile index c3ad458db10..dbf54437cd0 100644 --- a/srclib/pcre/NWGNUmakefile +++ b/srclib/pcre/NWGNUmakefile @@ -36,7 +36,7 @@ $(PCRE)/%.h: $(subst /,\,$(PCRE))\%.hw # INCDIRS # XINCDIRS += \ - $(AP_WORK)/os/netware \ + $(NWOS) \ $(APR)/include/arch/netware \ $(EOLIST)