You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by bn...@apache.org on 2004/11/30 01:12:40 UTC
svn commit: r106975 - in httpd/httpd/trunk: . build modules/aaa modules/cache modules/dav/fs modules/dav/lock modules/dav/main modules/echo modules/experimental modules/filters modules/generators modules/ldap modules/loggers modules/mappers modules/metadata modules/proxy support
Author: bnicholes
Date: Mon Nov 29 16:12:39 2004
New Revision: 106975
URL: http://svn.apache.org/viewcvs?view=rev&rev=106975
Log:
Allow APR to exist and build outside of the httpd/srclib file structure
Modified:
httpd/httpd/trunk/NWGNUmakefile
httpd/httpd/trunk/build/NWGNUenvironment.inc
httpd/httpd/trunk/build/NWGNUmakefile
httpd/httpd/trunk/modules/aaa/NWGNUauthbasc
httpd/httpd/trunk/modules/aaa/NWGNUauthdigt
httpd/httpd/trunk/modules/aaa/NWGNUauthnano
httpd/httpd/trunk/modules/aaa/NWGNUauthndbm
httpd/httpd/trunk/modules/aaa/NWGNUauthndef
httpd/httpd/trunk/modules/aaa/NWGNUauthnfil
httpd/httpd/trunk/modules/aaa/NWGNUauthnzldap
httpd/httpd/trunk/modules/aaa/NWGNUauthzdbm
httpd/httpd/trunk/modules/aaa/NWGNUauthzdef
httpd/httpd/trunk/modules/aaa/NWGNUauthzgrp
httpd/httpd/trunk/modules/aaa/NWGNUauthzusr
httpd/httpd/trunk/modules/cache/NWGNUdsk_cach
httpd/httpd/trunk/modules/cache/NWGNUmem_cach
httpd/httpd/trunk/modules/cache/NWGNUmod_cach
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/echo/NWGNUmakefile
httpd/httpd/trunk/modules/experimental/NWGNUcharsetl
httpd/httpd/trunk/modules/experimental/NWGNUexample
httpd/httpd/trunk/modules/experimental/NWGNUmod_filter
httpd/httpd/trunk/modules/filters/NWGNUdeflate
httpd/httpd/trunk/modules/filters/NWGNUextfiltr
httpd/httpd/trunk/modules/generators/NWGNUinfo
httpd/httpd/trunk/modules/generators/NWGNUstatus
httpd/httpd/trunk/modules/ldap/NWGNUmakefile
httpd/httpd/trunk/modules/loggers/NWGNUforensic
httpd/httpd/trunk/modules/loggers/NWGNUmodlogio
httpd/httpd/trunk/modules/mappers/NWGNUrewrite
httpd/httpd/trunk/modules/mappers/NWGNUspeling
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/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/NWGNUproxyftp
httpd/httpd/trunk/modules/proxy/NWGNUproxyhtp
httpd/httpd/trunk/support/NWGNUab
httpd/httpd/trunk/support/NWGNUhtcacheclean
httpd/httpd/trunk/support/NWGNUhtdbm
httpd/httpd/trunk/support/NWGNUhtdigest
httpd/httpd/trunk/support/NWGNUhtpasswd
httpd/httpd/trunk/support/NWGNUlogres
httpd/httpd/trunk/support/NWGNUrotlogs
Modified: httpd/httpd/trunk/NWGNUmakefile
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/NWGNUmakefile?view=diff&rev=106975&p1=httpd/httpd/trunk/NWGNUmakefile&r1=106974&p2=httpd/httpd/trunk/NWGNUmakefile&r2=106975
==============================================================================
--- httpd/httpd/trunk/NWGNUmakefile (original)
+++ httpd/httpd/trunk/NWGNUmakefile Mon Nov 29 16:12:39 2004
@@ -3,7 +3,7 @@
#
SUBDIRS = \
- srclib\apr \
+ $(APR_WORK) \
build \
support \
modules \
@@ -28,9 +28,8 @@
# INCDIRS
#
XINCDIRS += \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/include/arch/NetWare \
- $(AP_WORK)/srclib/apr-util/include \
+ $(APR)/include \
+ $(APRUTIL)/include \
$(AP_WORK)/include \
$(AP_WORK)/modules/filters/ \
$(AP_WORK)/modules/generators/ \
Modified: httpd/httpd/trunk/build/NWGNUenvironment.inc
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/build/NWGNUenvironment.inc?view=diff&rev=106975&p1=httpd/httpd/trunk/build/NWGNUenvironment.inc&r1=106974&p2=httpd/httpd/trunk/build/NWGNUenvironment.inc&r2=106975
==============================================================================
--- httpd/httpd/trunk/build/NWGNUenvironment.inc (original)
+++ httpd/httpd/trunk/build/NWGNUenvironment.inc Mon Nov 29 16:12:39 2004
@@ -268,12 +268,12 @@
STDMOD = $(AP_WORK)/modules
NWOS = $(AP_WORK)/os/netware
SERVER = $(AP_WORK)/server
-SRC = $(AP_WORK)
-APR = $(AP_WORK)/srclib/apr
-APRUTIL = $(AP_WORK)/srclib/apr-util
+SRC = $(AP_WORK)
+APR = $(APR_WORK)
+APRUTIL = $(APR_WORK)/../apr-util
SUPMOD = $(AP_WORK)/support
PCRE = $(AP_WORK)/srclib/pcre
-APRTEST = $(AP_WORK)/srclib/apr/test
+APRTEST = $(APR_WORK)/test
HTTPD = $(AP_WORK)/modules/http
XML = $(AP_WORK)/srclib/apr-util/xml
Modified: httpd/httpd/trunk/build/NWGNUmakefile
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/build/NWGNUmakefile?view=diff&rev=106975&p1=httpd/httpd/trunk/build/NWGNUmakefile&r1=106974&p2=httpd/httpd/trunk/build/NWGNUmakefile&r2=106975
==============================================================================
--- httpd/httpd/trunk/build/NWGNUmakefile (original)
+++ httpd/httpd/trunk/build/NWGNUmakefile Mon Nov 29 16:12:39 2004
@@ -46,8 +46,8 @@
@echo -I..\modules\aaa >> $@
@echo -I..\os\netware >> $@
@echo -I..\server\mpm\netware >> $@
- @echo -I..\srclib\apr\include >> $@
- @echo -I..\srclib\apr-util\include >> $@
+ @echo -I$(APR_WORK)\include >> $@
+ @echo -I$(APRUTIL)\include >> $@
@echo -ir $(NOVELLLIBC) >> $@
$(APR)/include/%.h: $(subst /,\,$(APR))\include\%.hnw
Modified: httpd/httpd/trunk/modules/aaa/NWGNUauthbasc
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/aaa/NWGNUauthbasc?view=diff&rev=106975&p1=httpd/httpd/trunk/modules/aaa/NWGNUauthbasc&r1=106974&p2=httpd/httpd/trunk/modules/aaa/NWGNUauthbasc&r2=106975
==============================================================================
--- httpd/httpd/trunk/modules/aaa/NWGNUauthbasc (original)
+++ httpd/httpd/trunk/modules/aaa/NWGNUauthbasc Mon Nov 29 16:12:39 2004
@@ -19,9 +19,9 @@
$(AP_WORK)/include \
$(NWOS) \
$(AP_WORK)/modules/arch/netware \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
+ $(APR)/include \
+ $(APRUTIL)/include \
+ $(APR) \
$(EOLIST)
#
Modified: httpd/httpd/trunk/modules/aaa/NWGNUauthdigt
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/aaa/NWGNUauthdigt?view=diff&rev=106975&p1=httpd/httpd/trunk/modules/aaa/NWGNUauthdigt&r1=106974&p2=httpd/httpd/trunk/modules/aaa/NWGNUauthdigt&r2=106975
==============================================================================
--- httpd/httpd/trunk/modules/aaa/NWGNUauthdigt (original)
+++ httpd/httpd/trunk/modules/aaa/NWGNUauthdigt Mon Nov 29 16:12:39 2004
@@ -19,9 +19,9 @@
$(AP_WORK)/include \
$(NWOS) \
$(AP_WORK)/modules/arch/netware \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
+ $(APR)/include \
+ $(APRUTIL)/include \
+ $(APR) \
$(EOLIST)
#
Modified: httpd/httpd/trunk/modules/aaa/NWGNUauthnano
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/aaa/NWGNUauthnano?view=diff&rev=106975&p1=httpd/httpd/trunk/modules/aaa/NWGNUauthnano&r1=106974&p2=httpd/httpd/trunk/modules/aaa/NWGNUauthnano&r2=106975
==============================================================================
--- httpd/httpd/trunk/modules/aaa/NWGNUauthnano (original)
+++ httpd/httpd/trunk/modules/aaa/NWGNUauthnano Mon Nov 29 16:12:39 2004
@@ -19,9 +19,9 @@
$(AP_WORK)/include \
$(NWOS) \
$(AP_WORK)/modules/arch/netware \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
+ $(APR)/include \
+ $(APRUTIL)/include \
+ $(APR) \
$(EOLIST)
#
Modified: httpd/httpd/trunk/modules/aaa/NWGNUauthndbm
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/aaa/NWGNUauthndbm?view=diff&rev=106975&p1=httpd/httpd/trunk/modules/aaa/NWGNUauthndbm&r1=106974&p2=httpd/httpd/trunk/modules/aaa/NWGNUauthndbm&r2=106975
==============================================================================
--- httpd/httpd/trunk/modules/aaa/NWGNUauthndbm (original)
+++ httpd/httpd/trunk/modules/aaa/NWGNUauthndbm Mon Nov 29 16:12:39 2004
@@ -19,9 +19,9 @@
$(AP_WORK)/include \
$(NWOS) \
$(AP_WORK)/modules/arch/netware \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
+ $(APR)/include \
+ $(APRUTIL)/include \
+ $(APR) \
$(EOLIST)
#
Modified: httpd/httpd/trunk/modules/aaa/NWGNUauthndef
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/aaa/NWGNUauthndef?view=diff&rev=106975&p1=httpd/httpd/trunk/modules/aaa/NWGNUauthndef&r1=106974&p2=httpd/httpd/trunk/modules/aaa/NWGNUauthndef&r2=106975
==============================================================================
--- httpd/httpd/trunk/modules/aaa/NWGNUauthndef (original)
+++ httpd/httpd/trunk/modules/aaa/NWGNUauthndef Mon Nov 29 16:12:39 2004
@@ -19,9 +19,9 @@
$(AP_WORK)/include \
$(NWOS) \
$(AP_WORK)/modules/arch/netware \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
+ $(APR)/include \
+ $(APRUTIL)/include \
+ $(APR) \
$(EOLIST)
#
Modified: httpd/httpd/trunk/modules/aaa/NWGNUauthnfil
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/aaa/NWGNUauthnfil?view=diff&rev=106975&p1=httpd/httpd/trunk/modules/aaa/NWGNUauthnfil&r1=106974&p2=httpd/httpd/trunk/modules/aaa/NWGNUauthnfil&r2=106975
==============================================================================
--- httpd/httpd/trunk/modules/aaa/NWGNUauthnfil (original)
+++ httpd/httpd/trunk/modules/aaa/NWGNUauthnfil Mon Nov 29 16:12:39 2004
@@ -19,9 +19,9 @@
$(AP_WORK)/include \
$(NWOS) \
$(AP_WORK)/modules/arch/netware \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
+ $(APR)/include \
+ $(APRUTIL)/include \
+ $(APR) \
$(EOLIST)
#
Modified: httpd/httpd/trunk/modules/aaa/NWGNUauthnzldap
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/aaa/NWGNUauthnzldap?view=diff&rev=106975&p1=httpd/httpd/trunk/modules/aaa/NWGNUauthnzldap&r1=106974&p2=httpd/httpd/trunk/modules/aaa/NWGNUauthnzldap&r2=106975
==============================================================================
--- httpd/httpd/trunk/modules/aaa/NWGNUauthnzldap (original)
+++ httpd/httpd/trunk/modules/aaa/NWGNUauthnzldap Mon Nov 29 16:12:39 2004
@@ -18,9 +18,9 @@
XINCDIRS += \
$(AP_WORK)/include \
$(NWOS) \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
+ $(APR)/include \
+ $(APRUTIL)/include \
+ $(APR) \
$(EOLIST)
#
Modified: httpd/httpd/trunk/modules/aaa/NWGNUauthzdbm
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/aaa/NWGNUauthzdbm?view=diff&rev=106975&p1=httpd/httpd/trunk/modules/aaa/NWGNUauthzdbm&r1=106974&p2=httpd/httpd/trunk/modules/aaa/NWGNUauthzdbm&r2=106975
==============================================================================
--- httpd/httpd/trunk/modules/aaa/NWGNUauthzdbm (original)
+++ httpd/httpd/trunk/modules/aaa/NWGNUauthzdbm Mon Nov 29 16:12:39 2004
@@ -19,9 +19,9 @@
$(AP_WORK)/include \
$(NWOS) \
$(AP_WORK)/modules/arch/netware \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
+ $(APR)/include \
+ $(APRUTIL)/include \
+ $(APR) \
$(EOLIST)
#
Modified: httpd/httpd/trunk/modules/aaa/NWGNUauthzdef
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/aaa/NWGNUauthzdef?view=diff&rev=106975&p1=httpd/httpd/trunk/modules/aaa/NWGNUauthzdef&r1=106974&p2=httpd/httpd/trunk/modules/aaa/NWGNUauthzdef&r2=106975
==============================================================================
--- httpd/httpd/trunk/modules/aaa/NWGNUauthzdef (original)
+++ httpd/httpd/trunk/modules/aaa/NWGNUauthzdef Mon Nov 29 16:12:39 2004
@@ -19,9 +19,9 @@
$(AP_WORK)/include \
$(NWOS) \
$(AP_WORK)/modules/arch/netware \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
+ $(APR)/include \
+ $(APRUTIL)/include \
+ $(APR) \
$(EOLIST)
#
Modified: httpd/httpd/trunk/modules/aaa/NWGNUauthzgrp
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/aaa/NWGNUauthzgrp?view=diff&rev=106975&p1=httpd/httpd/trunk/modules/aaa/NWGNUauthzgrp&r1=106974&p2=httpd/httpd/trunk/modules/aaa/NWGNUauthzgrp&r2=106975
==============================================================================
--- httpd/httpd/trunk/modules/aaa/NWGNUauthzgrp (original)
+++ httpd/httpd/trunk/modules/aaa/NWGNUauthzgrp Mon Nov 29 16:12:39 2004
@@ -19,9 +19,9 @@
$(AP_WORK)/include \
$(NWOS) \
$(AP_WORK)/modules/arch/netware \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
+ $(APR)/include \
+ $(APRUTIL)/include \
+ $(APR) \
$(EOLIST)
#
Modified: httpd/httpd/trunk/modules/aaa/NWGNUauthzusr
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/aaa/NWGNUauthzusr?view=diff&rev=106975&p1=httpd/httpd/trunk/modules/aaa/NWGNUauthzusr&r1=106974&p2=httpd/httpd/trunk/modules/aaa/NWGNUauthzusr&r2=106975
==============================================================================
--- httpd/httpd/trunk/modules/aaa/NWGNUauthzusr (original)
+++ httpd/httpd/trunk/modules/aaa/NWGNUauthzusr Mon Nov 29 16:12:39 2004
@@ -19,9 +19,9 @@
$(AP_WORK)/include \
$(NWOS) \
$(AP_WORK)/modules/arch/netware \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
+ $(APR)/include \
+ $(APRUTIL)/include \
+ $(APR) \
$(EOLIST)
#
Modified: httpd/httpd/trunk/modules/cache/NWGNUdsk_cach
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/cache/NWGNUdsk_cach?view=diff&rev=106975&p1=httpd/httpd/trunk/modules/cache/NWGNUdsk_cach&r1=106974&p2=httpd/httpd/trunk/modules/cache/NWGNUdsk_cach&r2=106975
==============================================================================
--- httpd/httpd/trunk/modules/cache/NWGNUdsk_cach (original)
+++ httpd/httpd/trunk/modules/cache/NWGNUdsk_cach Mon Nov 29 16:12:39 2004
@@ -23,9 +23,8 @@
# INCDIRS
#
XINCDIRS += \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/include/arch/NetWare \
- $(AP_WORK)/srclib/apr-util/include \
+ $(APR)/include \
+ $(APRUTIL)/include \
$(AP_WORK)/include \
$(AP_WORK)/os/NetWare \
$(AP_WORK)/server/mpm/NetWare \
Modified: httpd/httpd/trunk/modules/cache/NWGNUmem_cach
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/cache/NWGNUmem_cach?view=diff&rev=106975&p1=httpd/httpd/trunk/modules/cache/NWGNUmem_cach&r1=106974&p2=httpd/httpd/trunk/modules/cache/NWGNUmem_cach&r2=106975
==============================================================================
--- httpd/httpd/trunk/modules/cache/NWGNUmem_cach (original)
+++ httpd/httpd/trunk/modules/cache/NWGNUmem_cach Mon Nov 29 16:12:39 2004
@@ -23,9 +23,8 @@
# INCDIRS
#
XINCDIRS += \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/include/arch/NetWare \
- $(AP_WORK)/srclib/apr-util/include \
+ $(APR)/include \
+ $(APRUTIL)/include \
$(AP_WORK)/include \
$(AP_WORK)/os/NetWare \
$(AP_WORK)/server/mpm/NetWare \
Modified: httpd/httpd/trunk/modules/cache/NWGNUmod_cach
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/cache/NWGNUmod_cach?view=diff&rev=106975&p1=httpd/httpd/trunk/modules/cache/NWGNUmod_cach&r1=106974&p2=httpd/httpd/trunk/modules/cache/NWGNUmod_cach&r2=106975
==============================================================================
--- httpd/httpd/trunk/modules/cache/NWGNUmod_cach (original)
+++ httpd/httpd/trunk/modules/cache/NWGNUmod_cach Mon Nov 29 16:12:39 2004
@@ -23,9 +23,8 @@
# INCDIRS
#
XINCDIRS += \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/include/arch/NetWare \
- $(AP_WORK)/srclib/apr-util/include \
+ $(APR)/include \
+ $(APRUTIL)/include \
$(AP_WORK)/include \
$(AP_WORK)/os/NetWare \
$(AP_WORK)/server/mpm/NetWare \
Modified: httpd/httpd/trunk/modules/dav/fs/NWGNUmakefile
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/dav/fs/NWGNUmakefile?view=diff&rev=106975&p1=httpd/httpd/trunk/modules/dav/fs/NWGNUmakefile&r1=106974&p2=httpd/httpd/trunk/modules/dav/fs/NWGNUmakefile&r2=106975
==============================================================================
--- httpd/httpd/trunk/modules/dav/fs/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/dav/fs/NWGNUmakefile Mon Nov 29 16:12:39 2004
@@ -24,9 +24,8 @@
# INCDIRS
#
XINCDIRS += \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/include/arch/NetWare \
- $(AP_WORK)/srclib/apr-util/include \
+ $(APR)/include \
+ $(APRUTIL)/include \
$(AP_WORK)/include \
$(AP_WORK)/os/NetWare \
$(AP_WORK)/server/mpm/NetWare \
Modified: httpd/httpd/trunk/modules/dav/lock/NWGNUmakefile
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/dav/lock/NWGNUmakefile?view=diff&rev=106975&p1=httpd/httpd/trunk/modules/dav/lock/NWGNUmakefile&r1=106974&p2=httpd/httpd/trunk/modules/dav/lock/NWGNUmakefile&r2=106975
==============================================================================
--- httpd/httpd/trunk/modules/dav/lock/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/dav/lock/NWGNUmakefile Mon Nov 29 16:12:39 2004
@@ -24,9 +24,8 @@
# INCDIRS
#
XINCDIRS += \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/include/arch/NetWare \
- $(AP_WORK)/srclib/apr-util/include \
+ $(APR)/include \
+ $(APRUTIL)/include \
$(AP_WORK)/include \
$(AP_WORK)/os/NetWare \
$(AP_WORK)/server/mpm/NetWare \
Modified: httpd/httpd/trunk/modules/dav/main/NWGNUmakefile
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/dav/main/NWGNUmakefile?view=diff&rev=106975&p1=httpd/httpd/trunk/modules/dav/main/NWGNUmakefile&r1=106974&p2=httpd/httpd/trunk/modules/dav/main/NWGNUmakefile&r2=106975
==============================================================================
--- httpd/httpd/trunk/modules/dav/main/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/dav/main/NWGNUmakefile Mon Nov 29 16:12:39 2004
@@ -23,9 +23,8 @@
# INCDIRS
#
XINCDIRS += \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/include/arch/NetWare \
- $(AP_WORK)/srclib/apr-util/include \
+ $(APR)/include \
+ $(APRUTIL)/include \
$(AP_WORK)/include \
$(AP_WORK)/os/NetWare \
$(AP_WORK)/server/mpm/NetWare \
Modified: httpd/httpd/trunk/modules/echo/NWGNUmakefile
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/echo/NWGNUmakefile?view=diff&rev=106975&p1=httpd/httpd/trunk/modules/echo/NWGNUmakefile&r1=106974&p2=httpd/httpd/trunk/modules/echo/NWGNUmakefile&r2=106975
==============================================================================
--- httpd/httpd/trunk/modules/echo/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/echo/NWGNUmakefile Mon Nov 29 16:12:39 2004
@@ -27,9 +27,9 @@
$(AP_WORK)/include \
$(NWOS) \
$(AP_WORK)/modules/arch/netware \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
+ $(APR)/include \
+ $(APRUTIL)/include \
+ $(APR) \
$(EOLIST)
#
Modified: httpd/httpd/trunk/modules/experimental/NWGNUcharsetl
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/experimental/NWGNUcharsetl?view=diff&rev=106975&p1=httpd/httpd/trunk/modules/experimental/NWGNUcharsetl&r1=106974&p2=httpd/httpd/trunk/modules/experimental/NWGNUcharsetl&r2=106975
==============================================================================
--- httpd/httpd/trunk/modules/experimental/NWGNUcharsetl (original)
+++ httpd/httpd/trunk/modules/experimental/NWGNUcharsetl Mon Nov 29 16:12:39 2004
@@ -27,9 +27,9 @@
$(AP_WORK)/include \
$(NWOS) \
$(AP_WORK)/modules/arch/netware \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
+ $(APR)/include \
+ $(APRUTIL)/include \
+ $(APR) \
$(EOLIST)
#
Modified: httpd/httpd/trunk/modules/experimental/NWGNUexample
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/experimental/NWGNUexample?view=diff&rev=106975&p1=httpd/httpd/trunk/modules/experimental/NWGNUexample&r1=106974&p2=httpd/httpd/trunk/modules/experimental/NWGNUexample&r2=106975
==============================================================================
--- httpd/httpd/trunk/modules/experimental/NWGNUexample (original)
+++ httpd/httpd/trunk/modules/experimental/NWGNUexample Mon Nov 29 16:12:39 2004
@@ -27,9 +27,9 @@
$(AP_WORK)/include \
$(NWOS) \
$(AP_WORK)/modules/arch/netware \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
+ $(APR)/include \
+ $(APRUTIL)/include \
+ $(APR) \
$(EOLIST)
#
Modified: httpd/httpd/trunk/modules/experimental/NWGNUmod_filter
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/experimental/NWGNUmod_filter?view=diff&rev=106975&p1=httpd/httpd/trunk/modules/experimental/NWGNUmod_filter&r1=106974&p2=httpd/httpd/trunk/modules/experimental/NWGNUmod_filter&r2=106975
==============================================================================
--- httpd/httpd/trunk/modules/experimental/NWGNUmod_filter (original)
+++ httpd/httpd/trunk/modules/experimental/NWGNUmod_filter Mon Nov 29 16:12:39 2004
@@ -1,250 +1,250 @@
-#
-# Make sure all needed macro's are defined
-#
-
-#
-# Get the 'head' of the build environment if necessary. This includes default
-# targets and paths to tools
-#
-
-ifndef EnvironmentDefined
-include $(AP_WORK)\build\NWGNUhead.inc
-endif
-
-#
-# These directories will be at the beginning of the include list, followed by
-# INCDIRS
-#
-XINCDIRS += \
- $(AP_WORK)/include \
- $(NWOS) \
- $(AP_WORK)/modules/arch/netware \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
- $(EOLIST)
-
-#
-# These flags will come after CFLAGS
-#
-XCFLAGS += \
- -prefix pre_nw.h \
- $(EOLIST)
-
-#
-# These defines will come after DEFINES
-#
-XDEFINES += \
- $(EOLIST)
-
-#
-# These flags will be added to the link.opt file
-#
-XLFLAGS += \
- $(EOLIST)
-
-#
-# These values will be appended to the correct variables based on the value of
-# RELEASE
-#
-ifeq "$(RELEASE)" "debug"
-XINCDIRS += \
- $(EOLIST)
-
-XCFLAGS += \
- $(EOLIST)
-
-XDEFINES += \
- $(EOLIST)
-
-XLFLAGS += \
- $(EOLIST)
-endif
-
-ifeq "$(RELEASE)" "noopt"
-XINCDIRS += \
- $(EOLIST)
-
-XCFLAGS += \
- $(EOLIST)
-
-XDEFINES += \
- $(EOLIST)
-
-XLFLAGS += \
- $(EOLIST)
-endif
-
-ifeq "$(RELEASE)" "release"
-XINCDIRS += \
- $(EOLIST)
-
-XCFLAGS += \
- $(EOLIST)
-
-XDEFINES += \
- $(EOLIST)
-
-XLFLAGS += \
- $(EOLIST)
-endif
-
-#
-# These are used by the link target if an NLM is being generated
-# This is used by the link 'name' directive to name the nlm. If left blank
-# TARGET_nlm (see below) will be used.
-#
-NLM_NAME = mod_filter
-
-#
-# This is used by the link '-desc ' directive.
-# If left blank, NLM_NAME will be used.
-#
-NLM_DESCRIPTION = Apache $(VERSION_STR) Filter Module
-
-#
-# This is used by the '-threadname' directive. If left blank,
-# NLM_NAME Thread will be used.
-#
-NLM_THREAD_NAME = Filter Module
-
-#
-# If this is specified, it will override VERSION value in
-# $(AP_WORK)\build\NWGNUenvironment.inc
-#
-NLM_VERSION =
-
-#
-# If this is specified, it will override the default of 64K
-#
-NLM_STACK_SIZE = 8192
-
-
-#
-# If this is specified it will be used by the link '-entry' directive
-#
-NLM_ENTRY_SYM = _LibCPrelude
-
-#
-# If this is specified it will be used by the link '-exit' directive
-#
-NLM_EXIT_SYM = _LibCPostlude
-
-#
-# If this is specified it will be used by the link '-check' directive
-#
-NLM_CHECK_SYM =
-
-#
-# If these are specified it will be used by the link '-flags' directive
-#
-NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION
-
-#
-# If this is specified it will be linked in with the XDCData option in the def
-# file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled
-# by setting APACHE_UNIPROC in the environment
-#
-XDCDATA =
-
-#
-# If there is an NLM target, put it here
-#
-TARGET_nlm = \
- $(OBJDIR)/mod_filter.nlm \
- $(EOLIST)
-
-#
-# If there is an LIB target, put it here
-#
-TARGET_lib = \
- $(EOLIST)
-
-#
-# These are the OBJ files needed to create the NLM target above.
-# Paths must all use the '/' character
-#
-FILES_nlm_objs = \
- $(OBJDIR)/mod_filter.o \
- $(EOLIST)
-
-#
-# These are the LIB files needed to create the NLM target above.
-# These will be added as a library command in the link.opt file.
-#
-FILES_nlm_libs = \
- libcpre.o \
- $(EOLIST)
-
-#
-# These are the modules that the above NLM target depends on to load.
-# These will be added as a module command in the link.opt file.
-#
-FILES_nlm_modules = \
- aprlib \
- libc \
- $(EOLIST)
-
-#
-# If the nlm has a msg file, put it's path here
-#
-FILE_nlm_msg =
-
-#
-# If the nlm has a hlp file put it's path here
-#
-FILE_nlm_hlp =
-
-#
-# If this is specified, it will override $(NWOS)\copyright.txt.
-#
-FILE_nlm_copyright =
-
-#
-# Any additional imports go here
-#
-FILES_nlm_Ximports = \
- @$(APR)/aprlib.imp \
- @$(NWOS)/httpd.imp \
- @libc.imp \
- $(EOLIST)
-
-#
-# Any symbols exported to here
-#
-FILES_nlm_exports = \
- filter_module \
- $(EOLIST)
-
-#
-# These are the OBJ files needed to create the LIB target above.
-# Paths must all use the '/' character
-#
-FILES_lib_objs = \
- $(EOLIST)
-
-#
-# implement targets and dependancies (leave this section alone)
-#
-
-libs :: $(OBJDIR) $(TARGET_lib)
-
-nlms :: libs $(TARGET_nlm)
-
-#
-# Updated this target to create necessary directories and copy files to the
-# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples)
-#
-install :: nlms FORCE
-
-#
-# Any specialized rules here
-#
-
-#
-# Include the 'tail' makefile that has targets that depend on variables defined
-# in this makefile
-#
-
-include $(AP_WORK)\build\NWGNUtail.inc
-
+#
+# Make sure all needed macro's are defined
+#
+
+#
+# Get the 'head' of the build environment if necessary. This includes default
+# targets and paths to tools
+#
+
+ifndef EnvironmentDefined
+include $(AP_WORK)\build\NWGNUhead.inc
+endif
+
+#
+# These directories will be at the beginning of the include list, followed by
+# INCDIRS
+#
+XINCDIRS += \
+ $(AP_WORK)/include \
+ $(NWOS) \
+ $(AP_WORK)/modules/arch/netware \
+ $(APR)/include \
+ $(APRUTIL)/include \
+ $(APR) \
+ $(EOLIST)
+
+#
+# These flags will come after CFLAGS
+#
+XCFLAGS += \
+ -prefix pre_nw.h \
+ $(EOLIST)
+
+#
+# These defines will come after DEFINES
+#
+XDEFINES += \
+ $(EOLIST)
+
+#
+# These flags will be added to the link.opt file
+#
+XLFLAGS += \
+ $(EOLIST)
+
+#
+# These values will be appended to the correct variables based on the value of
+# RELEASE
+#
+ifeq "$(RELEASE)" "debug"
+XINCDIRS += \
+ $(EOLIST)
+
+XCFLAGS += \
+ $(EOLIST)
+
+XDEFINES += \
+ $(EOLIST)
+
+XLFLAGS += \
+ $(EOLIST)
+endif
+
+ifeq "$(RELEASE)" "noopt"
+XINCDIRS += \
+ $(EOLIST)
+
+XCFLAGS += \
+ $(EOLIST)
+
+XDEFINES += \
+ $(EOLIST)
+
+XLFLAGS += \
+ $(EOLIST)
+endif
+
+ifeq "$(RELEASE)" "release"
+XINCDIRS += \
+ $(EOLIST)
+
+XCFLAGS += \
+ $(EOLIST)
+
+XDEFINES += \
+ $(EOLIST)
+
+XLFLAGS += \
+ $(EOLIST)
+endif
+
+#
+# These are used by the link target if an NLM is being generated
+# This is used by the link 'name' directive to name the nlm. If left blank
+# TARGET_nlm (see below) will be used.
+#
+NLM_NAME = mod_filter
+
+#
+# This is used by the link '-desc ' directive.
+# If left blank, NLM_NAME will be used.
+#
+NLM_DESCRIPTION = Apache $(VERSION_STR) Filter Module
+
+#
+# This is used by the '-threadname' directive. If left blank,
+# NLM_NAME Thread will be used.
+#
+NLM_THREAD_NAME = Filter Module
+
+#
+# If this is specified, it will override VERSION value in
+# $(AP_WORK)\build\NWGNUenvironment.inc
+#
+NLM_VERSION =
+
+#
+# If this is specified, it will override the default of 64K
+#
+NLM_STACK_SIZE = 8192
+
+
+#
+# If this is specified it will be used by the link '-entry' directive
+#
+NLM_ENTRY_SYM = _LibCPrelude
+
+#
+# If this is specified it will be used by the link '-exit' directive
+#
+NLM_EXIT_SYM = _LibCPostlude
+
+#
+# If this is specified it will be used by the link '-check' directive
+#
+NLM_CHECK_SYM =
+
+#
+# If these are specified it will be used by the link '-flags' directive
+#
+NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION
+
+#
+# If this is specified it will be linked in with the XDCData option in the def
+# file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled
+# by setting APACHE_UNIPROC in the environment
+#
+XDCDATA =
+
+#
+# If there is an NLM target, put it here
+#
+TARGET_nlm = \
+ $(OBJDIR)/mod_filter.nlm \
+ $(EOLIST)
+
+#
+# If there is an LIB target, put it here
+#
+TARGET_lib = \
+ $(EOLIST)
+
+#
+# These are the OBJ files needed to create the NLM target above.
+# Paths must all use the '/' character
+#
+FILES_nlm_objs = \
+ $(OBJDIR)/mod_filter.o \
+ $(EOLIST)
+
+#
+# These are the LIB files needed to create the NLM target above.
+# These will be added as a library command in the link.opt file.
+#
+FILES_nlm_libs = \
+ libcpre.o \
+ $(EOLIST)
+
+#
+# These are the modules that the above NLM target depends on to load.
+# These will be added as a module command in the link.opt file.
+#
+FILES_nlm_modules = \
+ aprlib \
+ libc \
+ $(EOLIST)
+
+#
+# If the nlm has a msg file, put it's path here
+#
+FILE_nlm_msg =
+
+#
+# If the nlm has a hlp file put it's path here
+#
+FILE_nlm_hlp =
+
+#
+# If this is specified, it will override $(NWOS)\copyright.txt.
+#
+FILE_nlm_copyright =
+
+#
+# Any additional imports go here
+#
+FILES_nlm_Ximports = \
+ @$(APR)/aprlib.imp \
+ @$(NWOS)/httpd.imp \
+ @libc.imp \
+ $(EOLIST)
+
+#
+# Any symbols exported to here
+#
+FILES_nlm_exports = \
+ filter_module \
+ $(EOLIST)
+
+#
+# These are the OBJ files needed to create the LIB target above.
+# Paths must all use the '/' character
+#
+FILES_lib_objs = \
+ $(EOLIST)
+
+#
+# implement targets and dependancies (leave this section alone)
+#
+
+libs :: $(OBJDIR) $(TARGET_lib)
+
+nlms :: libs $(TARGET_nlm)
+
+#
+# Updated this target to create necessary directories and copy files to the
+# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples)
+#
+install :: nlms FORCE
+
+#
+# Any specialized rules here
+#
+
+#
+# Include the 'tail' makefile that has targets that depend on variables defined
+# in this makefile
+#
+
+include $(AP_WORK)\build\NWGNUtail.inc
+
Modified: httpd/httpd/trunk/modules/filters/NWGNUdeflate
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/filters/NWGNUdeflate?view=diff&rev=106975&p1=httpd/httpd/trunk/modules/filters/NWGNUdeflate&r1=106974&p2=httpd/httpd/trunk/modules/filters/NWGNUdeflate&r2=106975
==============================================================================
--- httpd/httpd/trunk/modules/filters/NWGNUdeflate (original)
+++ httpd/httpd/trunk/modules/filters/NWGNUdeflate Mon Nov 29 16:12:39 2004
@@ -30,9 +30,9 @@
$(AP_WORK)/include \
$(NWOS) \
$(AP_WORK)/modules/arch/netware \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
+ $(APR)/include \
+ $(APRUTIL)/include \
+ $(APR) \
$(EOLIST)
#
Modified: httpd/httpd/trunk/modules/filters/NWGNUextfiltr
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/filters/NWGNUextfiltr?view=diff&rev=106975&p1=httpd/httpd/trunk/modules/filters/NWGNUextfiltr&r1=106974&p2=httpd/httpd/trunk/modules/filters/NWGNUextfiltr&r2=106975
==============================================================================
--- httpd/httpd/trunk/modules/filters/NWGNUextfiltr (original)
+++ httpd/httpd/trunk/modules/filters/NWGNUextfiltr Mon Nov 29 16:12:39 2004
@@ -19,9 +19,9 @@
$(AP_WORK)/include \
$(NWOS) \
$(AP_WORK)/modules/arch/netware \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
+ $(APR)/include \
+ $(APRUTIL)/include \
+ $(APR) \
$(EOLIST)
#
Modified: httpd/httpd/trunk/modules/generators/NWGNUinfo
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/generators/NWGNUinfo?view=diff&rev=106975&p1=httpd/httpd/trunk/modules/generators/NWGNUinfo&r1=106974&p2=httpd/httpd/trunk/modules/generators/NWGNUinfo&r2=106975
==============================================================================
--- httpd/httpd/trunk/modules/generators/NWGNUinfo (original)
+++ httpd/httpd/trunk/modules/generators/NWGNUinfo Mon Nov 29 16:12:39 2004
@@ -19,9 +19,9 @@
$(AP_WORK)/include \
$(NWOS) \
$(AP_WORK)/modules/arch/netware \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
+ $(APR)/include \
+ $(APRUTIL)/include \
+ $(APR) \
$(EOLIST)
#
Modified: httpd/httpd/trunk/modules/generators/NWGNUstatus
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/generators/NWGNUstatus?view=diff&rev=106975&p1=httpd/httpd/trunk/modules/generators/NWGNUstatus&r1=106974&p2=httpd/httpd/trunk/modules/generators/NWGNUstatus&r2=106975
==============================================================================
--- httpd/httpd/trunk/modules/generators/NWGNUstatus (original)
+++ httpd/httpd/trunk/modules/generators/NWGNUstatus Mon Nov 29 16:12:39 2004
@@ -19,9 +19,9 @@
$(AP_WORK)/include \
$(NWOS) \
$(AP_WORK)/modules/arch/netware \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
+ $(APR)/include \
+ $(APRUTIL)/include \
+ $(APR) \
$(EOLIST)
#
Modified: httpd/httpd/trunk/modules/ldap/NWGNUmakefile
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/ldap/NWGNUmakefile?view=diff&rev=106975&p1=httpd/httpd/trunk/modules/ldap/NWGNUmakefile&r1=106974&p2=httpd/httpd/trunk/modules/ldap/NWGNUmakefile&r2=106975
==============================================================================
--- httpd/httpd/trunk/modules/ldap/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/ldap/NWGNUmakefile Mon Nov 29 16:12:39 2004
@@ -18,9 +18,9 @@
XINCDIRS += \
$(AP_WORK)/include \
$(NWOS) \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
+ $(APR)/include \
+ $(APRUTIL)/include \
+ $(APR) \
$(LDAPSDK)/inc \
$(EOLIST)
Modified: httpd/httpd/trunk/modules/loggers/NWGNUforensic
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/loggers/NWGNUforensic?view=diff&rev=106975&p1=httpd/httpd/trunk/modules/loggers/NWGNUforensic&r1=106974&p2=httpd/httpd/trunk/modules/loggers/NWGNUforensic&r2=106975
==============================================================================
--- httpd/httpd/trunk/modules/loggers/NWGNUforensic (original)
+++ httpd/httpd/trunk/modules/loggers/NWGNUforensic Mon Nov 29 16:12:39 2004
@@ -27,9 +27,9 @@
$(AP_WORK)/include \
$(NWOS) \
$(AP_WORK)/modules/arch/netware \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
+ $(APR)/include \
+ $(APRUTIL)/include \
+ $(APR) \
$(EOLIST)
#
Modified: httpd/httpd/trunk/modules/loggers/NWGNUmodlogio
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/loggers/NWGNUmodlogio?view=diff&rev=106975&p1=httpd/httpd/trunk/modules/loggers/NWGNUmodlogio&r1=106974&p2=httpd/httpd/trunk/modules/loggers/NWGNUmodlogio&r2=106975
==============================================================================
--- httpd/httpd/trunk/modules/loggers/NWGNUmodlogio (original)
+++ httpd/httpd/trunk/modules/loggers/NWGNUmodlogio Mon Nov 29 16:12:39 2004
@@ -27,9 +27,9 @@
$(AP_WORK)/include \
$(NWOS) \
$(AP_WORK)/modules/arch/netware \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
+ $(APR)/include \
+ $(APRUTIL)/include \
+ $(APR) \
$(EOLIST)
#
Modified: httpd/httpd/trunk/modules/mappers/NWGNUrewrite
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/mappers/NWGNUrewrite?view=diff&rev=106975&p1=httpd/httpd/trunk/modules/mappers/NWGNUrewrite&r1=106974&p2=httpd/httpd/trunk/modules/mappers/NWGNUrewrite&r2=106975
==============================================================================
--- httpd/httpd/trunk/modules/mappers/NWGNUrewrite (original)
+++ httpd/httpd/trunk/modules/mappers/NWGNUrewrite Mon Nov 29 16:12:39 2004
@@ -20,9 +20,9 @@
$(NWOS) \
$(AP_WORK)/modules/arch/netware \
$(AP_WORK)/modules/ssl \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
+ $(APR)/include \
+ $(APRUTIL)/include \
+ $(APR) \
$(EOLIST)
#
Modified: httpd/httpd/trunk/modules/mappers/NWGNUspeling
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/mappers/NWGNUspeling?view=diff&rev=106975&p1=httpd/httpd/trunk/modules/mappers/NWGNUspeling&r1=106974&p2=httpd/httpd/trunk/modules/mappers/NWGNUspeling&r2=106975
==============================================================================
--- httpd/httpd/trunk/modules/mappers/NWGNUspeling (original)
+++ httpd/httpd/trunk/modules/mappers/NWGNUspeling Mon Nov 29 16:12:39 2004
@@ -19,9 +19,9 @@
$(AP_WORK)/include \
$(NWOS) \
$(AP_WORK)/modules/arch/netware \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
+ $(APR)/include \
+ $(APRUTIL)/include \
+ $(APR) \
$(EOLIST)
#
Modified: httpd/httpd/trunk/modules/mappers/NWGNUvhost
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/mappers/NWGNUvhost?view=diff&rev=106975&p1=httpd/httpd/trunk/modules/mappers/NWGNUvhost&r1=106974&p2=httpd/httpd/trunk/modules/mappers/NWGNUvhost&r2=106975
==============================================================================
--- httpd/httpd/trunk/modules/mappers/NWGNUvhost (original)
+++ httpd/httpd/trunk/modules/mappers/NWGNUvhost Mon Nov 29 16:12:39 2004
@@ -19,9 +19,9 @@
$(AP_WORK)/include \
$(NWOS) \
$(AP_WORK)/modules/arch/netware \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
+ $(APR)/include \
+ $(APRUTIL)/include \
+ $(APR) \
$(EOLIST)
#
Modified: httpd/httpd/trunk/modules/metadata/NWGNUcernmeta
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/metadata/NWGNUcernmeta?view=diff&rev=106975&p1=httpd/httpd/trunk/modules/metadata/NWGNUcernmeta&r1=106974&p2=httpd/httpd/trunk/modules/metadata/NWGNUcernmeta&r2=106975
==============================================================================
--- httpd/httpd/trunk/modules/metadata/NWGNUcernmeta (original)
+++ httpd/httpd/trunk/modules/metadata/NWGNUcernmeta Mon Nov 29 16:12:39 2004
@@ -19,9 +19,9 @@
$(AP_WORK)/include \
$(NWOS) \
$(AP_WORK)/modules/arch/netware \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
+ $(APR)/include \
+ $(APRUTIL)/include \
+ $(APR) \
$(EOLIST)
#
Modified: httpd/httpd/trunk/modules/metadata/NWGNUexpires
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/metadata/NWGNUexpires?view=diff&rev=106975&p1=httpd/httpd/trunk/modules/metadata/NWGNUexpires&r1=106974&p2=httpd/httpd/trunk/modules/metadata/NWGNUexpires&r2=106975
==============================================================================
--- httpd/httpd/trunk/modules/metadata/NWGNUexpires (original)
+++ httpd/httpd/trunk/modules/metadata/NWGNUexpires Mon Nov 29 16:12:39 2004
@@ -19,9 +19,9 @@
$(AP_WORK)/include \
$(NWOS) \
$(AP_WORK)/modules/arch/netware \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
+ $(APR)/include \
+ $(APRUTIL)/include \
+ $(APR) \
$(EOLIST)
#
Modified: httpd/httpd/trunk/modules/metadata/NWGNUheaders
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/metadata/NWGNUheaders?view=diff&rev=106975&p1=httpd/httpd/trunk/modules/metadata/NWGNUheaders&r1=106974&p2=httpd/httpd/trunk/modules/metadata/NWGNUheaders&r2=106975
==============================================================================
--- httpd/httpd/trunk/modules/metadata/NWGNUheaders (original)
+++ httpd/httpd/trunk/modules/metadata/NWGNUheaders Mon Nov 29 16:12:39 2004
@@ -20,9 +20,9 @@
$(NWOS) \
$(AP_WORK)/modules/arch/netware \
$(AP_WORK)/modules/ssl \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
+ $(APR)/include \
+ $(APRUTIL)/include \
+ $(APR) \
$(EOLIST)
#
Modified: httpd/httpd/trunk/modules/metadata/NWGNUmimemagi
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/metadata/NWGNUmimemagi?view=diff&rev=106975&p1=httpd/httpd/trunk/modules/metadata/NWGNUmimemagi&r1=106974&p2=httpd/httpd/trunk/modules/metadata/NWGNUmimemagi&r2=106975
==============================================================================
--- httpd/httpd/trunk/modules/metadata/NWGNUmimemagi (original)
+++ httpd/httpd/trunk/modules/metadata/NWGNUmimemagi Mon Nov 29 16:12:39 2004
@@ -19,9 +19,9 @@
$(AP_WORK)/include \
$(NWOS) \
$(AP_WORK)/modules/arch/netware \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
+ $(APR)/include \
+ $(APRUTIL)/include \
+ $(APR) \
$(EOLIST)
#
Modified: httpd/httpd/trunk/modules/metadata/NWGNUmodident
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/metadata/NWGNUmodident?view=diff&rev=106975&p1=httpd/httpd/trunk/modules/metadata/NWGNUmodident&r1=106974&p2=httpd/httpd/trunk/modules/metadata/NWGNUmodident&r2=106975
==============================================================================
--- httpd/httpd/trunk/modules/metadata/NWGNUmodident (original)
+++ httpd/httpd/trunk/modules/metadata/NWGNUmodident Mon Nov 29 16:12:39 2004
@@ -19,9 +19,9 @@
$(AP_WORK)/include \
$(NWOS) \
$(AP_WORK)/modules/arch/netware \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
+ $(APR)/include \
+ $(APRUTIL)/include \
+ $(APR) \
$(EOLIST)
#
Modified: httpd/httpd/trunk/modules/metadata/NWGNUmodversion
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/metadata/NWGNUmodversion?view=diff&rev=106975&p1=httpd/httpd/trunk/modules/metadata/NWGNUmodversion&r1=106974&p2=httpd/httpd/trunk/modules/metadata/NWGNUmodversion&r2=106975
==============================================================================
--- httpd/httpd/trunk/modules/metadata/NWGNUmodversion (original)
+++ httpd/httpd/trunk/modules/metadata/NWGNUmodversion Mon Nov 29 16:12:39 2004
@@ -19,9 +19,9 @@
$(AP_WORK)/include \
$(NWOS) \
$(AP_WORK)/modules/arch/netware \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
+ $(APR)/include \
+ $(APRUTIL)/include \
+ $(APR) \
$(EOLIST)
#
Modified: httpd/httpd/trunk/modules/metadata/NWGNUuniqueid
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/metadata/NWGNUuniqueid?view=diff&rev=106975&p1=httpd/httpd/trunk/modules/metadata/NWGNUuniqueid&r1=106974&p2=httpd/httpd/trunk/modules/metadata/NWGNUuniqueid&r2=106975
==============================================================================
--- httpd/httpd/trunk/modules/metadata/NWGNUuniqueid (original)
+++ httpd/httpd/trunk/modules/metadata/NWGNUuniqueid Mon Nov 29 16:12:39 2004
@@ -19,9 +19,9 @@
$(AP_WORK)/include \
$(NWOS) \
$(AP_WORK)/modules/arch/netware \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
+ $(APR)/include \
+ $(APRUTIL)/include \
+ $(APR) \
$(EOLIST)
#
Modified: httpd/httpd/trunk/modules/metadata/NWGNUusertrk
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/metadata/NWGNUusertrk?view=diff&rev=106975&p1=httpd/httpd/trunk/modules/metadata/NWGNUusertrk&r1=106974&p2=httpd/httpd/trunk/modules/metadata/NWGNUusertrk&r2=106975
==============================================================================
--- httpd/httpd/trunk/modules/metadata/NWGNUusertrk (original)
+++ httpd/httpd/trunk/modules/metadata/NWGNUusertrk Mon Nov 29 16:12:39 2004
@@ -19,9 +19,9 @@
$(AP_WORK)/include \
$(NWOS) \
$(AP_WORK)/modules/arch/netware \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
+ $(APR)/include \
+ $(APRUTIL)/include \
+ $(APR) \
$(EOLIST)
#
Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxy
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/proxy/NWGNUproxy?view=diff&rev=106975&p1=httpd/httpd/trunk/modules/proxy/NWGNUproxy&r1=106974&p2=httpd/httpd/trunk/modules/proxy/NWGNUproxy&r2=106975
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxy (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxy Mon Nov 29 16:12:39 2004
@@ -22,9 +22,9 @@
$(AP_WORK)/modules/arch/netware \
$(AP_WORK)/modules/ssl \
$(AP_WORK)/modules/generators \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
+ $(APR)/include \
+ $(APRUTIL)/include \
+ $(APR) \
$(EOLIST)
#
Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxyajp
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/proxy/NWGNUproxyajp?view=diff&rev=106975&p1=httpd/httpd/trunk/modules/proxy/NWGNUproxyajp&r1=106974&p2=httpd/httpd/trunk/modules/proxy/NWGNUproxyajp&r2=106975
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxyajp (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxyajp Mon Nov 29 16:12:39 2004
@@ -20,9 +20,9 @@
$(NWOS) \
$(AP_WORK)/modules/http \
$(AP_WORK)/modules/arch/netware \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
+ $(APR)/include \
+ $(APRUTIL)/include \
+ $(APR) \
$(EOLIST)
#
Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxybalancer
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/proxy/NWGNUproxybalancer?view=diff&rev=106975&p1=httpd/httpd/trunk/modules/proxy/NWGNUproxybalancer&r1=106974&p2=httpd/httpd/trunk/modules/proxy/NWGNUproxybalancer&r2=106975
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxybalancer (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxybalancer Mon Nov 29 16:12:39 2004
@@ -20,9 +20,9 @@
$(NWOS) \
$(AP_WORK)/modules/http \
$(AP_WORK)/modules/arch/netware \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
+ $(APR)/include \
+ $(APRUTIL)/include \
+ $(APR) \
$(EOLIST)
#
Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxycon
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/proxy/NWGNUproxycon?view=diff&rev=106975&p1=httpd/httpd/trunk/modules/proxy/NWGNUproxycon&r1=106974&p2=httpd/httpd/trunk/modules/proxy/NWGNUproxycon&r2=106975
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxycon (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxycon Mon Nov 29 16:12:39 2004
@@ -20,9 +20,9 @@
$(NWOS) \
$(AP_WORK)/modules/http \
$(AP_WORK)/modules/arch/netware \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
+ $(APR)/include \
+ $(APRUTIL)/include \
+ $(APR) \
$(EOLIST)
#
Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxyftp
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/proxy/NWGNUproxyftp?view=diff&rev=106975&p1=httpd/httpd/trunk/modules/proxy/NWGNUproxyftp&r1=106974&p2=httpd/httpd/trunk/modules/proxy/NWGNUproxyftp&r2=106975
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxyftp (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxyftp Mon Nov 29 16:12:39 2004
@@ -20,9 +20,9 @@
$(NWOS) \
$(AP_WORK)/modules/http \
$(AP_WORK)/modules/arch/netware \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
+ $(APR)/include \
+ $(APRUTIL)/include \
+ $(APR) \
$(EOLIST)
#
Modified: httpd/httpd/trunk/modules/proxy/NWGNUproxyhtp
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/proxy/NWGNUproxyhtp?view=diff&rev=106975&p1=httpd/httpd/trunk/modules/proxy/NWGNUproxyhtp&r1=106974&p2=httpd/httpd/trunk/modules/proxy/NWGNUproxyhtp&r2=106975
==============================================================================
--- httpd/httpd/trunk/modules/proxy/NWGNUproxyhtp (original)
+++ httpd/httpd/trunk/modules/proxy/NWGNUproxyhtp Mon Nov 29 16:12:39 2004
@@ -20,9 +20,9 @@
$(NWOS) \
$(AP_WORK)/modules/http \
$(AP_WORK)/modules/arch/netware \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr \
+ $(APR)/include \
+ $(APRUTIL)/include \
+ $(APR) \
$(EOLIST)
#
Modified: httpd/httpd/trunk/support/NWGNUab
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/support/NWGNUab?view=diff&rev=106975&p1=httpd/httpd/trunk/support/NWGNUab&r1=106974&p2=httpd/httpd/trunk/support/NWGNUab&r2=106975
==============================================================================
--- httpd/httpd/trunk/support/NWGNUab (original)
+++ httpd/httpd/trunk/support/NWGNUab Mon Nov 29 16:12:39 2004
@@ -18,10 +18,10 @@
XINCDIRS += \
$(NWOS) \
$(AP_WORK)/include \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr/misc/netware \
- $(AP_WORK)/srclib/apr \
+ $(APR)/include \
+ $(APRUTIL)/../apr-util/include \
+ $(APR)/misc/netware \
+ $(APR_WORK) \
$(EOLIST)
#
Modified: httpd/httpd/trunk/support/NWGNUhtcacheclean
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/support/NWGNUhtcacheclean?view=diff&rev=106975&p1=httpd/httpd/trunk/support/NWGNUhtcacheclean&r1=106974&p2=httpd/httpd/trunk/support/NWGNUhtcacheclean&r2=106975
==============================================================================
--- httpd/httpd/trunk/support/NWGNUhtcacheclean (original)
+++ httpd/httpd/trunk/support/NWGNUhtcacheclean Mon Nov 29 16:12:39 2004
@@ -1,252 +1,252 @@
-#
-# Make sure all needed macro's are defined
-#
-
-#
-# Get the 'head' of the build environment if necessary. This includes default
-# targets and paths to tools
-#
-
-ifndef EnvironmentDefined
-include $(AP_WORK)\build\NWGNUhead.inc
-endif
-
-#
-# These directories will be at the beginning of the include list, followed by
-# INCDIRS
-#
-XINCDIRS += \
- $(NWOS) \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr/misc/netware \
- $(AP_WORK)/srclib/apr \
- $(EOLIST)
-
-#
-# These flags will come after CFLAGS
-#
-XCFLAGS += \
- $(EOLIST)
-
-#
-# These defines will come after DEFINES
-#
-XDEFINES += \
- $(EOLIST)
-
-#
-# These flags will be added to the link.opt file
-#
-XLFLAGS += \
- $(EOLIST)
-
-#
-# These values will be appended to the correct variables based on the value of
-# RELEASE
-#
-ifeq "$(RELEASE)" "debug"
-XINCDIRS += \
- $(EOLIST)
-
-XCFLAGS += \
- $(EOLIST)
-
-XDEFINES += \
- $(EOLIST)
-
-XLFLAGS += \
- $(EOLIST)
-endif
-
-ifeq "$(RELEASE)" "noopt"
-XINCDIRS += \
- $(EOLIST)
-
-XCFLAGS += \
- $(EOLIST)
-
-XDEFINES += \
- $(EOLIST)
-
-XLFLAGS += \
- $(EOLIST)
-endif
-
-ifeq "$(RELEASE)" "release"
-XINCDIRS += \
- $(EOLIST)
-
-XCFLAGS += \
- $(EOLIST)
-
-XDEFINES += \
- $(EOLIST)
-
-XLFLAGS += \
- $(EOLIST)
-endif
-
-#
-# These are used by the link target if an NLM is being generated
-# This is used by the link 'name' directive to name the nlm. If left blank
-# TARGET_nlm (see below) will be used.
-#
-NLM_NAME = htcacheclean
-
-#
-# This is used by the link '-desc ' directive.
-# If left blank, NLM_NAME will be used.
-#
-NLM_DESCRIPTION = Apache $(VERSION_STR) HT Disk Cache Cleanup Utility for NetWare
-
-#
-# This is used by the '-threadname' directive. If left blank,
-# NLM_NAME Thread will be used.
-#
-NLM_THREAD_NAME = htcacheclean
-
-#
-# This is used by the '-screenname' directive. If left blank,
-# 'Apache for NetWare' Thread will be used.
-#
-NLM_SCREEN_NAME = DEFAULT
-
-#
-# If this is specified, it will override VERSION value in
-# $(AP_WORK)\build\NWGNUenvironment.inc
-#
-NLM_VERSION =
-
-#
-# If this is specified, it will override the default of 64K
-#
-NLM_STACK_SIZE = 8192
-
-
-#
-# If this is specified it will be used by the link '-entry' directive
-#
-NLM_ENTRY_SYM = _LibCPrelude
-
-#
-# If this is specified it will be used by the link '-exit' directive
-#
-NLM_EXIT_SYM = _LibCPostlude
-
-#
-# If this is specified it will be used by the link '-check' directive
-#
-NLM_CHECK_SYM =
-
-#
-# If these are specified it will be used by the link '-flags' directive
-#
-NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION
-
-#
-# If this is specified it will be linked in with the XDCData option in the def
-# file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled
-# by setting APACHE_UNIPROC in the environment
-#
-XDCDATA =
-
-#
-# If there is an NLM target, put it here
-#
-TARGET_nlm = \
- $(OBJDIR)/htcacheclean.nlm \
- $(EOLIST)
-
-#
-# If there is an LIB target, put it here
-#
-TARGET_lib = \
- $(EOLIST)
-
-#
-# These are the OBJ files needed to create the NLM target above.
-# Paths must all use the '/' character
-#
-FILES_nlm_objs = \
- $(OBJDIR)/htcacheclean.o \
- $(EOLIST)
-
-#
-# These are the LIB files needed to create the NLM target above.
-# These will be added as a library command in the link.opt file.
-#
-FILES_nlm_libs = \
- libcpre.o \
- $(EOLIST)
-
-#
-# These are the modules that the above NLM target depends on to load.
-# These will be added as a module command in the link.opt file.
-#
-FILES_nlm_modules = \
- aprlib \
- libc \
- $(EOLIST)
-
-#
-# If the nlm has a msg file, put it's path here
-#
-FILE_nlm_msg =
-
-#
-# If the nlm has a hlp file put it's path here
-#
-FILE_nlm_hlp =
-
-#
-# If this is specified, it will override $(NWOS)\copyright.txt.
-#
-FILE_nlm_copyright =
-
-#
-# Any additional imports go here
-#
-FILES_nlm_Ximports = \
- @$(APR)/aprlib.imp \
- @libc.imp \
- $(EOLIST)
-
-#
-# Any symbols exported to here
-#
-FILES_nlm_exports = \
- $(EOLIST)
-
-#
-# These are the OBJ files needed to create the LIB target above.
-# Paths must all use the '/' character
-#
-FILES_lib_objs = \
- $(EOLIST)
-
-#
-# implement targets and dependancies (leave this section alone)
-#
-
-libs :: $(OBJDIR) $(TARGET_lib)
-
-nlms :: libs $(TARGET_nlm)
-
-#
-# Updated this target to create necessary directories and copy files to the
-# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples)
-#
-install :: nlms FORCE
-
-#
-# Any specialized rules here
-#
-
-#
-# Include the 'tail' makefile that has targets that depend on variables defined
-# in this makefile
-#
-
-include $(AP_WORK)\build\NWGNUtail.inc
-
+#
+# Make sure all needed macro's are defined
+#
+
+#
+# Get the 'head' of the build environment if necessary. This includes default
+# targets and paths to tools
+#
+
+ifndef EnvironmentDefined
+include $(AP_WORK)\build\NWGNUhead.inc
+endif
+
+#
+# These directories will be at the beginning of the include list, followed by
+# INCDIRS
+#
+XINCDIRS += \
+ $(NWOS) \
+ $(APR)/include \
+ $(APRUTIL)/include \
+ $(APR)/misc/netware \
+ $(APR) \
+ $(EOLIST)
+
+#
+# These flags will come after CFLAGS
+#
+XCFLAGS += \
+ $(EOLIST)
+
+#
+# These defines will come after DEFINES
+#
+XDEFINES += \
+ $(EOLIST)
+
+#
+# These flags will be added to the link.opt file
+#
+XLFLAGS += \
+ $(EOLIST)
+
+#
+# These values will be appended to the correct variables based on the value of
+# RELEASE
+#
+ifeq "$(RELEASE)" "debug"
+XINCDIRS += \
+ $(EOLIST)
+
+XCFLAGS += \
+ $(EOLIST)
+
+XDEFINES += \
+ $(EOLIST)
+
+XLFLAGS += \
+ $(EOLIST)
+endif
+
+ifeq "$(RELEASE)" "noopt"
+XINCDIRS += \
+ $(EOLIST)
+
+XCFLAGS += \
+ $(EOLIST)
+
+XDEFINES += \
+ $(EOLIST)
+
+XLFLAGS += \
+ $(EOLIST)
+endif
+
+ifeq "$(RELEASE)" "release"
+XINCDIRS += \
+ $(EOLIST)
+
+XCFLAGS += \
+ $(EOLIST)
+
+XDEFINES += \
+ $(EOLIST)
+
+XLFLAGS += \
+ $(EOLIST)
+endif
+
+#
+# These are used by the link target if an NLM is being generated
+# This is used by the link 'name' directive to name the nlm. If left blank
+# TARGET_nlm (see below) will be used.
+#
+NLM_NAME = htcacheclean
+
+#
+# This is used by the link '-desc ' directive.
+# If left blank, NLM_NAME will be used.
+#
+NLM_DESCRIPTION = Apache $(VERSION_STR) HT Disk Cache Cleanup Utility for NetWare
+
+#
+# This is used by the '-threadname' directive. If left blank,
+# NLM_NAME Thread will be used.
+#
+NLM_THREAD_NAME = htcacheclean
+
+#
+# This is used by the '-screenname' directive. If left blank,
+# 'Apache for NetWare' Thread will be used.
+#
+NLM_SCREEN_NAME = DEFAULT
+
+#
+# If this is specified, it will override VERSION value in
+# $(AP_WORK)\build\NWGNUenvironment.inc
+#
+NLM_VERSION =
+
+#
+# If this is specified, it will override the default of 64K
+#
+NLM_STACK_SIZE = 8192
+
+
+#
+# If this is specified it will be used by the link '-entry' directive
+#
+NLM_ENTRY_SYM = _LibCPrelude
+
+#
+# If this is specified it will be used by the link '-exit' directive
+#
+NLM_EXIT_SYM = _LibCPostlude
+
+#
+# If this is specified it will be used by the link '-check' directive
+#
+NLM_CHECK_SYM =
+
+#
+# If these are specified it will be used by the link '-flags' directive
+#
+NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION
+
+#
+# If this is specified it will be linked in with the XDCData option in the def
+# file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled
+# by setting APACHE_UNIPROC in the environment
+#
+XDCDATA =
+
+#
+# If there is an NLM target, put it here
+#
+TARGET_nlm = \
+ $(OBJDIR)/htcacheclean.nlm \
+ $(EOLIST)
+
+#
+# If there is an LIB target, put it here
+#
+TARGET_lib = \
+ $(EOLIST)
+
+#
+# These are the OBJ files needed to create the NLM target above.
+# Paths must all use the '/' character
+#
+FILES_nlm_objs = \
+ $(OBJDIR)/htcacheclean.o \
+ $(EOLIST)
+
+#
+# These are the LIB files needed to create the NLM target above.
+# These will be added as a library command in the link.opt file.
+#
+FILES_nlm_libs = \
+ libcpre.o \
+ $(EOLIST)
+
+#
+# These are the modules that the above NLM target depends on to load.
+# These will be added as a module command in the link.opt file.
+#
+FILES_nlm_modules = \
+ aprlib \
+ libc \
+ $(EOLIST)
+
+#
+# If the nlm has a msg file, put it's path here
+#
+FILE_nlm_msg =
+
+#
+# If the nlm has a hlp file put it's path here
+#
+FILE_nlm_hlp =
+
+#
+# If this is specified, it will override $(NWOS)\copyright.txt.
+#
+FILE_nlm_copyright =
+
+#
+# Any additional imports go here
+#
+FILES_nlm_Ximports = \
+ @$(APR)/aprlib.imp \
+ @libc.imp \
+ $(EOLIST)
+
+#
+# Any symbols exported to here
+#
+FILES_nlm_exports = \
+ $(EOLIST)
+
+#
+# These are the OBJ files needed to create the LIB target above.
+# Paths must all use the '/' character
+#
+FILES_lib_objs = \
+ $(EOLIST)
+
+#
+# implement targets and dependancies (leave this section alone)
+#
+
+libs :: $(OBJDIR) $(TARGET_lib)
+
+nlms :: libs $(TARGET_nlm)
+
+#
+# Updated this target to create necessary directories and copy files to the
+# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples)
+#
+install :: nlms FORCE
+
+#
+# Any specialized rules here
+#
+
+#
+# Include the 'tail' makefile that has targets that depend on variables defined
+# in this makefile
+#
+
+include $(AP_WORK)\build\NWGNUtail.inc
+
Modified: httpd/httpd/trunk/support/NWGNUhtdbm
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/support/NWGNUhtdbm?view=diff&rev=106975&p1=httpd/httpd/trunk/support/NWGNUhtdbm&r1=106974&p2=httpd/httpd/trunk/support/NWGNUhtdbm&r2=106975
==============================================================================
--- httpd/httpd/trunk/support/NWGNUhtdbm (original)
+++ httpd/httpd/trunk/support/NWGNUhtdbm Mon Nov 29 16:12:39 2004
@@ -17,10 +17,10 @@
#
XINCDIRS += \
$(NWOS) \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr/misc/netware \
- $(AP_WORK)/srclib/apr \
+ $(APR)/include \
+ $(APRUTIL)/include \
+ $(APR)/misc/netware \
+ $(APR) \
$(EOLIST)
#
Modified: httpd/httpd/trunk/support/NWGNUhtdigest
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/support/NWGNUhtdigest?view=diff&rev=106975&p1=httpd/httpd/trunk/support/NWGNUhtdigest&r1=106974&p2=httpd/httpd/trunk/support/NWGNUhtdigest&r2=106975
==============================================================================
--- httpd/httpd/trunk/support/NWGNUhtdigest (original)
+++ httpd/httpd/trunk/support/NWGNUhtdigest Mon Nov 29 16:12:39 2004
@@ -17,10 +17,10 @@
#
XINCDIRS += \
$(NWOS) \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr/misc/netware \
- $(AP_WORK)/srclib/apr \
+ $(APR)/include \
+ $(APRUTIL)/include \
+ $(APR)/misc/netware \
+ $(APR) \
$(EOLIST)
#
Modified: httpd/httpd/trunk/support/NWGNUhtpasswd
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/support/NWGNUhtpasswd?view=diff&rev=106975&p1=httpd/httpd/trunk/support/NWGNUhtpasswd&r1=106974&p2=httpd/httpd/trunk/support/NWGNUhtpasswd&r2=106975
==============================================================================
--- httpd/httpd/trunk/support/NWGNUhtpasswd (original)
+++ httpd/httpd/trunk/support/NWGNUhtpasswd Mon Nov 29 16:12:39 2004
@@ -17,10 +17,10 @@
#
XINCDIRS += \
$(NWOS) \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr/misc/netware \
- $(AP_WORK)/srclib/apr \
+ $(APR)/include \
+ $(APRUTIL)/include \
+ $(APR)/misc/netware \
+ $(APR) \
$(EOLIST)
#
Modified: httpd/httpd/trunk/support/NWGNUlogres
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/support/NWGNUlogres?view=diff&rev=106975&p1=httpd/httpd/trunk/support/NWGNUlogres&r1=106974&p2=httpd/httpd/trunk/support/NWGNUlogres&r2=106975
==============================================================================
--- httpd/httpd/trunk/support/NWGNUlogres (original)
+++ httpd/httpd/trunk/support/NWGNUlogres Mon Nov 29 16:12:39 2004
@@ -18,10 +18,10 @@
XINCDIRS += \
$(NWOS) \
$(AP_WORK)/include \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr-util/include \
- $(AP_WORK)/srclib/apr/misc/netware \
- $(AP_WORK)/srclib/apr \
+ $(APR)/include \
+ $(APRUTIL)/include \
+ $(APR)/misc/netware \
+ $(APR) \
$(EOLIST)
#
Modified: httpd/httpd/trunk/support/NWGNUrotlogs
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/support/NWGNUrotlogs?view=diff&rev=106975&p1=httpd/httpd/trunk/support/NWGNUrotlogs&r1=106974&p2=httpd/httpd/trunk/support/NWGNUrotlogs&r2=106975
==============================================================================
--- httpd/httpd/trunk/support/NWGNUrotlogs (original)
+++ httpd/httpd/trunk/support/NWGNUrotlogs Mon Nov 29 16:12:39 2004
@@ -17,9 +17,9 @@
#
XINCDIRS += \
$(NWOS) \
- $(AP_WORK)/srclib/apr/include \
- $(AP_WORK)/srclib/apr/misc/netware \
- $(AP_WORK)/srclib/apr \
+ $(APR)/include \
+ $(APR)/misc/netware \
+ $(APR) \
$(EOLIST)
#