apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r1333202 - in /apr/apr/trunk: ./ build/ dbd/ test/
Date Wed, 02 May 2012 20:56:08 GMT
Author: fuankg
Date: Wed May  2 20:56:07 2012
New Revision: 1333202

URL: http://svn.apache.org/viewvc?rev=1333202&view=rev
Log:
NetWare build tweaks to enable nlmconv linker.

Modified:
    apr/apr/trunk/NWGNUmakefile
    apr/apr/trunk/build/NWGNUenvironment.inc
    apr/apr/trunk/build/NWGNUtail.inc
    apr/apr/trunk/dbd/NWGNUdbdfreetds
    apr/apr/trunk/dbd/NWGNUdbdmysql
    apr/apr/trunk/dbd/NWGNUdbdpgsql
    apr/apr/trunk/dbd/NWGNUdbdsqli2
    apr/apr/trunk/dbd/NWGNUdbdsqli3
    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

Modified: apr/apr/trunk/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr/trunk/NWGNUmakefile?rev=1333202&r1=1333201&r2=1333202&view=diff
==============================================================================
--- apr/apr/trunk/NWGNUmakefile (original)
+++ apr/apr/trunk/NWGNUmakefile Wed May  2 20:56:07 2012
@@ -217,7 +217,7 @@ endif
 # These will be added as a module command in the link.opt file.
 #
 FILES_nlm_modules = \
-	Libc \
+	libc \
 	$(EOLIST)
 
 # Include the Winsock libraries if Winsock is being used
@@ -253,14 +253,16 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@libc.imp \
-	@netware.imp \
+	@$(NOVI)/libc.imp \
+	@$(NOVI)/netware.imp \
 	$(EOLIST)
 
 # Include the Winsock imports if Winsock is being used
 ifndef USE_STDSOCKETS
 FILES_nlm_Ximports +=  \
-	@ws2nlm.imp \
+	@$(NOVI)/ws2nlm.imp \
+	$(EOLIST)
+FILES_nlm_imports +=  \
 	WSAStartupRTags \
 	WSACleanupRTag \
 	$(EOLIST)

Modified: apr/apr/trunk/build/NWGNUenvironment.inc
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/NWGNUenvironment.inc?rev=1333202&r1=1333201&r2=1333202&view=diff
==============================================================================
--- apr/apr/trunk/build/NWGNUenvironment.inc (original)
+++ apr/apr/trunk/build/NWGNUenvironment.inc Wed May  2 20:56:07 2012
@@ -183,11 +183,11 @@ else
 CC	= gcc
 CPP	= g++
 CPRE	= $(CC) -P -E
-LINK	= nlmconv -UT
+LINK	= nlmconv
 AR	= ar cru
 RANLIB	= ranlib
 
-CFLAGS	= -m32 -fno-builtin -fpcc-struct-return -fstrict-aliasing
+CFLAGS	= -m32 -fno-builtin -fpcc-struct-return -fno-strict-aliasing
 CFLAGS	+= -fpack-struct=4
 CFLAGS	+= -Wall
 CFLAGS	+= -Wdeclaration-after-statement -Wmissing-declarations -Wmissing-prototypes

Modified: apr/apr/trunk/build/NWGNUtail.inc
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/NWGNUtail.inc?rev=1333202&r1=1333201&r2=1333202&view=diff
==============================================================================
--- apr/apr/trunk/build/NWGNUtail.inc (original)
+++ apr/apr/trunk/build/NWGNUtail.inc Wed May  2 20:56:07 2012
@@ -28,7 +28,8 @@ NLM_COPYRIGHT = Licensed under the Apach
 endif
 
 ifeq "$(NLM_FLAGS)" ""
-NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION
+#NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION
+NLM_FLAGS = flag_on 72
 endif
 
 ifeq "$(NLM_STACK_SIZE)" ""
@@ -43,6 +44,10 @@ ifeq "$(NLM_EXIT_SYM)" ""
 NLM_EXIT_SYM = _LibCPostlude
 endif
 
+ifeq "$(XDCDATA)" ""
+XDCDATA = $(APR)/misc/netware/apr.xdc
+endif
+
 ifeq "$(NLM_VERSION)" ""
 NLM_VERSION = $(VERSION)
 endif
@@ -223,7 +228,7 @@ endif
 # If we only have one target NLM then build it
 ifeq "$(words $(strip $(TARGET_nlm)))" "1"
 
-$(TARGET_nlm) : $(FILES_nlm_objs) $(FILES_nlm_libs) $(OBJDIR)/$(NLM_NAME)_link.opt
+$(TARGET_nlm) : $(FILES_nlm_objs) $(FILES_nlm_libs) $(OBJDIR)/$(NLM_NAME)_link.opt $(OBJDIR)/$(NLM_NAME)_link.def
 	@echo $(DL)LINK $@$(DL)
 	$(LINK) @$(OBJDIR)/$(NLM_NAME)_link.opt
 
@@ -232,36 +237,31 @@ $(TARGET_nlm) : $(FILES_nlm_objs) $(FILE
 
 $(OBJDIR)/$(NLM_NAME)_link.opt : $($(NLM_NAME)_LINKOPT_DEPENDS)
 	$(call DEL,$@)
-	$(call DEL,$(@:.opt=.def))
 	@echo $(DL)GEN  $@$(DL)
+ifdef METROWERKS
 	@echo $(DL)# Do not edit this file - it is created by make!$(DL) > $@
 	@echo $(DL)# All your changes will be lost!!$(DL)>> $@
 	@echo $(DL)-warnings off$(DL)>> $@
 	@echo $(DL)-zerobss$(DL)>> $@
+	@echo $(DL)-nodefaults$(DL)>> $@
+	@echo $(DL)-map $(OBJDIR)/$(NLM_NAME).map$(DL)>> $@
 	@echo $(DL)-o $(TARGET_nlm)$(DL)>> $@
 ifneq "$(FILE_nlm_copyright)" ""
 	@-$(CAT) $(FILE_nlm_copyright) >> $@
 endif
 ifeq "$(RELEASE)" "debug"
 	@echo $(DL)-g$(DL)>> $@
-	@echo $(DL)-sym internal$(DL)>> $@
 	@echo $(DL)-sym codeview4$(DL)>> $@
 	@echo $(DL)-osym $(OBJDIR)/$(NLM_NAME).sym$(DL)>> $@
-else
-	@echo $(DL)-sym internal$(DL)>> $@
 endif
-	@echo $(DL)-l $(APR)/$(OBJDIR)$(DL)>> $@
-	@echo $(DL)-l $(APRXML)/$(OBJDIR)$(DL)>> $@
-	@echo $(DL)-l $(APR)/misc/netware$(DL)>> $@
-	@echo $(DL)-l $(APR)$(DL)>> $@
-	@echo $(DL)-l "$(METROWERKS)/Novell Support/Metrowerks Support/Libraries/Runtime"$(DL)>>
$@
-	@echo $(DL)-l "$(METROWERKS)/Novell Support/Metrowerks Support/Libraries/MSL C++"$(DL)>>
$@
+	@echo $(DL)-sym internal$(DL)>> $@
+	@echo $(DL)-L$(APR)/misc/netware$(DL)>> $@
+	@echo $(DL)-L"$(METROWERKS)/Novell Support/Metrowerks Support/Libraries/Runtime"$(DL)>>
$@
+	@echo $(DL)-L"$(METROWERKS)/Novell Support/Metrowerks Support/Libraries/MSL C++"$(DL)>>
$@
 ifneq "$(IPV6)" ""
-	@echo $(DL)-l $(NOVELLLIBC)/include/winsock/IPV6$(DL)>> $@
+	@echo $(DL)-L$(NOVELLLIBC)/include/winsock/IPV6$(DL)>> $@
 endif
-	@echo $(DL)-l $(NOVELLLIBC)/imports$(DL)>> $@
-	@echo $(DL)-nodefaults$(DL)>> $@
-	@echo $(DL)-map $(OBJDIR)/$(NLM_NAME).map$(DL)>> $@
+	@echo $(DL)-L$(NOVELLLIBC)/imports$(DL)>> $@
 ifneq "$(strip $(XLFLAGS))" ""
 	@echo $(DL)$(XLFLAGS)$(DL)>> $@
 endif
@@ -269,46 +269,80 @@ ifneq "$(strip $(FILES_nlm_objs))" ""
 	@echo $(DL)$(foreach objfile,$(strip $(FILES_nlm_objs)),$(objfile))$(DL)>> $@
 endif
 ifneq "$(FILES_nlm_libs)" ""
-	@echo $(DL)$(foreach libfile, $(notdir $(strip $(FILES_nlm_libs))),-l$(libfile))$(DL)>>
$@
+	@echo $(DL)$(foreach libpath,$(dir $(strip $(FILES_nlm_libs))),-L$(libpath))$(DL)>>
$@
+	@echo $(DL)$(foreach libfile,$(notdir $(strip $(FILES_nlm_libs))),-l$(libfile))$(DL)>>
$@
+endif
+ifneq "$(FILES_nlm_Ximports)" ""
+	@echo $(DL)$(foreach imppath,$(dir $(strip $(FILES_nlm_Ximports))),$(subst @,-L,$(imppath)))$(DL)>>
$@
 endif
 	@echo $(DL)-commandfile $(@:.opt=.def)$(DL)>> $@
-	@echo $(DL)# Do not edit this file - it is created by make!$(DL)> $(@:.opt=.def)
-	@echo $(DL)# All your changes will be lost!!$(DL)>> $(@:.opt=.def)
+else
+	@echo $(DL)-UT $(@:.opt=.def)$(DL)>> $@
+endif
+
+$(OBJDIR)/$(NLM_NAME)_link.def : $($(NLM_NAME)_LINKOPT_DEPENDS)
+	$(call DEL,$@)
+	@echo $(DL)GEN  $@$(DL)
+	@echo $(DL)# Do not edit this file - it is created by make!$(DL)> $@
+	@echo $(DL)# All your changes will be lost!!$(DL)>> $@
 ifneq "$(FILE_nlm_msg)" ""
-	@echo $(DL)Messages $(FILE_nlm_msg)$(DL)>> $(@:.opt=.def)
+	@echo $(DL)Messages $(FILE_nlm_msg)$(DL)>> $@
 endif
 ifneq "$(FILE_nlm_hlp)" ""
-	@echo $(DL)Help $(FILE_nlm_hlp)$(DL)>> $(@:.opt=.def)
+	@echo $(DL)Help $(FILE_nlm_hlp)$(DL)>> $@
 endif
 ifeq "$(FILE_nlm_copyright)" ""
-	@echo $(DL)copyright "$(NLM_COPYRIGHT)"$(DL)>> $(@:.opt=.def)
+	@echo $(DL)copyright "$(NLM_COPYRIGHT)"$(DL)>> $@
 endif
-	@echo $(DL)description "$(NLM_DESCRIPTION)"$(DL)>> $(@:.opt=.def)
-	@echo $(DL)threadname "$(NLM_THREAD_NAME)"$(DL)>> $(@:.opt=.def)
-	@echo $(DL)screenname "$(NLM_SCREEN_NAME)"$(DL)>> $(@:.opt=.def)
-	@echo $(DL)stacksize $(subst K,000,$(subst k,K,$(strip $(NLM_STACK_SIZE))))$(DL)>>
$(@:.opt=.def)
-	@echo $(DL)version $(NLM_VERSION) $(DL)>> $(@:.opt=.def)
-	@echo $(DL)$(strip $(NLM_FLAGS))$(DL)>> $(@:.opt=.def)
-	@echo $(DL)start $(NLM_ENTRY_SYM)$(DL)>> $(@:.opt=.def)
-	@echo $(DL)exit $(NLM_EXIT_SYM)$(DL)>> $(@:.opt=.def)
+	@echo $(DL)description "$(NLM_DESCRIPTION)"$(DL)>> $@
+	@echo $(DL)threadname "$(NLM_THREAD_NAME)"$(DL)>> $@
+	@echo $(DL)screenname "$(NLM_SCREEN_NAME)"$(DL)>> $@
+	@echo $(DL)stacksize $(subst K,000,$(subst k,K,$(strip $(NLM_STACK_SIZE))))$(DL)>>
$@
+	@echo $(DL)version $(NLM_VERSION) $(DL)>> $@
+	@echo $(DL)$(strip $(NLM_FLAGS))$(DL)>> $@
+	@echo $(DL)start $(NLM_ENTRY_SYM)$(DL)>> $@
+	@echo $(DL)exit $(NLM_EXIT_SYM)$(DL)>> $@
+#	@echo $(DL)map $(OBJDIR)/$(NLM_NAME).map$(DL)>> $@
 ifneq "$(NLM_CHECK_SYM)" ""
-	@echo $(DL)check $(NLM_CHECK_SYM)$(DL)>> $(@:.opt=.def)
+	@echo $(DL)check $(NLM_CHECK_SYM)$(DL)>> $@
 endif
 ifneq "$(FILES_nlm_modules)" ""
-	@echo $(DL)module $(foreach module,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_modules))),$(module))$(DL)>>
$(@:.opt=.def)
+	@echo $(DL)module $(foreach module,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_modules))),$(module))$(DL)>>
$@
 endif
+ifneq "$(FILES_nlm_imports)" ""
+	@echo $(DL)import $(foreach import,$(strip $(FILES_nlm_imports)),$(import))$(DL)>>
$@
+endif
+ifdef METROWERKS
 ifneq "$(FILES_nlm_Ximports)" ""
-	@echo $(DL)import $(foreach import,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_Ximports))),$(import))$(DL)>>
$(@:.opt=.def)
+	@echo $(DL)import $(foreach import,$(notdir $(strip $(FILES_nlm_Ximports))),@$(import))$(DL)>>
$@
 endif
 ifneq "$(FILES_nlm_exports)" ""
-	@echo $(DL)export $(foreach export,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_exports))),$(export))$(DL)>>
$(@:.opt=.def)
+	@echo $(DL)export $(foreach export,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_exports))),$(export))$(DL)>>
$@
 endif
 # if APACHE_UNIPROC is defined, don't include XDCData
 ifndef APACHE_UNIPROC
-ifneq "$(string $(XDCDATA))" ""
-	@echo $(DL)xdcdata $(XDCDATA)$(DL)>> $(@:.opt=.def)
+	@echo $(DL)xdcdata $(notdir $(XDCDATA))$(DL)>> $@
+endif
 else
-	@echo $(DL)xdcdata apr.xdc$(DL)>> $(@:.opt=.def)
+ifneq "$(FILES_nlm_Ximports)" ""
+	@echo $(DL)import $(foreach import,$(strip $(FILES_nlm_Ximports)),$(import))$(DL)>>
$@
+endif
+ifneq "$(FILES_nlm_exports)" ""
+	@echo $(DL)export $(foreach export,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_exports))),$(export))$(DL)>>
$@
+endif
+# if APACHE_UNIPROC is defined, don't include XDCData
+ifndef APACHE_UNIPROC
+	@echo $(DL)xdcdata $(XDCDATA)$(DL)>> $@
+endif
+ifneq "$(strip $(FILES_nlm_objs))" ""
+	@echo $(DL)input $(foreach objfile,$(strip $(FILES_nlm_objs)),$(objfile))$(DL)>> $@
+endif
+ifneq "$(FILES_nlm_libs)" ""
+	@echo $(DL)input $(foreach libfile,$(strip $(FILES_nlm_libs)),$(libfile))$(DL)>> $@
+endif
+	@echo $(DL)output $(TARGET_nlm)$(DL)>> $@
+ifeq "$(RELEASE)" "debug"
+	@echo $(DL)debug$(DL)>> $@
 endif
 endif
 

Modified: apr/apr/trunk/dbd/NWGNUdbdfreetds
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/NWGNUdbdfreetds?rev=1333202&r1=1333201&r2=1333202&view=diff
==============================================================================
--- apr/apr/trunk/dbd/NWGNUdbdfreetds (original)
+++ apr/apr/trunk/dbd/NWGNUdbdfreetds Wed May  2 20:56:07 2012
@@ -52,6 +52,8 @@ XCFLAGS		+= \
 XDEFINES	+= \
 			-DAPU_HAVE_FREETDS=1 \
 			-DAPU_DSO_MODULE_BUILD \
+			-DHAVE_SYBDB_H=1 \
+			-DSYBDBLIB \
 			$(EOLIST)
 
 #
@@ -61,7 +63,6 @@ XLFLAGS		+= \
 			$(EOLIST)
 
 XLFLAGS		+= \
-			-l $(FREETDSSDK)/lib \
 			$(EOLIST)
 
 #
@@ -236,13 +237,13 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@aprlib.imp \
-	@libc.imp \
+	@$(APR)/aprlib.imp \
+	@$(NOVI)/libc.imp \
 	$(EOLIST)
 
 ifneq ($(LINK_STATIC),1)
 FILES_nlm_Ximports += \
-	@$(notdir $(FREETDS_IMP)) \
+	@$(FREETDS_IMP) \
 	$(EOLIST)
 endif
 

Modified: apr/apr/trunk/dbd/NWGNUdbdmysql
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/NWGNUdbdmysql?rev=1333202&r1=1333201&r2=1333202&view=diff
==============================================================================
--- apr/apr/trunk/dbd/NWGNUdbdmysql (original)
+++ apr/apr/trunk/dbd/NWGNUdbdmysql Wed May  2 20:56:07 2012
@@ -65,7 +65,6 @@ XLFLAGS		+= \
 			$(EOLIST)
 
 XLFLAGS		+= \
-			-l $(MYSQLSDK)/lib \
 			$(EOLIST)
 
 #
@@ -240,13 +239,13 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@aprlib.imp \
-	@libc.imp \
+	@$(APR)/aprlib.imp \
+	@$(NOVI)/libc.imp \
 	$(EOLIST)
 
 ifneq ($(LINK_STATIC),1)
 FILES_nlm_Ximports += \
-	@$(notdir $(MYSQL_IMP)) \
+	@$(MYSQL_IMP) \
 	$(EOLIST)
 endif
 

Modified: apr/apr/trunk/dbd/NWGNUdbdpgsql
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/NWGNUdbdpgsql?rev=1333202&r1=1333201&r2=1333202&view=diff
==============================================================================
--- apr/apr/trunk/dbd/NWGNUdbdpgsql (original)
+++ apr/apr/trunk/dbd/NWGNUdbdpgsql Wed May  2 20:56:07 2012
@@ -63,11 +63,9 @@ XLFLAGS		+= \
 
 ifdef LINK_STATIC
 XLFLAGS		+= \
-			-l $(PGSQLSDK)/lib \
 			$(EOLIST)
 else
 XLFLAGS		+= \
-			-l $(PGSQLSDK)/imp \
 			$(EOLIST)
 endif
 
@@ -243,13 +241,13 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@aprlib.imp \
-	@libc.imp \
+	@$(APR)/aprlib.imp \
+	@$(NOVI)/libc.imp \
 	$(EOLIST)
 
 ifneq ($(LINK_STATIC),1)
 FILES_nlm_Ximports += \
-	@$(notdir $(PGSQL_IMP)) \
+	@$(PGSQL_IMP) \
 	$(EOLIST)
 endif
 

Modified: apr/apr/trunk/dbd/NWGNUdbdsqli2
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/NWGNUdbdsqli2?rev=1333202&r1=1333201&r2=1333202&view=diff
==============================================================================
--- apr/apr/trunk/dbd/NWGNUdbdsqli2 (original)
+++ apr/apr/trunk/dbd/NWGNUdbdsqli2 Wed May  2 20:56:07 2012
@@ -61,7 +61,6 @@ XLFLAGS		+= \
 			$(EOLIST)
 
 XLFLAGS		+= \
-			-l $(SQLITE2SDK) \
 			$(EOLIST)
 
 #
@@ -236,13 +235,18 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@aprlib.imp \
-	@libc.imp \
+	@$(APR)/aprlib.imp \
+	@$(NOVI)/libc.imp \
+	$(EOLIST)
+
+FILES_nlm_imports = \
+	apr_dbd_mutex_lock \
+	apr_dbd_mutex_unlock \
 	$(EOLIST)
 
 ifneq ($(LINK_STATIC),1)
 FILES_nlm_Ximports += \
-	@$(notdir $(SQLITE2_IMP)) \
+	@$(SQLITE2_IMP) \
 	$(EOLIST)
 endif
 

Modified: apr/apr/trunk/dbd/NWGNUdbdsqli3
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/NWGNUdbdsqli3?rev=1333202&r1=1333201&r2=1333202&view=diff
==============================================================================
--- apr/apr/trunk/dbd/NWGNUdbdsqli3 (original)
+++ apr/apr/trunk/dbd/NWGNUdbdsqli3 Wed May  2 20:56:07 2012
@@ -61,7 +61,6 @@ XLFLAGS		+= \
 			$(EOLIST)
 
 XLFLAGS		+= \
-			-l $(SQLITE3SDK) \
 			$(EOLIST)
 
 #
@@ -236,15 +235,18 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@aprlib.imp \
-	@libc.imp \
+	@$(APR)/aprlib.imp \
+	@$(NOVI)/libc.imp \
+	$(EOLIST)
+
+FILES_nlm_imports = \
 	apr_dbd_mutex_lock \
 	apr_dbd_mutex_unlock \
 	$(EOLIST)
 
 ifneq ($(LINK_STATIC),1)
 FILES_nlm_Ximports += \
-	@$(notdir $(SQLITE3_IMP)) \
+	@$(SQLITE3_IMP) \
 	$(EOLIST)
 endif
 

Modified: apr/apr/trunk/test/NWGNUaprtest
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUaprtest?rev=1333202&r1=1333201&r2=1333202&view=diff
==============================================================================
--- apr/apr/trunk/test/NWGNUaprtest (original)
+++ apr/apr/trunk/test/NWGNUaprtest Wed May  2 20:56:07 2012
@@ -276,14 +276,16 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@aprlib.imp \
-	@libc.imp \
+	@$(APR)/aprlib.imp \
+	@$(NOVI)/libc.imp \
 	$(EOLIST)
  
 # Include the Winsock imports if Winsock is being used
 ifndef USE_STDSOCKETS
 FILES_nlm_Ximports +=  \
-	@ws2nlm.imp \
+	@$(NOVI)/ws2nlm.imp \
+	$(EOLIST)
+FILES_nlm_imports +=  \
 	WSAStartupRTags \
 	WSACleanupRTag \
 	$(EOLIST)

Modified: apr/apr/trunk/test/NWGNUechod
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUechod?rev=1333202&r1=1333201&r2=1333202&view=diff
==============================================================================
--- apr/apr/trunk/test/NWGNUechod (original)
+++ apr/apr/trunk/test/NWGNUechod Wed May  2 20:56:07 2012
@@ -187,7 +187,7 @@ FILES_nlm_libs = \
 #
 FILES_nlm_modules = \
 	aprlib \
-	Libc \
+	libc \
 	$(EOLIST)
 
 #
@@ -209,8 +209,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@aprlib.imp \
-	@libc.imp \
+	@$(APR)/aprlib.imp \
+	@$(NOVI)/libc.imp \
 	$(EOLIST)
  
 #   

Modified: apr/apr/trunk/test/NWGNUglobalmutexchild
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUglobalmutexchild?rev=1333202&r1=1333201&r2=1333202&view=diff
==============================================================================
--- apr/apr/trunk/test/NWGNUglobalmutexchild (original)
+++ apr/apr/trunk/test/NWGNUglobalmutexchild Wed May  2 20:56:07 2012
@@ -188,7 +188,7 @@ FILES_nlm_libs = \
 #
 FILES_nlm_modules = \
 	aprlib \
-	Libc \
+	libc \
 	$(EOLIST)
 
 #
@@ -210,8 +210,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@aprlib.imp \
-	@libc.imp \
+	@$(APR)/aprlib.imp \
+	@$(NOVI)/libc.imp \
 	$(EOLIST)
  
 #   

Modified: apr/apr/trunk/test/NWGNUmod_test
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUmod_test?rev=1333202&r1=1333201&r2=1333202&view=diff
==============================================================================
--- apr/apr/trunk/test/NWGNUmod_test (original)
+++ apr/apr/trunk/test/NWGNUmod_test Wed May  2 20:56:07 2012
@@ -186,7 +186,7 @@ FILES_nlm_libs = \
 #
 FILES_nlm_modules = \
 	aprlib \
-	Libc \
+	libc \
 	$(EOLIST)
 
 #
@@ -208,8 +208,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@aprlib.imp \
-	@libc.imp \
+	@$(APR)/aprlib.imp \
+	@$(NOVI)/libc.imp \
 	$(EOLIST)
  
 #   

Modified: apr/apr/trunk/test/NWGNUproc_child
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUproc_child?rev=1333202&r1=1333201&r2=1333202&view=diff
==============================================================================
--- apr/apr/trunk/test/NWGNUproc_child (original)
+++ apr/apr/trunk/test/NWGNUproc_child Wed May  2 20:56:07 2012
@@ -186,7 +186,7 @@ FILES_nlm_libs = \
 #
 FILES_nlm_modules = \
 	aprlib \
-	Libc \
+	libc \
 	$(EOLIST)
 
 #
@@ -208,8 +208,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@aprlib.imp \
-	@libc.imp \
+	@$(APR)/aprlib.imp \
+	@$(NOVI)/libc.imp \
 	$(EOLIST)
  
 #   

Modified: apr/apr/trunk/test/NWGNUreadchild
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUreadchild?rev=1333202&r1=1333201&r2=1333202&view=diff
==============================================================================
--- apr/apr/trunk/test/NWGNUreadchild (original)
+++ apr/apr/trunk/test/NWGNUreadchild Wed May  2 20:56:07 2012
@@ -186,7 +186,7 @@ FILES_nlm_libs = \
 #
 FILES_nlm_modules = \
 	aprlib \
-	Libc \
+	libc \
 	$(EOLIST)
 
 #
@@ -208,8 +208,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@aprlib.imp \
-	@libc.imp \
+	@$(APR)/aprlib.imp \
+	@$(NOVI)/libc.imp \
 	$(EOLIST)
  
 #   

Modified: apr/apr/trunk/test/NWGNUsockchild
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUsockchild?rev=1333202&r1=1333201&r2=1333202&view=diff
==============================================================================
--- apr/apr/trunk/test/NWGNUsockchild (original)
+++ apr/apr/trunk/test/NWGNUsockchild Wed May  2 20:56:07 2012
@@ -186,7 +186,7 @@ FILES_nlm_libs = \
 #
 FILES_nlm_modules = \
 	aprlib \
-	Libc \
+	libc \
 	$(EOLIST)
 
 #
@@ -208,8 +208,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@aprlib.imp \
-	@libc.imp \
+	@$(APR)/aprlib.imp \
+	@$(NOVI)/libc.imp \
 	$(EOLIST)
  
 #   

Modified: apr/apr/trunk/test/NWGNUsockperf
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUsockperf?rev=1333202&r1=1333201&r2=1333202&view=diff
==============================================================================
--- apr/apr/trunk/test/NWGNUsockperf (original)
+++ apr/apr/trunk/test/NWGNUsockperf Wed May  2 20:56:07 2012
@@ -187,7 +187,7 @@ FILES_nlm_libs = \
 #
 FILES_nlm_modules = \
 	aprlib \
-	Libc \
+	libc \
 	$(EOLIST)
 
 #
@@ -209,8 +209,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@aprlib.imp \
-	@libc.imp \
+	@$(APR)/aprlib.imp \
+	@$(NOVI)/libc.imp \
 	$(EOLIST)
  
 #   

Modified: apr/apr/trunk/test/NWGNUtestatmc
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUtestatmc?rev=1333202&r1=1333201&r2=1333202&view=diff
==============================================================================
--- apr/apr/trunk/test/NWGNUtestatmc (original)
+++ apr/apr/trunk/test/NWGNUtestatmc Wed May  2 20:56:07 2012
@@ -187,8 +187,8 @@ FILES_nlm_libs = \
 # These will be added as a module command in the link.opt file.
 #
 FILES_nlm_modules = \
-	Libc \
-	APRLIB \
+	aprlib \
+	libc \
 	$(EOLIST)
 
 #
@@ -210,8 +210,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@aprlib.imp \
-	@libc.imp \
+	@$(APR)/aprlib.imp \
+	@$(NOVI)/libc.imp \
 	$(EOLIST)
  
 #   

Modified: apr/apr/trunk/test/NWGNUtryread
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUtryread?rev=1333202&r1=1333201&r2=1333202&view=diff
==============================================================================
--- apr/apr/trunk/test/NWGNUtryread (original)
+++ apr/apr/trunk/test/NWGNUtryread Wed May  2 20:56:07 2012
@@ -186,7 +186,7 @@ FILES_nlm_libs = \
 #
 FILES_nlm_modules = \
 	aprlib \
-	Libc \
+	libc \
 	$(EOLIST)
 
 #
@@ -208,8 +208,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@aprlib.imp \
-	@libc.imp \
+	@$(APR)/aprlib.imp \
+	@$(NOVI)/libc.imp \
 	$(EOLIST)
  
 #   



Mime
View raw message