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 2010/10/24 17:56:12 UTC
svn commit: r1026826 - in /httpd/httpd/branches/2.2.x: ./ build/
modules/aaa/ modules/cache/ modules/database/ modules/dav/fs/
modules/dav/lock/ modules/dav/main/ modules/debug/ modules/echo/
modules/experimental/ modules/filters/ modules/generators/ m...
Author: fuankg
Date: Sun Oct 24 15:56:10 2010
New Revision: 1026826
URL: http://svn.apache.org/viewvc?rev=1026826&view=rev
Log:
Another NetWare makefile cleanup.
Modified:
httpd/httpd/branches/2.2.x/NWGNUmakefile
httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc
httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthbasc
httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthdigt
httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthnalias
httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthnano
httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthndbd
httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthndbm
httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthndef
httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthnfil
httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthnzldap
httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthzdbm
httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthzdef
httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthzgrp
httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthzusr
httpd/httpd/branches/2.2.x/modules/cache/NWGNUdsk_cach
httpd/httpd/branches/2.2.x/modules/cache/NWGNUmem_cach
httpd/httpd/branches/2.2.x/modules/cache/NWGNUmod_cach
httpd/httpd/branches/2.2.x/modules/database/NWGNUmakefile
httpd/httpd/branches/2.2.x/modules/dav/fs/NWGNUmakefile
httpd/httpd/branches/2.2.x/modules/dav/lock/NWGNUmakefile
httpd/httpd/branches/2.2.x/modules/dav/main/NWGNUmakefile
httpd/httpd/branches/2.2.x/modules/debug/NWGNUmodbucketeer
httpd/httpd/branches/2.2.x/modules/debug/NWGNUmoddumpio
httpd/httpd/branches/2.2.x/modules/echo/NWGNUmakefile
httpd/httpd/branches/2.2.x/modules/experimental/NWGNUcase_flt
httpd/httpd/branches/2.2.x/modules/experimental/NWGNUcase_flt_in
httpd/httpd/branches/2.2.x/modules/experimental/NWGNUexample
httpd/httpd/branches/2.2.x/modules/filters/NWGNUcharsetl
httpd/httpd/branches/2.2.x/modules/filters/NWGNUdeflate
httpd/httpd/branches/2.2.x/modules/filters/NWGNUextfiltr
httpd/httpd/branches/2.2.x/modules/filters/NWGNUmod_filter
httpd/httpd/branches/2.2.x/modules/filters/NWGNUreqtimeout
httpd/httpd/branches/2.2.x/modules/filters/NWGNUsubstitute
httpd/httpd/branches/2.2.x/modules/generators/NWGNUautoindex
httpd/httpd/branches/2.2.x/modules/generators/NWGNUinfo
httpd/httpd/branches/2.2.x/modules/generators/NWGNUmod_asis
httpd/httpd/branches/2.2.x/modules/generators/NWGNUmod_cgi
httpd/httpd/branches/2.2.x/modules/generators/NWGNUstatus
httpd/httpd/branches/2.2.x/modules/ldap/NWGNUmakefile
httpd/httpd/branches/2.2.x/modules/loggers/NWGNUforensic
httpd/httpd/branches/2.2.x/modules/loggers/NWGNUmodlogio
httpd/httpd/branches/2.2.x/modules/mappers/NWGNUactions
httpd/httpd/branches/2.2.x/modules/mappers/NWGNUimagemap
httpd/httpd/branches/2.2.x/modules/mappers/NWGNUrewrite
httpd/httpd/branches/2.2.x/modules/mappers/NWGNUspeling
httpd/httpd/branches/2.2.x/modules/mappers/NWGNUuserdir
httpd/httpd/branches/2.2.x/modules/mappers/NWGNUvhost
httpd/httpd/branches/2.2.x/modules/metadata/NWGNUcernmeta
httpd/httpd/branches/2.2.x/modules/metadata/NWGNUexpires
httpd/httpd/branches/2.2.x/modules/metadata/NWGNUheaders
httpd/httpd/branches/2.2.x/modules/metadata/NWGNUmimemagi
httpd/httpd/branches/2.2.x/modules/metadata/NWGNUmodident
httpd/httpd/branches/2.2.x/modules/metadata/NWGNUmodversion
httpd/httpd/branches/2.2.x/modules/metadata/NWGNUuniqueid
httpd/httpd/branches/2.2.x/modules/metadata/NWGNUusertrk
httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxy
httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxyajp
httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxybalancer
httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxycon
httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxyftp
httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxyhtp
httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxyscgi
httpd/httpd/branches/2.2.x/modules/ssl/NWGNUmakefile
httpd/httpd/branches/2.2.x/srclib/pcre/NWGNUmakefile
Modified: httpd/httpd/branches/2.2.x/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/NWGNUmakefile?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/NWGNUmakefile (original)
+++ httpd/httpd/branches/2.2.x/NWGNUmakefile Sun Oct 24 15:56:10 2010
@@ -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)
Modified: httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc (original)
+++ httpd/httpd/branches/2.2.x/build/NWGNUenvironment.inc Sun Oct 24 15:56:10 2010
@@ -181,6 +181,10 @@ WIN_CFLAGS += -lMSL_All_x86.lib -lkernel
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
Modified: httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthbasc
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthbasc?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthbasc (original)
+++ httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthbasc Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthdigt
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthdigt?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthdigt (original)
+++ httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthdigt Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthnalias
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthnalias?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthnalias (original)
+++ httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthnalias Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthnano
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthnano?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthnano (original)
+++ httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthnano Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthndbd
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthndbd?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthndbd (original)
+++ httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthndbd Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthndbm
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthndbm?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthndbm (original)
+++ httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthndbm Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthndef
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthndef?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthndef (original)
+++ httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthndef Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthnfil
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthnfil?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthnfil (original)
+++ httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthnfil Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthnzldap
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthnzldap?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthnzldap (original)
+++ httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthnzldap Sun Oct 24 15:56:10 2010
@@ -16,11 +16,10 @@ endif
# INCDIRS
#
XINCDIRS += \
- $(AP_WORK)/include \
- $(NWOS) \
$(APR)/include \
$(APRUTIL)/include \
- $(APR) \
+ $(AP_WORK)/include \
+ $(NWOS) \
$(EOLIST)
#
Modified: httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthzdbm
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthzdbm?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthzdbm (original)
+++ httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthzdbm Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthzdef
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthzdef?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthzdef (original)
+++ httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthzdef Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthzgrp
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthzgrp?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthzgrp (original)
+++ httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthzgrp Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthzusr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthzusr?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthzusr (original)
+++ httpd/httpd/branches/2.2.x/modules/aaa/NWGNUauthzusr Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/cache/NWGNUdsk_cach
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/cache/NWGNUdsk_cach?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/cache/NWGNUdsk_cach (original)
+++ httpd/httpd/branches/2.2.x/modules/cache/NWGNUdsk_cach Sun Oct 24 15:56:10 2010
@@ -26,8 +26,8 @@ XINCDIRS += \
$(APR)/include \
$(APRUTIL)/include \
$(AP_WORK)/include \
- $(AP_WORK)/server/mpm/NetWare \
$(NWOS) \
+ $(SERVER)/mpm/NetWare \
$(EOLIST)
#
Modified: httpd/httpd/branches/2.2.x/modules/cache/NWGNUmem_cach
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/cache/NWGNUmem_cach?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/cache/NWGNUmem_cach (original)
+++ httpd/httpd/branches/2.2.x/modules/cache/NWGNUmem_cach Sun Oct 24 15:56:10 2010
@@ -26,8 +26,8 @@ XINCDIRS += \
$(APR)/include \
$(APRUTIL)/include \
$(AP_WORK)/include \
- $(AP_WORK)/server/mpm/NetWare \
$(NWOS) \
+ $(SERVER)/mpm/NetWare \
$(EOLIST)
#
Modified: httpd/httpd/branches/2.2.x/modules/cache/NWGNUmod_cach
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/cache/NWGNUmod_cach?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/cache/NWGNUmod_cach (original)
+++ httpd/httpd/branches/2.2.x/modules/cache/NWGNUmod_cach Sun Oct 24 15:56:10 2010
@@ -26,8 +26,8 @@ XINCDIRS += \
$(APR)/include \
$(APRUTIL)/include \
$(AP_WORK)/include \
- $(AP_WORK)/server/mpm/NetWare \
$(NWOS) \
+ $(SERVER)/mpm/NetWare \
$(EOLIST)
#
Modified: httpd/httpd/branches/2.2.x/modules/database/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/database/NWGNUmakefile?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/database/NWGNUmakefile (original)
+++ httpd/httpd/branches/2.2.x/modules/database/NWGNUmakefile Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/dav/fs/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/dav/fs/NWGNUmakefile?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/dav/fs/NWGNUmakefile (original)
+++ httpd/httpd/branches/2.2.x/modules/dav/fs/NWGNUmakefile Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/dav/lock/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/dav/lock/NWGNUmakefile?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/dav/lock/NWGNUmakefile (original)
+++ httpd/httpd/branches/2.2.x/modules/dav/lock/NWGNUmakefile Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/dav/main/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/dav/main/NWGNUmakefile?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/dav/main/NWGNUmakefile (original)
+++ httpd/httpd/branches/2.2.x/modules/dav/main/NWGNUmakefile Sun Oct 24 15:56:10 2010
@@ -26,8 +26,8 @@ XINCDIRS += \
$(APR)/include \
$(APRUTIL)/include \
$(AP_WORK)/include \
- $(AP_WORK)/server/mpm/NetWare \
$(NWOS) \
+ $(SERVER)/mpm/NetWare \
$(EOLIST)
#
Modified: httpd/httpd/branches/2.2.x/modules/debug/NWGNUmodbucketeer
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/debug/NWGNUmodbucketeer?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/debug/NWGNUmodbucketeer (original)
+++ httpd/httpd/branches/2.2.x/modules/debug/NWGNUmodbucketeer Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/debug/NWGNUmoddumpio
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/debug/NWGNUmoddumpio?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/debug/NWGNUmoddumpio (original)
+++ httpd/httpd/branches/2.2.x/modules/debug/NWGNUmoddumpio Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/echo/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/echo/NWGNUmakefile?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/echo/NWGNUmakefile (original)
+++ httpd/httpd/branches/2.2.x/modules/echo/NWGNUmakefile Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/experimental/NWGNUcase_flt
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/experimental/NWGNUcase_flt?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/experimental/NWGNUcase_flt (original)
+++ httpd/httpd/branches/2.2.x/modules/experimental/NWGNUcase_flt Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/experimental/NWGNUcase_flt_in
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/experimental/NWGNUcase_flt_in?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/experimental/NWGNUcase_flt_in (original)
+++ httpd/httpd/branches/2.2.x/modules/experimental/NWGNUcase_flt_in Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/experimental/NWGNUexample
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/experimental/NWGNUexample?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/experimental/NWGNUexample (original)
+++ httpd/httpd/branches/2.2.x/modules/experimental/NWGNUexample Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/filters/NWGNUcharsetl
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/filters/NWGNUcharsetl?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/filters/NWGNUcharsetl (original)
+++ httpd/httpd/branches/2.2.x/modules/filters/NWGNUcharsetl Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/filters/NWGNUdeflate
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/filters/NWGNUdeflate?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/filters/NWGNUdeflate (original)
+++ httpd/httpd/branches/2.2.x/modules/filters/NWGNUdeflate Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/filters/NWGNUextfiltr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/filters/NWGNUextfiltr?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/filters/NWGNUextfiltr (original)
+++ httpd/httpd/branches/2.2.x/modules/filters/NWGNUextfiltr Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/filters/NWGNUmod_filter
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/filters/NWGNUmod_filter?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/filters/NWGNUmod_filter (original)
+++ httpd/httpd/branches/2.2.x/modules/filters/NWGNUmod_filter Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/filters/NWGNUreqtimeout
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/filters/NWGNUreqtimeout?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/filters/NWGNUreqtimeout (original)
+++ httpd/httpd/branches/2.2.x/modules/filters/NWGNUreqtimeout Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/filters/NWGNUsubstitute
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/filters/NWGNUsubstitute?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/filters/NWGNUsubstitute (original)
+++ httpd/httpd/branches/2.2.x/modules/filters/NWGNUsubstitute Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/generators/NWGNUautoindex
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/generators/NWGNUautoindex?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/generators/NWGNUautoindex (original)
+++ httpd/httpd/branches/2.2.x/modules/generators/NWGNUautoindex Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/generators/NWGNUinfo
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/generators/NWGNUinfo?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/generators/NWGNUinfo (original)
+++ httpd/httpd/branches/2.2.x/modules/generators/NWGNUinfo Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/generators/NWGNUmod_asis
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/generators/NWGNUmod_asis?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/generators/NWGNUmod_asis (original)
+++ httpd/httpd/branches/2.2.x/modules/generators/NWGNUmod_asis Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/generators/NWGNUmod_cgi
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/generators/NWGNUmod_cgi?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/generators/NWGNUmod_cgi (original)
+++ httpd/httpd/branches/2.2.x/modules/generators/NWGNUmod_cgi Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/generators/NWGNUstatus
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/generators/NWGNUstatus?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/generators/NWGNUstatus (original)
+++ httpd/httpd/branches/2.2.x/modules/generators/NWGNUstatus Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/ldap/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/ldap/NWGNUmakefile?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/ldap/NWGNUmakefile (original)
+++ httpd/httpd/branches/2.2.x/modules/ldap/NWGNUmakefile Sun Oct 24 15:56:10 2010
@@ -16,11 +16,10 @@ endif
# INCDIRS
#
XINCDIRS += \
- $(AP_WORK)/include \
- $(NWOS) \
$(APR)/include \
$(APRUTIL)/include \
- $(APR) \
+ $(AP_WORK)/include \
+ $(NWOS) \
$(LDAPSDK)/inc \
$(EOLIST)
Modified: httpd/httpd/branches/2.2.x/modules/loggers/NWGNUforensic
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/loggers/NWGNUforensic?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/loggers/NWGNUforensic (original)
+++ httpd/httpd/branches/2.2.x/modules/loggers/NWGNUforensic Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/loggers/NWGNUmodlogio
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/loggers/NWGNUmodlogio?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/loggers/NWGNUmodlogio (original)
+++ httpd/httpd/branches/2.2.x/modules/loggers/NWGNUmodlogio Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/mappers/NWGNUactions
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/mappers/NWGNUactions?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/mappers/NWGNUactions (original)
+++ httpd/httpd/branches/2.2.x/modules/mappers/NWGNUactions Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/mappers/NWGNUimagemap
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/mappers/NWGNUimagemap?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/mappers/NWGNUimagemap (original)
+++ httpd/httpd/branches/2.2.x/modules/mappers/NWGNUimagemap Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/mappers/NWGNUrewrite
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/mappers/NWGNUrewrite?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/mappers/NWGNUrewrite (original)
+++ httpd/httpd/branches/2.2.x/modules/mappers/NWGNUrewrite Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/mappers/NWGNUspeling
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/mappers/NWGNUspeling?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/mappers/NWGNUspeling (original)
+++ httpd/httpd/branches/2.2.x/modules/mappers/NWGNUspeling Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/mappers/NWGNUuserdir
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/mappers/NWGNUuserdir?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/mappers/NWGNUuserdir (original)
+++ httpd/httpd/branches/2.2.x/modules/mappers/NWGNUuserdir Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/mappers/NWGNUvhost
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/mappers/NWGNUvhost?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/mappers/NWGNUvhost (original)
+++ httpd/httpd/branches/2.2.x/modules/mappers/NWGNUvhost Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/metadata/NWGNUcernmeta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/metadata/NWGNUcernmeta?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/metadata/NWGNUcernmeta (original)
+++ httpd/httpd/branches/2.2.x/modules/metadata/NWGNUcernmeta Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/metadata/NWGNUexpires
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/metadata/NWGNUexpires?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/metadata/NWGNUexpires (original)
+++ httpd/httpd/branches/2.2.x/modules/metadata/NWGNUexpires Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/metadata/NWGNUheaders
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/metadata/NWGNUheaders?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/metadata/NWGNUheaders (original)
+++ httpd/httpd/branches/2.2.x/modules/metadata/NWGNUheaders Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/metadata/NWGNUmimemagi
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/metadata/NWGNUmimemagi?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/metadata/NWGNUmimemagi (original)
+++ httpd/httpd/branches/2.2.x/modules/metadata/NWGNUmimemagi Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/metadata/NWGNUmodident
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/metadata/NWGNUmodident?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/metadata/NWGNUmodident (original)
+++ httpd/httpd/branches/2.2.x/modules/metadata/NWGNUmodident Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/metadata/NWGNUmodversion
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/metadata/NWGNUmodversion?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/metadata/NWGNUmodversion (original)
+++ httpd/httpd/branches/2.2.x/modules/metadata/NWGNUmodversion Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/metadata/NWGNUuniqueid
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/metadata/NWGNUuniqueid?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/metadata/NWGNUuniqueid (original)
+++ httpd/httpd/branches/2.2.x/modules/metadata/NWGNUuniqueid Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/metadata/NWGNUusertrk
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/metadata/NWGNUusertrk?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/metadata/NWGNUusertrk (original)
+++ httpd/httpd/branches/2.2.x/modules/metadata/NWGNUusertrk Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxy
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxy?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxy (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxy Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxyajp
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxyajp?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxyajp (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxyajp Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxybalancer
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxybalancer?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxybalancer (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxybalancer Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxycon
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxycon?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxycon (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxycon Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxyftp
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxyftp?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxyftp (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxyftp Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxyhtp
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxyhtp?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxyhtp (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxyhtp Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxyscgi
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxyscgi?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxyscgi (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/NWGNUproxyscgi Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/modules/ssl/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/ssl/NWGNUmakefile?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/ssl/NWGNUmakefile (original)
+++ httpd/httpd/branches/2.2.x/modules/ssl/NWGNUmakefile Sun Oct 24 15:56:10 2010
@@ -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)
#
Modified: httpd/httpd/branches/2.2.x/srclib/pcre/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/srclib/pcre/NWGNUmakefile?rev=1026826&r1=1026825&r2=1026826&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/srclib/pcre/NWGNUmakefile (original)
+++ httpd/httpd/branches/2.2.x/srclib/pcre/NWGNUmakefile Sun Oct 24 15:56:10 2010
@@ -36,7 +36,7 @@ $(PCRE)/%.h: $(subst /,\,$(PCRE))\%.hw
# INCDIRS
#
XINCDIRS += \
- $(AP_WORK)/os/netware \
+ $(NWOS) \
$(APR)/include/arch/netware \
$(EOLIST)