You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by bn...@apache.org on 2004/12/07 23:27:01 UTC
svn commit: r111154 - in apr/apr/branches/1.0.x: . build test
Author: bnicholes
Date: Tue Dec 7 14:26:59 2004
New Revision: 111154
URL: http://svn.apache.org/viewcvs?view=rev&rev=111154
Log:
Allow APR-UTIL to exist and build outside of the httpd/srclib file structure
Modified:
apr/apr/branches/1.0.x/NWGNUmakefile
apr/apr/branches/1.0.x/build/NWGNUenvironment.inc
apr/apr/branches/1.0.x/build/NWGNUmakefile
apr/apr/branches/1.0.x/test/NWGNUmakefile
apr/apr/branches/1.0.x/test/nwgnuaprtest
apr/apr/branches/1.0.x/test/nwgnuglobalmutexchild
apr/apr/branches/1.0.x/test/nwgnumod_test
apr/apr/branches/1.0.x/test/nwgnuproc_child
apr/apr/branches/1.0.x/test/nwgnureadchild
apr/apr/branches/1.0.x/test/nwgnusockchild
apr/apr/branches/1.0.x/test/nwgnutestatmc
apr/apr/branches/1.0.x/test/nwgnutryread
Modified: apr/apr/branches/1.0.x/NWGNUmakefile
Url: http://svn.apache.org/viewcvs/apr/apr/branches/1.0.x/NWGNUmakefile?view=diff&rev=111154&p1=apr/apr/branches/1.0.x/NWGNUmakefile&r1=111153&p2=apr/apr/branches/1.0.x/NWGNUmakefile&r2=111154
==============================================================================
--- apr/apr/branches/1.0.x/NWGNUmakefile (original)
+++ apr/apr/branches/1.0.x/NWGNUmakefile Tue Dec 7 14:26:59 2004
@@ -4,7 +4,7 @@
SUBDIRS = \
build \
- ..\apr-util \
+ $(APU_WORK) \
$(EOLIST)
#
Modified: apr/apr/branches/1.0.x/build/NWGNUenvironment.inc
Url: http://svn.apache.org/viewcvs/apr/apr/branches/1.0.x/build/NWGNUenvironment.inc?view=diff&rev=111154&p1=apr/apr/branches/1.0.x/build/NWGNUenvironment.inc&r1=111153&p2=apr/apr/branches/1.0.x/build/NWGNUenvironment.inc&r2=111154
==============================================================================
--- apr/apr/branches/1.0.x/build/NWGNUenvironment.inc (original)
+++ apr/apr/branches/1.0.x/build/NWGNUenvironment.inc Tue Dec 7 14:26:59 2004
@@ -264,7 +264,7 @@
APR = $(APR_WORK)
APRTEST = $(APR_WORK)/test
-APRUTIL = $(APR_WORK)/../apr-util
+APRUTIL = $(APU_WORK)
XML = $(APRUTIL)/xml
#
Modified: apr/apr/branches/1.0.x/build/NWGNUmakefile
Url: http://svn.apache.org/viewcvs/apr/apr/branches/1.0.x/build/NWGNUmakefile?view=diff&rev=111154&p1=apr/apr/branches/1.0.x/build/NWGNUmakefile&r1=111153&p2=apr/apr/branches/1.0.x/build/NWGNUmakefile&r2=111154
==============================================================================
--- apr/apr/branches/1.0.x/build/NWGNUmakefile (original)
+++ apr/apr/branches/1.0.x/build/NWGNUmakefile Tue Dec 7 14:26:59 2004
@@ -43,10 +43,10 @@
@echo -nosyspath >> $@
@echo -w nocmdline >> $@
@echo -DNETWARE >> $@
- @echo -I..\include >> $@
- @echo -I..\include\arch\netware >> $@
- @echo -I..\include\arch\unix >> $@
- @echo -I..\..\apr-util\include >> $@
+ @echo -I$(APR)\include >> $@
+ @echo -I$(APR)\include\arch\netware >> $@
+ @echo -I$(APR)\include\arch\unix >> $@
+ @echo -I$(APRUTIL)\include >> $@
@echo -ir $(NOVELLLIBC) >> $@
ifneq "$(LDAPSDK)" ""
@echo -ir $(LDAPSDK) >> $@
Modified: apr/apr/branches/1.0.x/test/NWGNUmakefile
Url: http://svn.apache.org/viewcvs/apr/apr/branches/1.0.x/test/NWGNUmakefile?view=diff&rev=111154&p1=apr/apr/branches/1.0.x/test/NWGNUmakefile&r1=111153&p2=apr/apr/branches/1.0.x/test/NWGNUmakefile&r2=111154
==============================================================================
--- apr/apr/branches/1.0.x/test/NWGNUmakefile (original)
+++ apr/apr/branches/1.0.x/test/NWGNUmakefile Tue Dec 7 14:26:59 2004
@@ -25,8 +25,8 @@
# INCDIRS
#
XINCDIRS += \
- $(APR_WORK)/include \
- $(APR_WORK)/include/arch/NetWare \
+ $(APR)/include \
+ $(APR)/include/arch/NetWare \
$(EOLIST)
#
Modified: apr/apr/branches/1.0.x/test/nwgnuaprtest
Url: http://svn.apache.org/viewcvs/apr/apr/branches/1.0.x/test/nwgnuaprtest?view=diff&rev=111154&p1=apr/apr/branches/1.0.x/test/nwgnuaprtest&r1=111153&p2=apr/apr/branches/1.0.x/test/nwgnuaprtest&r2=111154
==============================================================================
--- apr/apr/branches/1.0.x/test/nwgnuaprtest (original)
+++ apr/apr/branches/1.0.x/test/nwgnuaprtest Tue Dec 7 14:26:59 2004
@@ -16,8 +16,8 @@
# INCDIRS
#
XINCDIRS += \
- $(APR_WORK)/include \
- $(APR_WORK)/include/arch/NetWare \
+ $(APR)/include \
+ $(APR)/include/arch/NetWare \
$(EOLIST)
#
Modified: apr/apr/branches/1.0.x/test/nwgnuglobalmutexchild
Url: http://svn.apache.org/viewcvs/apr/apr/branches/1.0.x/test/nwgnuglobalmutexchild?view=diff&rev=111154&p1=apr/apr/branches/1.0.x/test/nwgnuglobalmutexchild&r1=111153&p2=apr/apr/branches/1.0.x/test/nwgnuglobalmutexchild&r2=111154
==============================================================================
--- apr/apr/branches/1.0.x/test/nwgnuglobalmutexchild (original)
+++ apr/apr/branches/1.0.x/test/nwgnuglobalmutexchild Tue Dec 7 14:26:59 2004
@@ -16,8 +16,8 @@
# INCDIRS
#
XINCDIRS += \
- $(APR_WORK)/include \
- $(APR_WORK)/include/arch/NetWare \
+ $(APR)/include \
+ $(APR)/include/arch/NetWare \
$(EOLIST)
#
Modified: apr/apr/branches/1.0.x/test/nwgnumod_test
Url: http://svn.apache.org/viewcvs/apr/apr/branches/1.0.x/test/nwgnumod_test?view=diff&rev=111154&p1=apr/apr/branches/1.0.x/test/nwgnumod_test&r1=111153&p2=apr/apr/branches/1.0.x/test/nwgnumod_test&r2=111154
==============================================================================
--- apr/apr/branches/1.0.x/test/nwgnumod_test (original)
+++ apr/apr/branches/1.0.x/test/nwgnumod_test Tue Dec 7 14:26:59 2004
@@ -16,8 +16,8 @@
# INCDIRS
#
XINCDIRS += \
- $(APR_WORK)/include \
- $(APR_WORK)/include/arch/NetWare \
+ $(APR)/include \
+ $(APR)/include/arch/NetWare \
$(EOLIST)
#
Modified: apr/apr/branches/1.0.x/test/nwgnuproc_child
Url: http://svn.apache.org/viewcvs/apr/apr/branches/1.0.x/test/nwgnuproc_child?view=diff&rev=111154&p1=apr/apr/branches/1.0.x/test/nwgnuproc_child&r1=111153&p2=apr/apr/branches/1.0.x/test/nwgnuproc_child&r2=111154
==============================================================================
--- apr/apr/branches/1.0.x/test/nwgnuproc_child (original)
+++ apr/apr/branches/1.0.x/test/nwgnuproc_child Tue Dec 7 14:26:59 2004
@@ -16,8 +16,8 @@
# INCDIRS
#
XINCDIRS += \
- $(APR_WORK)/include \
- $(APR_WORK)/include/arch/NetWare \
+ $(APR)/include \
+ $(APR)/include/arch/NetWare \
$(EOLIST)
#
Modified: apr/apr/branches/1.0.x/test/nwgnureadchild
Url: http://svn.apache.org/viewcvs/apr/apr/branches/1.0.x/test/nwgnureadchild?view=diff&rev=111154&p1=apr/apr/branches/1.0.x/test/nwgnureadchild&r1=111153&p2=apr/apr/branches/1.0.x/test/nwgnureadchild&r2=111154
==============================================================================
--- apr/apr/branches/1.0.x/test/nwgnureadchild (original)
+++ apr/apr/branches/1.0.x/test/nwgnureadchild Tue Dec 7 14:26:59 2004
@@ -16,8 +16,8 @@
# INCDIRS
#
XINCDIRS += \
- $(APR_WORK)/include \
- $(APR_WORK)/include/arch/NetWare \
+ $(APR)/include \
+ $(APR)/include/arch/NetWare \
$(EOLIST)
#
Modified: apr/apr/branches/1.0.x/test/nwgnusockchild
Url: http://svn.apache.org/viewcvs/apr/apr/branches/1.0.x/test/nwgnusockchild?view=diff&rev=111154&p1=apr/apr/branches/1.0.x/test/nwgnusockchild&r1=111153&p2=apr/apr/branches/1.0.x/test/nwgnusockchild&r2=111154
==============================================================================
--- apr/apr/branches/1.0.x/test/nwgnusockchild (original)
+++ apr/apr/branches/1.0.x/test/nwgnusockchild Tue Dec 7 14:26:59 2004
@@ -16,8 +16,8 @@
# INCDIRS
#
XINCDIRS += \
- $(APR_WORK)/include \
- $(APR_WORK)/include/arch/NetWare \
+ $(APR)/include \
+ $(APR)/include/arch/NetWare \
$(EOLIST)
#
Modified: apr/apr/branches/1.0.x/test/nwgnutestatmc
Url: http://svn.apache.org/viewcvs/apr/apr/branches/1.0.x/test/nwgnutestatmc?view=diff&rev=111154&p1=apr/apr/branches/1.0.x/test/nwgnutestatmc&r1=111153&p2=apr/apr/branches/1.0.x/test/nwgnutestatmc&r2=111154
==============================================================================
--- apr/apr/branches/1.0.x/test/nwgnutestatmc (original)
+++ apr/apr/branches/1.0.x/test/nwgnutestatmc Tue Dec 7 14:26:59 2004
@@ -16,8 +16,8 @@
# INCDIRS
#
XINCDIRS += \
- $(APR_WORK)/include \
- $(APR_WORK)/include/arch/NetWare \
+ $(APR)/include \
+ $(APR)/include/arch/NetWare \
$(EOLIST)
#
Modified: apr/apr/branches/1.0.x/test/nwgnutryread
Url: http://svn.apache.org/viewcvs/apr/apr/branches/1.0.x/test/nwgnutryread?view=diff&rev=111154&p1=apr/apr/branches/1.0.x/test/nwgnutryread&r1=111153&p2=apr/apr/branches/1.0.x/test/nwgnutryread&r2=111154
==============================================================================
--- apr/apr/branches/1.0.x/test/nwgnutryread (original)
+++ apr/apr/branches/1.0.x/test/nwgnutryread Tue Dec 7 14:26:59 2004
@@ -16,8 +16,8 @@
# INCDIRS
#
XINCDIRS += \
- $(APR_WORK)/include \
- $(APR_WORK)/include/arch/NetWare \
+ $(APR)/include \
+ $(APR)/include/arch/NetWare \
$(EOLIST)
#