NetWare build tweaks to enable nlmconv linker.

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1333202 13f79535-47bb-0310-9956-ffa450edef68

18 files changed, 138 insertions, 96 deletions

diff --git a/NWGNUmakefile b/NWGNUmakefile
index ff9ebc675..1ab8b347a 100644
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -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)
diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc
index 4d28957b1..c2b68d9a5 100644
--- a/build/NWGNUenvironment.inc
+++ b/build/NWGNUenvironment.inc
@@ -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
diff --git a/build/NWGNUtail.inc b/build/NWGNUtail.inc
index f56051bf7..9463f668e 100644
--- a/build/NWGNUtail.inc
+++ b/build/NWGNUtail.inc
@@ -28,7 +28,8 @@ NLM_COPYRIGHT = Licensed under the Apache License, Version 2.0
 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) $(FILES_nlm_libs) $(OBJDIR)/$(NLM_NAME)_link.o
 
 $(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)
-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)copyright "$(NLM_COPYRIGHT)"$(DL)>> $@
+endif
+	@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
 
diff --git a/dbd/NWGNUdbdfreetds b/dbd/NWGNUdbdfreetds
index 8692ff3bc..71af8d151 100644
--- a/dbd/NWGNUdbdfreetds
+++ b/dbd/NWGNUdbdfreetds
@@ -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
 
diff --git a/dbd/NWGNUdbdmysql b/dbd/NWGNUdbdmysql
index c3e9c811f..bc799eb52 100644
--- a/dbd/NWGNUdbdmysql
+++ b/dbd/NWGNUdbdmysql
@@ -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
 
diff --git a/dbd/NWGNUdbdpgsql b/dbd/NWGNUdbdpgsql
index 05e67bcb0..61946df51 100644
--- a/dbd/NWGNUdbdpgsql
+++ b/dbd/NWGNUdbdpgsql
@@ -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
 
diff --git a/dbd/NWGNUdbdsqli2 b/dbd/NWGNUdbdsqli2
index 3caef7a48..8887a53ff 100644
--- a/dbd/NWGNUdbdsqli2
+++ b/dbd/NWGNUdbdsqli2
@@ -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
 
diff --git a/dbd/NWGNUdbdsqli3 b/dbd/NWGNUdbdsqli3
index e66f2347e..cf495d21c 100644
--- a/dbd/NWGNUdbdsqli3
+++ b/dbd/NWGNUdbdsqli3
@@ -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
 
diff --git a/test/NWGNUaprtest b/test/NWGNUaprtest
index 5ed6a26e0..57b00da49 100644
--- a/test/NWGNUaprtest
+++ b/test/NWGNUaprtest
@@ -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)
diff --git a/test/NWGNUechod b/test/NWGNUechod
index 39939b8be..470c0cd87 100644
--- a/test/NWGNUechod
+++ b/test/NWGNUechod
@@ -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)
  
 #   
diff --git a/test/NWGNUglobalmutexchild b/test/NWGNUglobalmutexchild
index 6d8fd5bd2..9a1518a63 100644
--- a/test/NWGNUglobalmutexchild
+++ b/test/NWGNUglobalmutexchild
@@ -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)
  
 #   
diff --git a/test/NWGNUmod_test b/test/NWGNUmod_test
index f8f16976e..a69f4eab8 100644
--- a/test/NWGNUmod_test
+++ b/test/NWGNUmod_test
@@ -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)
  
 #   
diff --git a/test/NWGNUproc_child b/test/NWGNUproc_child
index 9e190721e..423089c8a 100644
--- a/test/NWGNUproc_child
+++ b/test/NWGNUproc_child
@@ -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)
  
 #   
diff --git a/test/NWGNUreadchild b/test/NWGNUreadchild
index be111649d..451407f94 100644
--- a/test/NWGNUreadchild
+++ b/test/NWGNUreadchild
@@ -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)
  
 #   
diff --git a/test/NWGNUsockchild b/test/NWGNUsockchild
index 2a7a4f68d..5ed87ab21 100644
--- a/test/NWGNUsockchild
+++ b/test/NWGNUsockchild
@@ -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)
  
 #   
diff --git a/test/NWGNUsockperf b/test/NWGNUsockperf
index e10b3f311..db6486af4 100644
--- a/test/NWGNUsockperf
+++ b/test/NWGNUsockperf
@@ -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)
  
 #   
diff --git a/test/NWGNUtestatmc b/test/NWGNUtestatmc
index 1a0484a5d..977fd8bfc 100644
--- a/test/NWGNUtestatmc
+++ b/test/NWGNUtestatmc
@@ -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)
  
 #   
diff --git a/test/NWGNUtryread b/test/NWGNUtryread
index 52246fe62..f18d20d32 100644
--- a/test/NWGNUtryread
+++ b/test/NWGNUtryread
@@ -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)
  
 #