fixed NetWare export list and aputest build.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr-util/branches/1.3.x@790288 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/NWGNUmakefile b/NWGNUmakefile
index d39e29b..8b4680a 100644
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -114,7 +114,7 @@
# This is used by the link 'name' directive to name the nlm. If left blank
# TARGET_nlm (see below) will be used.
#
-NLM_NAME =
+NLM_NAME =
#
# This is used by the link '-desc ' directive.
@@ -131,7 +131,7 @@
# If this is specified, it will override VERSION value in
# $(APR_WORK)\build\NWGNUenvironment.inc
#
-NLM_VERSION =
+NLM_VERSION =
#
# If this is specified, it will override the default of 64K
@@ -156,14 +156,14 @@
#
# If this is specified it will be used by the link '-flags' directive
#
-NLM_FLAGS =
+NLM_FLAGS =
#
# If this is specified it will be linked in with the XDCData option in the def
# file instead of the default of $(APR)/misc/netware/apache.xdc. XDCData can
# be disabled by setting APACHE_UNIPROC in the environment
#
-XDCDATA =
+XDCDATA =
#
# Declare all target files (you must add your files here)
@@ -229,7 +229,7 @@
#
FILES_nlm_exports = \
$(EOLIST)
-
+
#
# These are the OBJ files needed to create the LIB target above.
# Paths must all use the '/' character
@@ -266,6 +266,7 @@
$(OBJDIR)/getuuid.o \
$(OBJDIR)/uuid.o \
$(OBJDIR)/apr_strmatch.o \
+ $(OBJDIR)/apr_thread_pool.o \
$(OBJDIR)/apr_uri.o \
$(OBJDIR)/sdbm.o \
$(OBJDIR)/sdbm_hash.o \
diff --git a/build/nw_apu_export.inc b/build/nw_apu_export.inc
index f2105b3..218ecd9 100644
--- a/build/nw_apu_export.inc
+++ b/build/nw_apu_export.inc
@@ -32,6 +32,7 @@
#include "apr_sdbm.h"
#include "apr_sha1.h"
#include "apr_strmatch.h"
+#include "apr_thread_pool.h"
#include "apr_uri.h"
#include "apr_uuid.h"
#include "apr_xlate.h"
diff --git a/test/NWGNUmakefile b/test/NWGNUmakefile
index c4fa07a..2ee3b64 100644
--- a/test/NWGNUmakefile
+++ b/test/NWGNUmakefile
@@ -63,7 +63,6 @@
XLFLAGS += \
$(EOLIST)
-
endif
ifeq "$(RELEASE)" "noopt"
@@ -99,7 +98,7 @@
# This is used by the link 'name' directive to name the nlm. If left blank
# TARGET_nlm (see below) will be used.
#
-NLM_NAME =
+NLM_NAME =
#
# This is used by the link '-desc ' directive.
@@ -123,7 +122,7 @@
# If this is specified, it will override VERSION value in
# $(APR_WORK)\build\NWGNUenvironment.inc
#
-NLM_VERSION =
+NLM_VERSION =
#
# If this is specified, it will override the default of 64K
@@ -148,14 +147,14 @@
#
# If this is specified it will be used by the link '-flags' directive
#
-NLM_FLAGS =
+NLM_FLAGS =
#
# If this is specified it will be linked in with the XDCData option in the def
# file instead of the default of $(APR)/misc/netware/apache.xdc. XDCData can
# be disabled by setting APACHE_UNIPROC in the environment
#
-XDCDATA =
+XDCDATA =
#
# Declare all target files (you must add your files here)
@@ -166,7 +165,7 @@
#
TARGET_nlm = \
$(OBJDIR)/aputest.nlm \
- $(OBJDIR)/testdate.nlm \
+ $(OBJDIR)/aputest.nlm \
$(EOLIST)
#
# If there is an LIB target, put it here
@@ -179,14 +178,14 @@
# Paths must all use the '/' character
#
FILES_nlm_objs = \
- $(EOLIST)
+ $(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 = \
- $(EOLIST)
+ $(EOLIST)
#
# These are the modules that the above NLM target depends on to load.
@@ -194,7 +193,7 @@
#
FILES_nlm_modules = \
aprlib \
- $(EOLIST)
+ $(EOLIST)
#
# If the nlm has a msg file, put it's path here
@@ -215,14 +214,14 @@
# Any additional imports go here
#
FILES_nlm_Ximports = \
- $(EOLIST)
+ $(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
diff --git a/test/nwgnuaputest b/test/nwgnuaputest
index 1611a58..e2f4f84 100644
--- a/test/nwgnuaputest
+++ b/test/nwgnuaputest
@@ -91,12 +91,12 @@
# This is used by the link 'name' directive to name the nlm. If left blank
# TARGET_nlm (see below) will be used.
#
-NLM_NAME =aputest
+NLM_NAME = aputest
#
# This is used by the link '-desc ' directive.
# If left blank, NLM_NAME will be used.
#
-NLM_DESCRIPTION = NLM is to test the apu layer
+NLM_DESCRIPTION = NLM is to test the apu layer
#
# This is used by the '-threadname' directive. If left blank,
@@ -114,7 +114,7 @@
# If this is specified, it will override VERSION value in
# $(APR_WORK)\build\NWGNUenvironment.inc
#
-NLM_VERSION = 1,0,0
+NLM_VERSION =
#
# If this is specified, it will override the default of 64K
@@ -139,14 +139,14 @@
#
# If this is specified it will be used by the link '-flags' directive
#
-NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION
+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 $(APR)/misc/netware/apache.xdc. XDCData can
# be disabled by setting APACHE_UNIPROC in the environment
#
-XDCDATA =
+XDCDATA =
#
# Declare all target files (you must add your files here)
@@ -172,15 +172,24 @@
FILES_nlm_objs = \
$(OBJDIR)/abts.o \
+ $(OBJDIR)/testbuckets.o \
+ $(OBJDIR)/testdate.o \
+ $(OBJDIR)/testdbd.o \
+ $(OBJDIR)/testdbm.o \
+ $(OBJDIR)/testldap.o \
+ $(OBJDIR)/testmemcache.o \
+ $(OBJDIR)/testmd4.o \
+ $(OBJDIR)/testmd5.o \
+ $(OBJDIR)/testpass.o \
+ $(OBJDIR)/testqueue.o \
+ $(OBJDIR)/testreslist.o \
+ $(OBJDIR)/testrmm.o \
$(OBJDIR)/teststrmatch.o \
$(OBJDIR)/testuri.o \
$(OBJDIR)/testuuid.o \
- $(OBJDIR)/testbuckets.o \
- $(OBJDIR)/testpass.o \
- $(OBJDIR)/testmd4.o \
- $(OBJDIR)/testmd5.o \
- $(OBJDIR)/testldap.o \
$(OBJDIR)/testutil.o \
+ $(OBJDIR)/testxlate.o \
+ $(OBJDIR)/testxml.o \
$(OBJDIR)/nw_misc.o \
$(EOLIST)
