You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by fu...@apache.org on 2011/04/10 23:52:39 UTC
svn commit: r1090896 - in /apr/apr/trunk: build/ ldap/ test/ xml/
Author: fuankg
Date: Sun Apr 10 21:52:38 2011
New Revision: 1090896
URL: http://svn.apache.org/viewvc?rev=1090896&view=rev
Log:
Some more NetWare build fixes.
Modified:
apr/apr/trunk/build/NWGNUenvironment.inc
apr/apr/trunk/build/NWGNUtail.inc
apr/apr/trunk/ldap/NWGNUmakefile
apr/apr/trunk/test/NWGNUaprtest
apr/apr/trunk/test/NWGNUechod
apr/apr/trunk/test/NWGNUglobalmutexchild
apr/apr/trunk/test/NWGNUmod_test
apr/apr/trunk/test/NWGNUproc_child
apr/apr/trunk/test/NWGNUreadchild
apr/apr/trunk/test/NWGNUsockchild
apr/apr/trunk/test/NWGNUsockperf
apr/apr/trunk/test/NWGNUtestatmc
apr/apr/trunk/test/NWGNUtryread
apr/apr/trunk/xml/NWGNUmakefile
Modified: apr/apr/trunk/build/NWGNUenvironment.inc
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/NWGNUenvironment.inc?rev=1090896&r1=1090895&r2=1090896&view=diff
==============================================================================
--- apr/apr/trunk/build/NWGNUenvironment.inc (original)
+++ apr/apr/trunk/build/NWGNUenvironment.inc Sun Apr 10 21:52:38 2011
@@ -136,11 +136,11 @@ ifdef METROWERKS
#METROWERKS = $(ProgramFiles)\Metrowerks\CodeWarrior
#endif
-CC = mwccnlm -w nocmdline -nosyspath
-CPP = $(CC)
-CPRE = $(CC) -P -EP
+CC = mwccnlm -w nocmdline -nosyspath
+CPP = $(CC)
+CPRE = $(CC) -EP
LINK = mwldnlm -w nocmdline
-AR = $(LINK) -type library
+AR = $(LINK) -type library -o
ifneq ($(findstring /sh,$(SHELL)),/sh)
PATH:=$(PATH);$(METROWERKS)\bin;$(METROWERKS)\Other Metrowerks Tools\Command Line Tools
@@ -187,11 +187,11 @@ PRELUDE = $(NOVI)/libcpre.o
else
# GNU NLM tools (gcc / nlmconv)
-CC = gcc
-CPP = g++
-CPRE = $(CC) -E
+CC = gcc
+CPP = g++
+CPRE = $(CC) -P -E
LINK = nlmconv -UT
-AR = ar cru
+AR = ar cru
RANLIB = ranlib
CFLAGS = -m32 -fno-builtin -fpcc-struct-return -fstrict-aliasing
@@ -223,12 +223,12 @@ PRELUDE = $(NOVI)/libcpre.gcc.o
endif
-# -prefix apr_arch_pre_nw.h #include pre_nw.h for all files
-CFLAGS += -prefix apr_arch_pre_nw.h
+# -include apr_arch_pre_nw.h #include pre_nw.h for all files
+CFLAGS += -include apr_arch_pre_nw.h
# Setup build tools
-AWK = awk
+AWK = awk
#
# Declare Command and tool macros here
Modified: apr/apr/trunk/build/NWGNUtail.inc
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/NWGNUtail.inc?rev=1090896&r1=1090895&r2=1090896&view=diff
==============================================================================
--- apr/apr/trunk/build/NWGNUtail.inc (original)
+++ apr/apr/trunk/build/NWGNUtail.inc Sun Apr 10 21:52:38 2011
@@ -179,7 +179,7 @@ ifeq "$(words $(strip $(TARGET_lib)))" "
$(TARGET_lib) : $(OBJDIR)/$(LIB_NAME)_lib.lst
$(call DEL,$@)
@echo $(DL)AR $@$(DL)
- $(AR) -o $@ @$<
+ $(AR) $@ @$<
ifdef RANLIB
$(RANLIB) $@
endif
Modified: apr/apr/trunk/ldap/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr/trunk/ldap/NWGNUmakefile?rev=1090896&r1=1090895&r2=1090896&view=diff
==============================================================================
--- apr/apr/trunk/ldap/NWGNUmakefile (original)
+++ apr/apr/trunk/ldap/NWGNUmakefile Sun Apr 10 21:52:38 2011
@@ -25,7 +25,7 @@ include $(APR_WORK)/build/NWGNUhead.inc
#
XINCDIRS += \
$(APR)/include \
- $(APR)/include/arch/NetWare \
+ $(APR)/include/arch/netware \
$(APR)/include/private \
$(LDAPSDK)/inc \
$(EOLIST)
Modified: apr/apr/trunk/test/NWGNUaprtest
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUaprtest?rev=1090896&r1=1090895&r2=1090896&view=diff
==============================================================================
--- apr/apr/trunk/test/NWGNUaprtest (original)
+++ apr/apr/trunk/test/NWGNUaprtest Sun Apr 10 21:52:38 2011
@@ -17,7 +17,7 @@ endif
#
XINCDIRS += \
$(APR)/include \
- $(APR)/include/arch/NetWare \
+ $(APR)/include/arch/netware \
$(LDAPSDK)/inc \
$(EOLIST)
Modified: apr/apr/trunk/test/NWGNUechod
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUechod?rev=1090896&r1=1090895&r2=1090896&view=diff
==============================================================================
--- apr/apr/trunk/test/NWGNUechod (original)
+++ apr/apr/trunk/test/NWGNUechod Sun Apr 10 21:52:38 2011
@@ -17,7 +17,7 @@ endif
#
XINCDIRS += \
$(APR)/include \
- $(APR)/include/arch/NetWare \
+ $(APR)/include/arch/netware \
$(EOLIST)
#
Modified: apr/apr/trunk/test/NWGNUglobalmutexchild
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUglobalmutexchild?rev=1090896&r1=1090895&r2=1090896&view=diff
==============================================================================
--- apr/apr/trunk/test/NWGNUglobalmutexchild (original)
+++ apr/apr/trunk/test/NWGNUglobalmutexchild Sun Apr 10 21:52:38 2011
@@ -17,7 +17,7 @@ endif
#
XINCDIRS += \
$(APR)/include \
- $(APR)/include/arch/NetWare \
+ $(APR)/include/arch/netware \
$(EOLIST)
#
Modified: apr/apr/trunk/test/NWGNUmod_test
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUmod_test?rev=1090896&r1=1090895&r2=1090896&view=diff
==============================================================================
--- apr/apr/trunk/test/NWGNUmod_test (original)
+++ apr/apr/trunk/test/NWGNUmod_test Sun Apr 10 21:52:38 2011
@@ -17,7 +17,7 @@ endif
#
XINCDIRS += \
$(APR)/include \
- $(APR)/include/arch/NetWare \
+ $(APR)/include/arch/netware \
$(EOLIST)
#
Modified: apr/apr/trunk/test/NWGNUproc_child
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUproc_child?rev=1090896&r1=1090895&r2=1090896&view=diff
==============================================================================
--- apr/apr/trunk/test/NWGNUproc_child (original)
+++ apr/apr/trunk/test/NWGNUproc_child Sun Apr 10 21:52:38 2011
@@ -17,7 +17,7 @@ endif
#
XINCDIRS += \
$(APR)/include \
- $(APR)/include/arch/NetWare \
+ $(APR)/include/arch/netware \
$(EOLIST)
#
Modified: apr/apr/trunk/test/NWGNUreadchild
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUreadchild?rev=1090896&r1=1090895&r2=1090896&view=diff
==============================================================================
--- apr/apr/trunk/test/NWGNUreadchild (original)
+++ apr/apr/trunk/test/NWGNUreadchild Sun Apr 10 21:52:38 2011
@@ -17,7 +17,7 @@ endif
#
XINCDIRS += \
$(APR)/include \
- $(APR)/include/arch/NetWare \
+ $(APR)/include/arch/netware \
$(EOLIST)
#
Modified: apr/apr/trunk/test/NWGNUsockchild
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUsockchild?rev=1090896&r1=1090895&r2=1090896&view=diff
==============================================================================
--- apr/apr/trunk/test/NWGNUsockchild (original)
+++ apr/apr/trunk/test/NWGNUsockchild Sun Apr 10 21:52:38 2011
@@ -17,7 +17,7 @@ endif
#
XINCDIRS += \
$(APR)/include \
- $(APR)/include/arch/NetWare \
+ $(APR)/include/arch/netware \
$(EOLIST)
#
Modified: apr/apr/trunk/test/NWGNUsockperf
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUsockperf?rev=1090896&r1=1090895&r2=1090896&view=diff
==============================================================================
--- apr/apr/trunk/test/NWGNUsockperf (original)
+++ apr/apr/trunk/test/NWGNUsockperf Sun Apr 10 21:52:38 2011
@@ -17,7 +17,7 @@ endif
#
XINCDIRS += \
$(APR)/include \
- $(APR)/include/arch/NetWare \
+ $(APR)/include/arch/netware \
$(EOLIST)
#
Modified: apr/apr/trunk/test/NWGNUtestatmc
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUtestatmc?rev=1090896&r1=1090895&r2=1090896&view=diff
==============================================================================
--- apr/apr/trunk/test/NWGNUtestatmc (original)
+++ apr/apr/trunk/test/NWGNUtestatmc Sun Apr 10 21:52:38 2011
@@ -17,7 +17,7 @@ endif
#
XINCDIRS += \
$(APR)/include \
- $(APR)/include/arch/NetWare \
+ $(APR)/include/arch/netware \
$(EOLIST)
#
Modified: apr/apr/trunk/test/NWGNUtryread
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUtryread?rev=1090896&r1=1090895&r2=1090896&view=diff
==============================================================================
--- apr/apr/trunk/test/NWGNUtryread (original)
+++ apr/apr/trunk/test/NWGNUtryread Sun Apr 10 21:52:38 2011
@@ -17,7 +17,7 @@ endif
#
XINCDIRS += \
$(APR)/include \
- $(APR)/include/arch/NetWare \
+ $(APR)/include/arch/netware \
$(EOLIST)
#
Modified: apr/apr/trunk/xml/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr/trunk/xml/NWGNUmakefile?rev=1090896&r1=1090895&r2=1090896&view=diff
==============================================================================
--- apr/apr/trunk/xml/NWGNUmakefile (original)
+++ apr/apr/trunk/xml/NWGNUmakefile Sun Apr 10 21:52:38 2011
@@ -66,7 +66,7 @@ XINCDIRS += \
$(EXPAT_INC) \
$(APR)/include \
$(APR)/include/private \
- $(APR)/include/arch/NetWare \
+ $(APR)/include/arch/netware \
$(EOLIST)
#