apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r789989 - in /apr/apr-util/branches/1.4.x: NWGNUmakefile test/NWGNUmakefile test/nwgnuaputest
Date Tue, 30 Jun 2009 22:27:50 GMT
Author: fuankg
Date: Tue Jun 30 22:27:50 2009
New Revision: 789989

URL: http://svn.apache.org/viewvc?rev=789989&view=rev
Log:
fixed NetWare aputest build.

Modified:
    apr/apr-util/branches/1.4.x/NWGNUmakefile
    apr/apr-util/branches/1.4.x/test/NWGNUmakefile
    apr/apr-util/branches/1.4.x/test/nwgnuaputest

Modified: apr/apr-util/branches/1.4.x/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/NWGNUmakefile?rev=789989&r1=789988&r2=789989&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/NWGNUmakefile (original)
+++ apr/apr-util/branches/1.4.x/NWGNUmakefile Tue Jun 30 22:27:50 2009
@@ -5,18 +5,18 @@
 SUBDIRS = \
 	ldap \
 	xml \
-	$(EOLIST) 
+	$(EOLIST)
 
 ifdef WITH_APR_DBD
 SUBDIRS += \
 	dbd \
-	$(EOLIST) 
+	$(EOLIST)
 endif
 
 ifdef WITH_APR_DBM
 SUBDIRS += \
 	dbm \
-	$(EOLIST) 
+	$(EOLIST)
 endif
 
 #
@@ -114,39 +114,39 @@
 # 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. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
-NLM_DESCRIPTION	= 
+NLM_DESCRIPTION	=
 
 #
 # This is used by the '-threadname' directive.  If left blank,
 # NLM_NAME Thread will be used.
 #
-NLM_THREAD_NAME	= 
+NLM_THREAD_NAME	=
 #
-# If this is specified, it will override VERSION value in 
+# 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
 #
-NLM_STACK_SIZE	= 
+NLM_STACK_SIZE	=
 
 #
 # If this is specified it will be used by the link '-entry' directive
 #
-NLM_ENTRY_SYM	= 
+NLM_ENTRY_SYM	=
 
 #
 # If this is specified it will be used by the link '-exit' directive
 #
-NLM_EXIT_SYM	= 
+NLM_EXIT_SYM	=
 
 #
 # If this is specified it will be used by the link '-check' directive
@@ -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 
+# 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)
@@ -207,7 +207,7 @@
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -223,14 +223,14 @@
 #
 FILES_nlm_Ximports = \
 	$(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
 #
@@ -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 \
@@ -283,7 +284,7 @@
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(APR_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE

Modified: apr/apr-util/branches/1.4.x/test/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/test/NWGNUmakefile?rev=789989&r1=789988&r2=789989&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/test/NWGNUmakefile (original)
+++ apr/apr-util/branches/1.4.x/test/NWGNUmakefile Tue Jun 30 22:27:50 2009
@@ -3,7 +3,7 @@
 #
 
 SUBDIRS = \
-	$(EOLIST) 
+	$(EOLIST)
 
 #
 # Get the 'head' of the build environment.  This includes default targets and
@@ -63,7 +63,6 @@
 
 XLFLAGS		+= \
 			$(EOLIST)
-						
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -99,19 +98,19 @@
 # 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. 
+# 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	=
 
 #
 # This is used by the '-threadname' directive.  If left blank,
 # NLM_NAME Thread will be used.
 #
-NLM_THREAD_NAME	= 
+NLM_THREAD_NAME	=
 
 #
 # This is used by the '-screenname' directive.  If left blank,
@@ -120,25 +119,25 @@
 NLM_SCREEN_NAME =
 
 #
-# If this is specified, it will override VERSION value in 
+# 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
 #
-NLM_STACK_SIZE	= 
+NLM_STACK_SIZE	=
 
 #
 # If this is specified it will be used by the link '-entry' directive
 #
-NLM_ENTRY_SYM	= 
+NLM_ENTRY_SYM	=
 
 #
 # If this is specified it will be used by the link '-exit' directive
 #
-NLM_EXIT_SYM	= 
+NLM_EXIT_SYM	=
 
 #
 # If this is specified it will be used by the link '-check' directive
@@ -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 
+# 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,13 +193,13 @@
 #
 FILES_nlm_modules = \
 	aprlib \
-  	$(EOLIST)
+	$(EOLIST)
 
 #
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -215,15 +214,15 @@
 # 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
 #
@@ -239,7 +238,7 @@
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(APR_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE

Modified: apr/apr-util/branches/1.4.x/test/nwgnuaputest
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/test/nwgnuaputest?rev=789989&r1=789988&r2=789989&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/test/nwgnuaputest (original)
+++ apr/apr-util/branches/1.4.x/test/nwgnuaputest Tue Jun 30 22:27:50 2009
@@ -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,20 +172,30 @@
 
 FILES_nlm_objs = \
 	$(OBJDIR)/abts.o \
-	$(OBJDIR)/teststrmatch.o \
-	$(OBJDIR)/testuri.o \
-	$(OBJDIR)/testuuid.o \
 	$(OBJDIR)/testbuckets.o \
-	$(OBJDIR)/testpass.o \
+	$(OBJDIR)/testcrypto.o \
+	$(OBJDIR)/testdate.o \
+	$(OBJDIR)/testdbd.o \
+	$(OBJDIR)/testdbm.o \
+	$(OBJDIR)/testmemcache.o \
 	$(OBJDIR)/testmd4.o \
 	$(OBJDIR)/testmd5.o \
 	$(OBJDIR)/testldap.o \
+	$(OBJDIR)/testpass.o \
+	$(OBJDIR)/testqueue.o \
+	$(OBJDIR)/testreslist.o \
+	$(OBJDIR)/testrmm.o \
+	$(OBJDIR)/teststrmatch.o \
+	$(OBJDIR)/testuri.o \
 	$(OBJDIR)/testutil.o \
+	$(OBJDIR)/testuuid.o \
+	$(OBJDIR)/testxml.o \
+	$(OBJDIR)/testxlate.o \
 	$(OBJDIR)/nw_misc.o \
 	$(EOLIST) 
 
 # Pending tests
-	
+
 #
 # 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.
@@ -226,7 +236,7 @@
 #
 FILES_nlm_Ximports = \
 	@libc.imp \
-	@$(APR)/aprlib.imp	\
+	@$(APR)/aprlib.imp \
 	@$(LDAPSDK)/imports/lldapsdk.imp \
 	@$(LDAPSDK)/imports/lldapssl.imp \
 	$(EOLIST)
@@ -236,7 +246,7 @@
 #
 FILES_nlm_exports = \
 	$(EOLIST)
-	
+
 #   
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character



Mime
View raw message