You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by fu...@apache.org on 2012/08/09 14:11:13 UTC

svn commit: r1371177 - in /httpd/httpd/trunk: ./ modules/aaa/ modules/apreq/ modules/cache/ modules/cluster/ modules/database/ modules/dav/fs/ modules/dav/lock/ modules/dav/main/ modules/debugging/ modules/echo/ modules/examples/ modules/experimental/ ...

Author: fuankg
Date: Thu Aug  9 12:11:09 2012
New Revision: 1371177

URL: http://svn.apache.org/viewvc?rev=1371177&view=rev
Log:
NetWare build tweaks.
Make more use of internal makefile macros;
axed now obsolete include paths.
Submitted by: normw gknw net.

Modified:
    httpd/httpd/trunk/NWGNUmakefile
    httpd/httpd/trunk/modules/aaa/NWGNUaccesscompat
    httpd/httpd/trunk/modules/aaa/NWGNUallowmethods
    httpd/httpd/trunk/modules/aaa/NWGNUauthbasc
    httpd/httpd/trunk/modules/aaa/NWGNUauthdigt
    httpd/httpd/trunk/modules/aaa/NWGNUauthform
    httpd/httpd/trunk/modules/aaa/NWGNUauthnano
    httpd/httpd/trunk/modules/aaa/NWGNUauthndbd
    httpd/httpd/trunk/modules/aaa/NWGNUauthndbm
    httpd/httpd/trunk/modules/aaa/NWGNUauthnfil
    httpd/httpd/trunk/modules/aaa/NWGNUauthnsocache
    httpd/httpd/trunk/modules/aaa/NWGNUauthnzldap
    httpd/httpd/trunk/modules/aaa/NWGNUauthzdbd
    httpd/httpd/trunk/modules/aaa/NWGNUauthzdbm
    httpd/httpd/trunk/modules/aaa/NWGNUauthzgrp
    httpd/httpd/trunk/modules/aaa/NWGNUauthzusr
    httpd/httpd/trunk/modules/apreq/NWGNUmakefile
    httpd/httpd/trunk/modules/cache/NWGNUcach_dsk
    httpd/httpd/trunk/modules/cache/NWGNUmod_cach
    httpd/httpd/trunk/modules/cache/NWGNUsocachdbm
    httpd/httpd/trunk/modules/cache/NWGNUsocachmem
    httpd/httpd/trunk/modules/cache/NWGNUsocachshmcb
    httpd/httpd/trunk/modules/cluster/NWGNUmodheartbeat
    httpd/httpd/trunk/modules/cluster/NWGNUmodheartmonitor
    httpd/httpd/trunk/modules/database/NWGNUmakefile
    httpd/httpd/trunk/modules/dav/fs/NWGNUmakefile
    httpd/httpd/trunk/modules/dav/lock/NWGNUmakefile
    httpd/httpd/trunk/modules/dav/main/NWGNUmakefile
    httpd/httpd/trunk/modules/debugging/NWGNUmodbucketeer
    httpd/httpd/trunk/modules/debugging/NWGNUmoddumpio
    httpd/httpd/trunk/modules/debugging/NWGNUmodfirehose
    httpd/httpd/trunk/modules/echo/NWGNUmakefile
    httpd/httpd/trunk/modules/examples/NWGNUcase_flt
    httpd/httpd/trunk/modules/examples/NWGNUcase_flt_in
    httpd/httpd/trunk/modules/examples/NWGNUexample_hooks
    httpd/httpd/trunk/modules/examples/NWGNUexample_ipc
    httpd/httpd/trunk/modules/experimental/NWGNUnoloris
    httpd/httpd/trunk/modules/filters/NWGNUcharsetl
    httpd/httpd/trunk/modules/filters/NWGNUdeflate
    httpd/httpd/trunk/modules/filters/NWGNUextfiltr
    httpd/httpd/trunk/modules/filters/NWGNUmod_data
    httpd/httpd/trunk/modules/filters/NWGNUmod_filter
    httpd/httpd/trunk/modules/filters/NWGNUmod_request
    httpd/httpd/trunk/modules/filters/NWGNUmodbuffer
    httpd/httpd/trunk/modules/filters/NWGNUmodsed
    httpd/httpd/trunk/modules/filters/NWGNUproxyhtml
    httpd/httpd/trunk/modules/filters/NWGNUratelimit
    httpd/httpd/trunk/modules/filters/NWGNUreflector
    httpd/httpd/trunk/modules/filters/NWGNUreqtimeout
    httpd/httpd/trunk/modules/filters/NWGNUsubstitute
    httpd/httpd/trunk/modules/filters/NWGNUxml2enc
    httpd/httpd/trunk/modules/generators/NWGNUautoindex
    httpd/httpd/trunk/modules/generators/NWGNUinfo
    httpd/httpd/trunk/modules/generators/NWGNUmod_asis
    httpd/httpd/trunk/modules/generators/NWGNUmod_cgi
    httpd/httpd/trunk/modules/generators/NWGNUstatus
    httpd/httpd/trunk/modules/ldap/NWGNUmakefile
    httpd/httpd/trunk/modules/loggers/NWGNUforensic
    httpd/httpd/trunk/modules/loggers/NWGNUlogdebug
    httpd/httpd/trunk/modules/loggers/NWGNUmodlogio
    httpd/httpd/trunk/modules/lua/NWGNUmakefile
    httpd/httpd/trunk/modules/mappers/NWGNUactions
    httpd/httpd/trunk/modules/mappers/NWGNUimagemap
    httpd/httpd/trunk/modules/mappers/NWGNUrewrite
    httpd/httpd/trunk/modules/mappers/NWGNUspeling
    httpd/httpd/trunk/modules/mappers/NWGNUuserdir
    httpd/httpd/trunk/modules/mappers/NWGNUvhost
    httpd/httpd/trunk/modules/metadata/NWGNUcernmeta
    httpd/httpd/trunk/modules/metadata/NWGNUexpires
    httpd/httpd/trunk/modules/metadata/NWGNUheaders
    httpd/httpd/trunk/modules/metadata/NWGNUmimemagi
    httpd/httpd/trunk/modules/metadata/NWGNUmodident
    httpd/httpd/trunk/modules/metadata/NWGNUmodversion
    httpd/httpd/trunk/modules/metadata/NWGNUremoteip
    httpd/httpd/trunk/modules/metadata/NWGNUuniqueid
    httpd/httpd/trunk/modules/metadata/NWGNUusertrk
    httpd/httpd/trunk/modules/proxy/NWGNUproxy
    httpd/httpd/trunk/modules/proxy/NWGNUproxyajp
    httpd/httpd/trunk/modules/proxy/NWGNUproxybalancer
    httpd/httpd/trunk/modules/proxy/NWGNUproxycon
    httpd/httpd/trunk/modules/proxy/NWGNUproxyexpress
    httpd/httpd/trunk/modules/proxy/NWGNUproxyfcgi
    httpd/httpd/trunk/modules/proxy/NWGNUproxyftp
    httpd/httpd/trunk/modules/proxy/NWGNUproxyhtp
    httpd/httpd/trunk/modules/proxy/NWGNUproxylbm_busy
    httpd/httpd/trunk/modules/proxy/NWGNUproxylbm_hb
    httpd/httpd/trunk/modules/proxy/NWGNUproxylbm_req
    httpd/httpd/trunk/modules/proxy/NWGNUproxylbm_traf
    httpd/httpd/trunk/modules/proxy/NWGNUproxyscgi
    httpd/httpd/trunk/modules/proxy/NWGNUserf
    httpd/httpd/trunk/modules/slotmem/NWGNUslotmem_plain
    httpd/httpd/trunk/modules/slotmem/NWGNUslotmem_shm
    httpd/httpd/trunk/modules/ssl/NWGNUmakefile
    httpd/httpd/trunk/modules/test/NWGNUoptfnexport
    httpd/httpd/trunk/modules/test/NWGNUoptfnimport
    httpd/httpd/trunk/modules/test/NWGNUopthookexport
    httpd/httpd/trunk/modules/test/NWGNUopthookimport
    httpd/httpd/trunk/server/NWGNUmakefile
    httpd/httpd/trunk/support/NWGNUab
    httpd/httpd/trunk/support/NWGNUfirehose
    httpd/httpd/trunk/support/NWGNUhtcacheclean
    httpd/httpd/trunk/support/NWGNUlogres

Modified: httpd/httpd/trunk/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/NWGNUmakefile?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/NWGNUmakefile (original)
+++ httpd/httpd/trunk/NWGNUmakefile Thu Aug  9 12:11:09 2012
@@ -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)
 

Modified: httpd/httpd/trunk/modules/aaa/NWGNUaccesscompat
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/NWGNUaccesscompat?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/NWGNUaccesscompat (original)
+++ httpd/httpd/trunk/modules/aaa/NWGNUaccesscompat Thu Aug  9 12:11:09 2012
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/aaa/NWGNUallowmethods
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/NWGNUallowmethods?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/NWGNUallowmethods (original)
+++ httpd/httpd/trunk/modules/aaa/NWGNUallowmethods Thu Aug  9 12:11:09 2012
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/aaa/NWGNUauthbasc
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/NWGNUauthbasc?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/NWGNUauthbasc (original)
+++ httpd/httpd/trunk/modules/aaa/NWGNUauthbasc Thu Aug  9 12:11:09 2012
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/aaa/NWGNUauthdigt
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/NWGNUauthdigt?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/NWGNUauthdigt (original)
+++ httpd/httpd/trunk/modules/aaa/NWGNUauthdigt Thu Aug  9 12:11:09 2012
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/aaa/NWGNUauthform
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/NWGNUauthform?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/NWGNUauthform (original)
+++ httpd/httpd/trunk/modules/aaa/NWGNUauthform Thu Aug  9 12:11:09 2012
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(STDMOD)/session \
 			$(STDMOD)/filters \

Modified: httpd/httpd/trunk/modules/aaa/NWGNUauthnano
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/NWGNUauthnano?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/NWGNUauthnano (original)
+++ httpd/httpd/trunk/modules/aaa/NWGNUauthnano Thu Aug  9 12:11:09 2012
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/aaa/NWGNUauthndbd
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/NWGNUauthndbd?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/NWGNUauthndbd (original)
+++ httpd/httpd/trunk/modules/aaa/NWGNUauthndbd Thu Aug  9 12:11:09 2012
@@ -18,9 +18,9 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
-			$(AP_WORK)/modules/database \
+			$(STDMOD)/database \
 			$(EOLIST)
 
 #

Modified: httpd/httpd/trunk/modules/aaa/NWGNUauthndbm
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/NWGNUauthndbm?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/NWGNUauthndbm (original)
+++ httpd/httpd/trunk/modules/aaa/NWGNUauthndbm Thu Aug  9 12:11:09 2012
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/aaa/NWGNUauthnfil
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/NWGNUauthnfil?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/NWGNUauthnfil (original)
+++ httpd/httpd/trunk/modules/aaa/NWGNUauthnfil Thu Aug  9 12:11:09 2012
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/aaa/NWGNUauthnsocache
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/NWGNUauthnsocache?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/NWGNUauthnsocache (original)
+++ httpd/httpd/trunk/modules/aaa/NWGNUauthnsocache Thu Aug  9 12:11:09 2012
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/aaa/NWGNUauthnzldap
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/NWGNUauthnzldap?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/NWGNUauthnzldap (original)
+++ httpd/httpd/trunk/modules/aaa/NWGNUauthnzldap Thu Aug  9 12:11:09 2012
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/aaa/NWGNUauthzdbd
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/NWGNUauthzdbd?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/NWGNUauthzdbd (original)
+++ httpd/httpd/trunk/modules/aaa/NWGNUauthzdbd Thu Aug  9 12:11:09 2012
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(STDMOD)/database \
 			$(EOLIST)

Modified: httpd/httpd/trunk/modules/aaa/NWGNUauthzdbm
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/NWGNUauthzdbm?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/NWGNUauthzdbm (original)
+++ httpd/httpd/trunk/modules/aaa/NWGNUauthzdbm Thu Aug  9 12:11:09 2012
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/aaa/NWGNUauthzgrp
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/NWGNUauthzgrp?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/NWGNUauthzgrp (original)
+++ httpd/httpd/trunk/modules/aaa/NWGNUauthzgrp Thu Aug  9 12:11:09 2012
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/aaa/NWGNUauthzusr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/NWGNUauthzusr?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/NWGNUauthzusr (original)
+++ httpd/httpd/trunk/modules/aaa/NWGNUauthzusr Thu Aug  9 12:11:09 2012
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/apreq/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/apreq/NWGNUmakefile?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/apreq/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/apreq/NWGNUmakefile Thu Aug  9 12:11:09 2012
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/cache/NWGNUcach_dsk
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/NWGNUcach_dsk?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/NWGNUcach_dsk (original)
+++ httpd/httpd/trunk/modules/cache/NWGNUcach_dsk Thu Aug  9 12:11:09 2012
@@ -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)
 

Modified: httpd/httpd/trunk/modules/cache/NWGNUmod_cach
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/NWGNUmod_cach?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/NWGNUmod_cach (original)
+++ httpd/httpd/trunk/modules/cache/NWGNUmod_cach Thu Aug  9 12:11:09 2012
@@ -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)
 

Modified: httpd/httpd/trunk/modules/cache/NWGNUsocachdbm
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/NWGNUsocachdbm?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/NWGNUsocachdbm (original)
+++ httpd/httpd/trunk/modules/cache/NWGNUsocachdbm Thu Aug  9 12:11:09 2012
@@ -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)
 

Modified: httpd/httpd/trunk/modules/cache/NWGNUsocachmem
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/NWGNUsocachmem?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/NWGNUsocachmem (original)
+++ httpd/httpd/trunk/modules/cache/NWGNUsocachmem Thu Aug  9 12:11:09 2012
@@ -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)
 

Modified: httpd/httpd/trunk/modules/cache/NWGNUsocachshmcb
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/NWGNUsocachshmcb?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/NWGNUsocachshmcb (original)
+++ httpd/httpd/trunk/modules/cache/NWGNUsocachshmcb Thu Aug  9 12:11:09 2012
@@ -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)
 

Modified: httpd/httpd/trunk/modules/cluster/NWGNUmodheartbeat
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cluster/NWGNUmodheartbeat?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cluster/NWGNUmodheartbeat (original)
+++ httpd/httpd/trunk/modules/cluster/NWGNUmodheartbeat Thu Aug  9 12:11:09 2012
@@ -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)
 

Modified: httpd/httpd/trunk/modules/cluster/NWGNUmodheartmonitor
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cluster/NWGNUmodheartmonitor?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cluster/NWGNUmodheartmonitor (original)
+++ httpd/httpd/trunk/modules/cluster/NWGNUmodheartmonitor Thu Aug  9 12:11:09 2012
@@ -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)
 

Modified: httpd/httpd/trunk/modules/database/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/database/NWGNUmakefile?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/database/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/database/NWGNUmakefile Thu Aug  9 12:11:09 2012
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/dav/fs/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/dav/fs/NWGNUmakefile?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/dav/fs/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/dav/fs/NWGNUmakefile Thu Aug  9 12:11:09 2012
@@ -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)
 

Modified: httpd/httpd/trunk/modules/dav/lock/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/dav/lock/NWGNUmakefile?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/dav/lock/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/dav/lock/NWGNUmakefile Thu Aug  9 12:11:09 2012
@@ -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)
 

Modified: httpd/httpd/trunk/modules/dav/main/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/dav/main/NWGNUmakefile?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/dav/main/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/dav/main/NWGNUmakefile Thu Aug  9 12:11:09 2012
@@ -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)
 

Modified: httpd/httpd/trunk/modules/debugging/NWGNUmodbucketeer
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/debugging/NWGNUmodbucketeer?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/debugging/NWGNUmodbucketeer (original)
+++ httpd/httpd/trunk/modules/debugging/NWGNUmodbucketeer Thu Aug  9 12:11:09 2012
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/debugging/NWGNUmoddumpio
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/debugging/NWGNUmoddumpio?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/debugging/NWGNUmoddumpio (original)
+++ httpd/httpd/trunk/modules/debugging/NWGNUmoddumpio Thu Aug  9 12:11:09 2012
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/debugging/NWGNUmodfirehose
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/debugging/NWGNUmodfirehose?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/debugging/NWGNUmodfirehose (original)
+++ httpd/httpd/trunk/modules/debugging/NWGNUmodfirehose Thu Aug  9 12:11:09 2012
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(STDMOD)/proxy \
 			$(NWOS) \
 			$(EOLIST)

Modified: httpd/httpd/trunk/modules/echo/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/echo/NWGNUmakefile?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/echo/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/echo/NWGNUmakefile Thu Aug  9 12:11:09 2012
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/examples/NWGNUcase_flt
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/examples/NWGNUcase_flt?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/examples/NWGNUcase_flt (original)
+++ httpd/httpd/trunk/modules/examples/NWGNUcase_flt Thu Aug  9 12:11:09 2012
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/examples/NWGNUcase_flt_in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/examples/NWGNUcase_flt_in?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/examples/NWGNUcase_flt_in (original)
+++ httpd/httpd/trunk/modules/examples/NWGNUcase_flt_in Thu Aug  9 12:11:09 2012
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/examples/NWGNUexample_hooks
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/examples/NWGNUexample_hooks?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/examples/NWGNUexample_hooks (original)
+++ httpd/httpd/trunk/modules/examples/NWGNUexample_hooks Thu Aug  9 12:11:09 2012
@@ -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)
 

Modified: httpd/httpd/trunk/modules/examples/NWGNUexample_ipc
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/examples/NWGNUexample_ipc?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/examples/NWGNUexample_ipc (original)
+++ httpd/httpd/trunk/modules/examples/NWGNUexample_ipc Thu Aug  9 12:11:09 2012
@@ -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)
 

Modified: httpd/httpd/trunk/modules/experimental/NWGNUnoloris
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/experimental/NWGNUnoloris?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/experimental/NWGNUnoloris (original)
+++ httpd/httpd/trunk/modules/experimental/NWGNUnoloris Thu Aug  9 12:11:09 2012
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/filters/NWGNUcharsetl
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/NWGNUcharsetl?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/NWGNUcharsetl (original)
+++ httpd/httpd/trunk/modules/filters/NWGNUcharsetl Thu Aug  9 12:11:09 2012
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/filters/NWGNUdeflate
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/NWGNUdeflate?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/NWGNUdeflate (original)
+++ httpd/httpd/trunk/modules/filters/NWGNUdeflate Thu Aug  9 12:11:09 2012
@@ -29,7 +29,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(STDMOD)/ssl \
 			$(NWOS) \
 			$(EOLIST)

Modified: httpd/httpd/trunk/modules/filters/NWGNUextfiltr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/NWGNUextfiltr?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/NWGNUextfiltr (original)
+++ httpd/httpd/trunk/modules/filters/NWGNUextfiltr Thu Aug  9 12:11:09 2012
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/filters/NWGNUmod_data
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/NWGNUmod_data?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/NWGNUmod_data (original)
+++ httpd/httpd/trunk/modules/filters/NWGNUmod_data Thu Aug  9 12:11:09 2012
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/filters/NWGNUmod_filter
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/NWGNUmod_filter?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/NWGNUmod_filter (original)
+++ httpd/httpd/trunk/modules/filters/NWGNUmod_filter Thu Aug  9 12:11:09 2012
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/filters/NWGNUmod_request
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/NWGNUmod_request?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/NWGNUmod_request (original)
+++ httpd/httpd/trunk/modules/filters/NWGNUmod_request Thu Aug  9 12:11:09 2012
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/filters/NWGNUmodbuffer
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/NWGNUmodbuffer?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/NWGNUmodbuffer (original)
+++ httpd/httpd/trunk/modules/filters/NWGNUmodbuffer Thu Aug  9 12:11:09 2012
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/filters/NWGNUmodsed
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/NWGNUmodsed?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/NWGNUmodsed (original)
+++ httpd/httpd/trunk/modules/filters/NWGNUmodsed Thu Aug  9 12:11:09 2012
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/filters/NWGNUproxyhtml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/NWGNUproxyhtml?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/NWGNUproxyhtml (original)
+++ httpd/httpd/trunk/modules/filters/NWGNUproxyhtml Thu Aug  9 12:11:09 2012
@@ -19,8 +19,8 @@ XINCDIRS	+= \
 			$(LIBXML2SDK)/include \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/filters/NWGNUratelimit
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/NWGNUratelimit?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/NWGNUratelimit (original)
+++ httpd/httpd/trunk/modules/filters/NWGNUratelimit Thu Aug  9 12:11:09 2012
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/filters/NWGNUreflector
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/NWGNUreflector?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/NWGNUreflector (original)
+++ httpd/httpd/trunk/modules/filters/NWGNUreflector Thu Aug  9 12:11:09 2012
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/filters/NWGNUreqtimeout
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/NWGNUreqtimeout?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/NWGNUreqtimeout (original)
+++ httpd/httpd/trunk/modules/filters/NWGNUreqtimeout Thu Aug  9 12:11:09 2012
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/filters/NWGNUsubstitute
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/NWGNUsubstitute?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/NWGNUsubstitute (original)
+++ httpd/httpd/trunk/modules/filters/NWGNUsubstitute Thu Aug  9 12:11:09 2012
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/filters/NWGNUxml2enc
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/NWGNUxml2enc?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/NWGNUxml2enc (original)
+++ httpd/httpd/trunk/modules/filters/NWGNUxml2enc Thu Aug  9 12:11:09 2012
@@ -27,7 +27,7 @@ XINCDIRS	+= \
 			$(LIBXML2SDK)/include \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/generators/NWGNUautoindex
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/generators/NWGNUautoindex?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/generators/NWGNUautoindex (original)
+++ httpd/httpd/trunk/modules/generators/NWGNUautoindex Thu Aug  9 12:11:09 2012
@@ -18,8 +18,8 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/generators/NWGNUinfo
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/generators/NWGNUinfo?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/generators/NWGNUinfo (original)
+++ httpd/httpd/trunk/modules/generators/NWGNUinfo Thu Aug  9 12:11:09 2012
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/generators/NWGNUmod_asis
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/generators/NWGNUmod_asis?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/generators/NWGNUmod_asis (original)
+++ httpd/httpd/trunk/modules/generators/NWGNUmod_asis Thu Aug  9 12:11:09 2012
@@ -18,8 +18,8 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/generators/NWGNUmod_cgi
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/generators/NWGNUmod_cgi?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/generators/NWGNUmod_cgi (original)
+++ httpd/httpd/trunk/modules/generators/NWGNUmod_cgi Thu Aug  9 12:11:09 2012
@@ -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)
 

Modified: httpd/httpd/trunk/modules/generators/NWGNUstatus
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/generators/NWGNUstatus?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/generators/NWGNUstatus (original)
+++ httpd/httpd/trunk/modules/generators/NWGNUstatus Thu Aug  9 12:11:09 2012
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/ldap/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ldap/NWGNUmakefile?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ldap/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/ldap/NWGNUmakefile Thu Aug  9 12:11:09 2012
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(LDAPSDK)/inc \
 			$(EOLIST)

Modified: httpd/httpd/trunk/modules/loggers/NWGNUforensic
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/loggers/NWGNUforensic?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/loggers/NWGNUforensic (original)
+++ httpd/httpd/trunk/modules/loggers/NWGNUforensic Thu Aug  9 12:11:09 2012
@@ -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)
 

Modified: httpd/httpd/trunk/modules/loggers/NWGNUlogdebug
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/loggers/NWGNUlogdebug?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/loggers/NWGNUlogdebug (original)
+++ httpd/httpd/trunk/modules/loggers/NWGNUlogdebug Thu Aug  9 12:11:09 2012
@@ -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)
 

Modified: httpd/httpd/trunk/modules/loggers/NWGNUmodlogio
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/loggers/NWGNUmodlogio?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/loggers/NWGNUmodlogio (original)
+++ httpd/httpd/trunk/modules/loggers/NWGNUmodlogio Thu Aug  9 12:11:09 2012
@@ -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)
 

Modified: httpd/httpd/trunk/modules/lua/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/lua/NWGNUmakefile?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/lua/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/lua/NWGNUmakefile Thu Aug  9 12:11:09 2012
@@ -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)

Modified: httpd/httpd/trunk/modules/mappers/NWGNUactions
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/NWGNUactions?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/NWGNUactions (original)
+++ httpd/httpd/trunk/modules/mappers/NWGNUactions Thu Aug  9 12:11:09 2012
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/mappers/NWGNUimagemap
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/NWGNUimagemap?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/NWGNUimagemap (original)
+++ httpd/httpd/trunk/modules/mappers/NWGNUimagemap Thu Aug  9 12:11:09 2012
@@ -18,8 +18,8 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/mappers/NWGNUrewrite
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/NWGNUrewrite?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/NWGNUrewrite (original)
+++ httpd/httpd/trunk/modules/mappers/NWGNUrewrite Thu Aug  9 12:11:09 2012
@@ -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)
 

Modified: httpd/httpd/trunk/modules/mappers/NWGNUspeling
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/NWGNUspeling?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/NWGNUspeling (original)
+++ httpd/httpd/trunk/modules/mappers/NWGNUspeling Thu Aug  9 12:11:09 2012
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/mappers/NWGNUuserdir
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/NWGNUuserdir?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/NWGNUuserdir (original)
+++ httpd/httpd/trunk/modules/mappers/NWGNUuserdir Thu Aug  9 12:11:09 2012
@@ -18,8 +18,8 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/mappers/NWGNUvhost
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/NWGNUvhost?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/NWGNUvhost (original)
+++ httpd/httpd/trunk/modules/mappers/NWGNUvhost Thu Aug  9 12:11:09 2012
@@ -18,8 +18,8 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/metadata/NWGNUcernmeta
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/metadata/NWGNUcernmeta?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/metadata/NWGNUcernmeta (original)
+++ httpd/httpd/trunk/modules/metadata/NWGNUcernmeta Thu Aug  9 12:11:09 2012
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/metadata/NWGNUexpires
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/metadata/NWGNUexpires?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/metadata/NWGNUexpires (original)
+++ httpd/httpd/trunk/modules/metadata/NWGNUexpires Thu Aug  9 12:11:09 2012
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/metadata/NWGNUheaders
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/metadata/NWGNUheaders?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/metadata/NWGNUheaders (original)
+++ httpd/httpd/trunk/modules/metadata/NWGNUheaders Thu Aug  9 12:11:09 2012
@@ -18,8 +18,8 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/ssl \
+			$(SRC)/include \
+			$(STDMOD)/ssl \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/metadata/NWGNUmimemagi
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/metadata/NWGNUmimemagi?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/metadata/NWGNUmimemagi (original)
+++ httpd/httpd/trunk/modules/metadata/NWGNUmimemagi Thu Aug  9 12:11:09 2012
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/metadata/NWGNUmodident
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/metadata/NWGNUmodident?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/metadata/NWGNUmodident (original)
+++ httpd/httpd/trunk/modules/metadata/NWGNUmodident Thu Aug  9 12:11:09 2012
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/metadata/NWGNUmodversion
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/metadata/NWGNUmodversion?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/metadata/NWGNUmodversion (original)
+++ httpd/httpd/trunk/modules/metadata/NWGNUmodversion Thu Aug  9 12:11:09 2012
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/metadata/NWGNUremoteip
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/metadata/NWGNUremoteip?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/metadata/NWGNUremoteip (original)
+++ httpd/httpd/trunk/modules/metadata/NWGNUremoteip Thu Aug  9 12:11:09 2012
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/metadata/NWGNUuniqueid
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/metadata/NWGNUuniqueid?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/metadata/NWGNUuniqueid (original)
+++ httpd/httpd/trunk/modules/metadata/NWGNUuniqueid Thu Aug  9 12:11:09 2012
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/metadata/NWGNUusertrk
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/metadata/NWGNUusertrk?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/metadata/NWGNUusertrk (original)
+++ httpd/httpd/trunk/modules/metadata/NWGNUusertrk Thu Aug  9 12:11:09 2012
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxy
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUproxy?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxy (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxy Thu Aug  9 12:11:09 2012
@@ -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)
 

Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxyajp
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUproxyajp?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxyajp (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxyajp Thu Aug  9 12:11:09 2012
@@ -18,8 +18,8 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxybalancer
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUproxybalancer?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxybalancer (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxybalancer Thu Aug  9 12:11:09 2012
@@ -18,8 +18,8 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxycon
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUproxycon?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxycon (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxycon Thu Aug  9 12:11:09 2012
@@ -18,8 +18,8 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxyexpress
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUproxyexpress?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxyexpress (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxyexpress Thu Aug  9 12:11:09 2012
@@ -18,8 +18,8 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxyfcgi
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUproxyfcgi?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxyfcgi (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxyfcgi Thu Aug  9 12:11:09 2012
@@ -18,8 +18,8 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxyftp
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUproxyftp?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxyftp (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxyftp Thu Aug  9 12:11:09 2012
@@ -18,8 +18,8 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxyhtp
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUproxyhtp?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxyhtp (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxyhtp Thu Aug  9 12:11:09 2012
@@ -18,8 +18,8 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxylbm_busy
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUproxylbm_busy?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxylbm_busy (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxylbm_busy Thu Aug  9 12:11:09 2012
@@ -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)
 

Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxylbm_hb
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUproxylbm_hb?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxylbm_hb (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxylbm_hb Thu Aug  9 12:11:09 2012
@@ -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)
 

Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxylbm_req
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUproxylbm_req?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxylbm_req (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxylbm_req Thu Aug  9 12:11:09 2012
@@ -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)
 

Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxylbm_traf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUproxylbm_traf?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxylbm_traf (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxylbm_traf Thu Aug  9 12:11:09 2012
@@ -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)
 

Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxyscgi
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUproxyscgi?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxyscgi (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxyscgi Thu Aug  9 12:11:09 2012
@@ -18,8 +18,8 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/proxy/NWGNUserf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/NWGNUserf?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUserf (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUserf Thu Aug  9 12:11:09 2012
@@ -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)
 

Modified: httpd/httpd/trunk/modules/slotmem/NWGNUslotmem_plain
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/slotmem/NWGNUslotmem_plain?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/slotmem/NWGNUslotmem_plain (original)
+++ httpd/httpd/trunk/modules/slotmem/NWGNUslotmem_plain Thu Aug  9 12:11:09 2012
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/slotmem/NWGNUslotmem_shm
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/slotmem/NWGNUslotmem_shm?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/slotmem/NWGNUslotmem_shm (original)
+++ httpd/httpd/trunk/modules/slotmem/NWGNUslotmem_shm Thu Aug  9 12:11:09 2012
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/ssl/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/NWGNUmakefile?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/ssl/NWGNUmakefile Thu Aug  9 12:11:09 2012
@@ -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

Modified: httpd/httpd/trunk/modules/test/NWGNUoptfnexport
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/test/NWGNUoptfnexport?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/test/NWGNUoptfnexport (original)
+++ httpd/httpd/trunk/modules/test/NWGNUoptfnexport Thu Aug  9 12:11:09 2012
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/test/NWGNUoptfnimport
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/test/NWGNUoptfnimport?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/test/NWGNUoptfnimport (original)
+++ httpd/httpd/trunk/modules/test/NWGNUoptfnimport Thu Aug  9 12:11:09 2012
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/test/NWGNUopthookexport
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/test/NWGNUopthookexport?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/test/NWGNUopthookexport (original)
+++ httpd/httpd/trunk/modules/test/NWGNUopthookexport Thu Aug  9 12:11:09 2012
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/modules/test/NWGNUopthookimport
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/test/NWGNUopthookimport?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/test/NWGNUopthookimport (original)
+++ httpd/httpd/trunk/modules/test/NWGNUopthookimport Thu Aug  9 12:11:09 2012
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 

Modified: httpd/httpd/trunk/server/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/NWGNUmakefile?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/server/NWGNUmakefile (original)
+++ httpd/httpd/trunk/server/NWGNUmakefile Thu Aug  9 12:11:09 2012
@@ -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
 

Modified: httpd/httpd/trunk/support/NWGNUab
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/support/NWGNUab?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/support/NWGNUab (original)
+++ httpd/httpd/trunk/support/NWGNUab Thu Aug  9 12:11:09 2012
@@ -51,7 +51,7 @@ endif
 
 XINCDIRS	+= \
 			$(NWOS) \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(APR)/include \
 			$(APRUTIL)/include \
 			$(APR)/misc/netware \

Modified: httpd/httpd/trunk/support/NWGNUfirehose
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/support/NWGNUfirehose?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/support/NWGNUfirehose (original)
+++ httpd/httpd/trunk/support/NWGNUfirehose Thu Aug  9 12:11:09 2012
@@ -20,7 +20,7 @@ XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
 			$(APR)/misc/netware \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(EOLIST)
 
 #

Modified: httpd/httpd/trunk/support/NWGNUhtcacheclean
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/support/NWGNUhtcacheclean?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/support/NWGNUhtcacheclean (original)
+++ httpd/httpd/trunk/support/NWGNUhtcacheclean Thu Aug  9 12:11:09 2012
@@ -19,7 +19,7 @@ XINCDIRS	+= \
 			$(STDMOD)/cache \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(APR)/misc/netware \
 			$(NWOS) \
 			$(EOLIST)

Modified: httpd/httpd/trunk/support/NWGNUlogres
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/support/NWGNUlogres?rev=1371177&r1=1371176&r2=1371177&view=diff
==============================================================================
--- httpd/httpd/trunk/support/NWGNUlogres (original)
+++ httpd/httpd/trunk/support/NWGNUlogres Thu Aug  9 12:11:09 2012
@@ -17,7 +17,7 @@ endif
 #
 XINCDIRS	+= \
 			$(NWOS) \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(APR)/include \
 			$(APRUTIL)/include \
 			$(APR)/misc/netware \