apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r796813 - in /apr/apr/branches/1.3.x/test: NWGNUaprtest NWGNUglobalmutexchild NWGNUmakefile NWGNUmod_test NWGNUproc_child NWGNUreadchild NWGNUsockchild NWGNUtestatmc NWGNUtryread
Date Wed, 22 Jul 2009 17:51:20 GMT
Author: fuankg
Date: Wed Jul 22 17:51:19 2009
New Revision: 796813

URL: http://svn.apache.org/viewvc?rev=796813&view=rev
Log:
some NetWare makefile cleanups; added a missing import file.

Modified:
    apr/apr/branches/1.3.x/test/NWGNUaprtest
    apr/apr/branches/1.3.x/test/NWGNUglobalmutexchild
    apr/apr/branches/1.3.x/test/NWGNUmakefile
    apr/apr/branches/1.3.x/test/NWGNUmod_test
    apr/apr/branches/1.3.x/test/NWGNUproc_child
    apr/apr/branches/1.3.x/test/NWGNUreadchild
    apr/apr/branches/1.3.x/test/NWGNUsockchild
    apr/apr/branches/1.3.x/test/NWGNUtestatmc
    apr/apr/branches/1.3.x/test/NWGNUtryread

Modified: apr/apr/branches/1.3.x/test/NWGNUaprtest
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/test/NWGNUaprtest?rev=796813&r1=796812&r2=796813&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/test/NWGNUaprtest (original)
+++ apr/apr/branches/1.3.x/test/NWGNUaprtest Wed Jul 22 17:51:19 2009
@@ -89,30 +89,30 @@
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME		=aprtest
+NLM_NAME	= aprtest
 #
 # This is used by the link '-desc ' directive. 
 # If left blank, NLM_NAME will be used.
 #
-NLM_DESCRIPTION	=  NLM is to test the apr layer
+NLM_DESCRIPTION	 = NLM is to test the apr layer
 
 #
 # This is used by the '-threadname' directive.  If left blank,
 # NLM_NAME Thread will be used.
 #
-NLM_THREAD_NAME	= aprtest
+NLM_THREAD_NAME	= $(NLM_NAME)
 
 #
 # This is used by the '-screenname' directive.  If left blank,
 # 'Apache for NetWare' Thread will be used.
 #
-NLM_SCREEN_NAME = aprtest
+NLM_SCREEN_NAME = $(NLM_NAME)
 
 #
 # 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
@@ -137,14 +137,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)
@@ -154,7 +154,7 @@
 # If there is an NLM target, put it here
 #
 TARGET_nlm = \
-	$(OBJDIR)/aprtest.nlm \
+	$(OBJDIR)/$(NLM_NAME).nlm \
 	$(EOLIST)
 
 #
@@ -254,8 +254,9 @@
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
+	@$(APR)/aprlib.imp \
 	@libc.imp \
-	@$(APR)/aprlib.imp	\
+	@netware.imp \
 	$(EOLIST)
  
 #   
@@ -263,7 +264,7 @@
 #
 FILES_nlm_exports = \
 	$(EOLIST)
-	
+
 #   
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character

Modified: apr/apr/branches/1.3.x/test/NWGNUglobalmutexchild
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/test/NWGNUglobalmutexchild?rev=796813&r1=796812&r2=796813&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/test/NWGNUglobalmutexchild (original)
+++ apr/apr/branches/1.3.x/test/NWGNUglobalmutexchild Wed Jul 22 17:51:19 2009
@@ -54,7 +54,6 @@
 
 XLFLAGS		+= \
 			$(EOLIST)
-						
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -92,19 +91,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		=	globalmutexchild
+NLM_NAME	= globalmutexchild
 
 #
 # This is used by the link '-desc ' directive. 
 # If left blank, NLM_NAME will be used.
 #
-NLM_DESCRIPTION	=  child NLM to test the global Mutex layer
+NLM_DESCRIPTION	= child NLM to test the global Mutex layer
 
 #
 # This is used by the '-threadname' directive.  If left blank,
 # NLM_NAME Thread will be used.
 #
-NLM_THREAD_NAME	= globalmutexchild
+NLM_THREAD_NAME	= $(NLM_NAME)
 
 #
 # This is used by the '-screenname' directive.  If left blank,
@@ -116,7 +115,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
@@ -141,7 +140,7 @@
 #
 # If this is specified it will be used by the link '-flags' directive
 #
-NLM_FLAGS		= AUTOUNLOAD, PSEUDOPREEMPTION, MULTIPLE
+NLM_FLAGS	= AUTOUNLOAD, PSEUDOPREEMPTION, MULTIPLE
  
 #
 # If this is specified it will be linked in with the XDCData option in the def 
@@ -158,7 +157,7 @@
 # If there is an NLM target, put it here
 #
 TARGET_nlm = \
-	$(OBJDIR)/globalmutexchild.nlm \
+	$(OBJDIR)/$(NLM_NAME).nlm \
 	$(EOLIST)
 
 #
@@ -172,7 +171,7 @@
 # Paths must all use the '/' character
 #
 FILES_nlm_objs = \
-	$(OBJDIR)/globalmutexchild.o \
+	$(OBJDIR)/$(NLM_NAME).o \
 	$(EOLIST)
 
 #
@@ -220,7 +219,7 @@
 #
 FILES_nlm_exports = \
 	$(EOLIST)
-	
+
 #   
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character

Modified: apr/apr/branches/1.3.x/test/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/test/NWGNUmakefile?rev=796813&r1=796812&r2=796813&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/test/NWGNUmakefile (original)
+++ apr/apr/branches/1.3.x/test/NWGNUmakefile Wed Jul 22 17:51:19 2009
@@ -16,152 +16,6 @@
 # build this level's files
 
 #
-# Make sure all needed macro's are defined
-#
-
-
-#
-# These directories will be at the beginning of the include list, followed by
-# INCDIRS
-#
-XINCDIRS	+= \
-			$(APR)/include \
-			$(APR)/include/arch/NetWare \
-			$(EOLIST)
-
-#
-# These flags will come after CFLAGS
-#
-XCFLAGS		+= \
-			$(EOLIST)
-
-#
-# These defines will come after DEFINES
-#
-XDEFINES	+= \
-			$(EOLIST)
-
-#
-# These flags will be added to the link.opt file
-#
-XLFLAGS		+= \
-			$(EOLIST)
-
-#
-# These values will be appended to the correct variables based on the value of
-# RELEASE
-#
-ifeq "$(RELEASE)" "debug"
-XINCDIRS	+= \
-			$(EOLIST)
-
-XCFLAGS		+= \
-			$(EOLIST)
-
-XDEFINES	+= \
-			$(EOLIST)
-
-XLFLAGS		+= \
-			$(EOLIST)
-						
-endif
-
-ifeq "$(RELEASE)" "noopt"
-XINCDIRS	+= \
-			$(EOLIST)
-
-XCFLAGS		+= \
-			$(EOLIST)
-
-XDEFINES	+= \
-			$(EOLIST)
-
-XLFLAGS		+= \
-			$(EOLIST)
-endif
-
-ifeq "$(RELEASE)" "release"
-XINCDIRS	+= \
-			$(EOLIST)
-
-XCFLAGS		+= \
-			$(EOLIST)
-
-XDEFINES	+= \
-			$(EOLIST)
-
-XLFLAGS		+= \
-			$(EOLIST)
-endif
-
-#
-# These are used by the link target if an NLM is being generated
-# This is used by the link 'name' directive to name the nlm.  If left blank
-# TARGET_nlm (see below) will be used.
-#
-NLM_NAME		=	
-
-#
-# This is used by the link '-desc ' directive. 
-# If left blank, NLM_NAME will be used.
-#
-NLM_DESCRIPTION	=  NLM is to test the apr layer
-
-#
-# This is used by the '-threadname' directive.  If left blank,
-# NLM_NAME Thread will be used.
-#
-NLM_THREAD_NAME	= 
-
-#
-# This is used by the '-screenname' directive.  If left blank,
-# 'Apache for NetWare' Thread will be used.
-#
-NLM_SCREEN_NAME =
-
-#
-# If this is specified, it will override VERSION value in 
-# $(APR_WORK)\build\NWGNUenvironment.inc
-#
-NLM_VERSION		= 
-
-#
-# If this is specified, it will override the default of 64K
-#
-NLM_STACK_SIZE	= 
-
-#
-# If this is specified it will be used by the link '-entry' directive
-#
-NLM_ENTRY_SYM	= 
-
-#
-# If this is specified it will be used by the link '-exit' directive
-#
-NLM_EXIT_SYM	= 
-
-#
-# If this is specified it will be used by the link '-check' directive
-#
-NLM_CHECK_SYM	=
-
-#
-# If this is specified it will be used by the link '-flags' directive
-#
-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         = 
-
-#
-# Declare all target files (you must add your files here)
-#
-
-#
 # If there is an NLM target, put it here
 #
 TARGET_nlm = \
@@ -174,67 +28,6 @@
 	$(OBJDIR)/tryread.nlm \
 	$(OBJDIR)/testatmc.nlm \
 	$(EOLIST)
-#
-# If there is an LIB target, put it here
-#
-TARGET_lib = \
-	$(EOLIST)
-
-#
-# These are the OBJ files needed to create the NLM target above.
-# Paths must all use the '/' character
-#
-FILES_nlm_objs = \
-		$(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)
-
-#
-# These are the modules that the above NLM target depends on to load.
-# These will be added as a module command in the link.opt file.
-#
-FILES_nlm_modules = \
-	aprlib \
-  	$(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
-#
-FILE_nlm_hlp =
-
-#
-# If this is specified, it will override the default copyright.
-#
-FILE_nlm_copyright =
-
-#
-# Any additional imports go here
-#
-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
-#
-FILES_lib_objs = \
-	$(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)

Modified: apr/apr/branches/1.3.x/test/NWGNUmod_test
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/test/NWGNUmod_test?rev=796813&r1=796812&r2=796813&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/test/NWGNUmod_test (original)
+++ apr/apr/branches/1.3.x/test/NWGNUmod_test Wed Jul 22 17:51:19 2009
@@ -54,7 +54,6 @@
 
 XLFLAGS		+= \
 			$(EOLIST)
-						
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -92,19 +91,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		=	mod_test
+NLM_NAME	= mod_test
 
 #
 # This is used by the link '-desc ' directive. 
 # If left blank, NLM_NAME will be used.
 #
-NLM_DESCRIPTION	=  DSO NLM to test the apr DSO loading layer
+NLM_DESCRIPTION	= DSO NLM to test the apr DSO loading layer
 
 #
 # This is used by the '-threadname' directive.  If left blank,
 # NLM_NAME Thread will be used.
 #
-NLM_THREAD_NAME	= mod_test
+NLM_THREAD_NAME	= $(NLM_NAME)
 
 #
 # This is used by the '-screenname' directive.  If left blank,
@@ -116,7 +115,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
@@ -141,14 +140,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)
@@ -158,7 +157,7 @@
 # If there is an NLM target, put it here
 #
 TARGET_nlm = \
-	$(OBJDIR)/mod_test.nlm \
+	$(OBJDIR)/$(NLM_NAME).nlm \
 	$(EOLIST)
 
 #
@@ -172,7 +171,7 @@
 # Paths must all use the '/' character
 #
 FILES_nlm_objs = \
-	$(OBJDIR)/mod_test.o \
+	$(OBJDIR)/$(NLM_NAME).o \
 	$(EOLIST)
 
 #
@@ -222,7 +221,7 @@
 	print_hello \
 	count_reps \
 	$(EOLIST)
-	
+
 #   
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character

Modified: apr/apr/branches/1.3.x/test/NWGNUproc_child
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/test/NWGNUproc_child?rev=796813&r1=796812&r2=796813&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/test/NWGNUproc_child (original)
+++ apr/apr/branches/1.3.x/test/NWGNUproc_child Wed Jul 22 17:51:19 2009
@@ -54,7 +54,6 @@
 
 XLFLAGS		+= \
 			$(EOLIST)
-						
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -92,19 +91,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		=	proc_child
+NLM_NAME	= proc_child
 
 #
 # This is used by the link '-desc ' directive. 
 # If left blank, NLM_NAME will be used.
 #
-NLM_DESCRIPTION	=  child NLM to test the proc layer
+NLM_DESCRIPTION	= child NLM to test the proc layer
 
 #
 # This is used by the '-threadname' directive.  If left blank,
 # NLM_NAME Thread will be used.
 #
-NLM_THREAD_NAME	= proc_child
+NLM_THREAD_NAME	= $(NLM_NAME)
 
 #
 # This is used by the '-screenname' directive.  If left blank,
@@ -116,7 +115,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
@@ -141,14 +140,14 @@
 #
 # If this is specified it will be used by the link '-flags' directive
 #
-NLM_FLAGS		= AUTOUNLOAD, PSEUDOPREEMPTION, MULTIPLE
+NLM_FLAGS	= AUTOUNLOAD, PSEUDOPREEMPTION, MULTIPLE
  
 #
 # 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)
@@ -158,7 +157,7 @@
 # If there is an NLM target, put it here
 #
 TARGET_nlm = \
-	$(OBJDIR)/proc_child.nlm \
+	$(OBJDIR)/$(NLM_NAME).nlm \
 	$(EOLIST)
 
 #
@@ -172,7 +171,7 @@
 # Paths must all use the '/' character
 #
 FILES_nlm_objs = \
-	$(OBJDIR)/proc_child.o \
+	$(OBJDIR)/$(NLM_NAME).o \
 	$(EOLIST)
 
 #
@@ -220,7 +219,7 @@
 #
 FILES_nlm_exports = \
 	$(EOLIST)
-	
+
 #   
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character

Modified: apr/apr/branches/1.3.x/test/NWGNUreadchild
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/test/NWGNUreadchild?rev=796813&r1=796812&r2=796813&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/test/NWGNUreadchild (original)
+++ apr/apr/branches/1.3.x/test/NWGNUreadchild Wed Jul 22 17:51:19 2009
@@ -54,7 +54,6 @@
 
 XLFLAGS		+= \
 			$(EOLIST)
-						
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -92,19 +91,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		=	readchild
+NLM_NAME	= readchild
 
 #
 # This is used by the link '-desc ' directive. 
 # If left blank, NLM_NAME will be used.
 #
-NLM_DESCRIPTION	=  child NLM to test the pipe layer
+NLM_DESCRIPTION	= child NLM to test the pipe layer
 
 #
 # This is used by the '-threadname' directive.  If left blank,
 # NLM_NAME Thread will be used.
 #
-NLM_THREAD_NAME	= readchild
+NLM_THREAD_NAME	= $(NLM_NAME)
 
 #
 # This is used by the '-screenname' directive.  If left blank,
@@ -116,7 +115,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
@@ -141,14 +140,14 @@
 #
 # If this is specified it will be used by the link '-flags' directive
 #
-NLM_FLAGS		= AUTOUNLOAD, PSEUDOPREEMPTION, MULTIPLE
+NLM_FLAGS	= AUTOUNLOAD, PSEUDOPREEMPTION, MULTIPLE
  
 #
 # 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)
@@ -158,7 +157,7 @@
 # If there is an NLM target, put it here
 #
 TARGET_nlm = \
-	$(OBJDIR)/readchild.nlm \
+	$(OBJDIR)/$(NLM_NAME).nlm \
 	$(EOLIST)
 
 #
@@ -172,7 +171,7 @@
 # Paths must all use the '/' character
 #
 FILES_nlm_objs = \
-	$(OBJDIR)/readchild.o \
+	$(OBJDIR)/$(NLM_NAME).o \
 	$(EOLIST)
 
 #
@@ -220,7 +219,7 @@
 #
 FILES_nlm_exports = \
 	$(EOLIST)
-	
+
 #   
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character

Modified: apr/apr/branches/1.3.x/test/NWGNUsockchild
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/test/NWGNUsockchild?rev=796813&r1=796812&r2=796813&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/test/NWGNUsockchild (original)
+++ apr/apr/branches/1.3.x/test/NWGNUsockchild Wed Jul 22 17:51:19 2009
@@ -54,7 +54,6 @@
 
 XLFLAGS		+= \
 			$(EOLIST)
-						
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -92,19 +91,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		=	sockchild
+NLM_NAME	= sockchild
 
 #
 # This is used by the link '-desc ' directive. 
 # If left blank, NLM_NAME will be used.
 #
-NLM_DESCRIPTION	=  socket NLM to test sockets
+NLM_DESCRIPTION	= socket NLM to test sockets
 
 #
 # This is used by the '-threadname' directive.  If left blank,
 # NLM_NAME Thread will be used.
 #
-NLM_THREAD_NAME	= sockchild
+NLM_THREAD_NAME	= $(NLM_NAME)
 
 #
 # This is used by the '-screenname' directive.  If left blank,
@@ -116,7 +115,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
@@ -141,14 +140,14 @@
 #
 # If this is specified it will be used by the link '-flags' directive
 #
-NLM_FLAGS		= AUTOUNLOAD, PSEUDOPREEMPTION, MULTIPLE
+NLM_FLAGS	= AUTOUNLOAD, PSEUDOPREEMPTION, MULTIPLE
  
 #
 # 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)
@@ -158,7 +157,7 @@
 # If there is an NLM target, put it here
 #
 TARGET_nlm = \
-	$(OBJDIR)/sockchild.nlm \
+	$(OBJDIR)/$(NLM_NAME).nlm \
 	$(EOLIST)
 
 #
@@ -172,7 +171,7 @@
 # Paths must all use the '/' character
 #
 FILES_nlm_objs = \
-	$(OBJDIR)/sockchild.o \
+	$(OBJDIR)/$(NLM_NAME).o \
 	$(EOLIST)
 
 #
@@ -220,7 +219,7 @@
 #
 FILES_nlm_exports = \
 	$(EOLIST)
-	
+
 #   
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character

Modified: apr/apr/branches/1.3.x/test/NWGNUtestatmc
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/test/NWGNUtestatmc?rev=796813&r1=796812&r2=796813&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/test/NWGNUtestatmc (original)
+++ apr/apr/branches/1.3.x/test/NWGNUtestatmc Wed Jul 22 17:51:19 2009
@@ -89,30 +89,30 @@
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME		=testatmc
+NLM_NAME	= testatmc
 #
 # This is used by the link '-desc ' directive. 
 # If left blank, NLM_NAME will be used.
 #
-NLM_DESCRIPTION	=  NLM is to test the atomic functions
+NLM_DESCRIPTION	= NLM is to test the atomic functions
 
 #
 # This is used by the '-threadname' directive.  If left blank,
 # NLM_NAME Thread will be used.
 #
-NLM_THREAD_NAME	= testatmc
+NLM_THREAD_NAME	= $(NLM_NAME)
 
 #
 # This is used by the '-screenname' directive.  If left blank,
 # 'Apache for NetWare' Thread will be used.
 #
-NLM_SCREEN_NAME = testatmc
+NLM_SCREEN_NAME = $(NLM_NAME)
 
 #
 # 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
@@ -137,14 +137,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)
@@ -154,7 +154,7 @@
 # If there is an NLM target, put it here
 #
 TARGET_nlm = \
-	$(OBJDIR)/testatmc.nlm \
+	$(OBJDIR)/$(NLM_NAME).nlm \
 	$(EOLIST)
 
 #
@@ -172,8 +172,6 @@
 	$(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.
@@ -210,8 +208,9 @@
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
+	@$(APR)/aprlib.imp \
 	@libc.imp \
-	@$(APR)/aprlib.imp	\
+	@netware.imp \
 	$(EOLIST)
  
 #   
@@ -219,7 +218,7 @@
 #
 FILES_nlm_exports = \
 	$(EOLIST)
-	
+
 #   
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character

Modified: apr/apr/branches/1.3.x/test/NWGNUtryread
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/test/NWGNUtryread?rev=796813&r1=796812&r2=796813&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/test/NWGNUtryread (original)
+++ apr/apr/branches/1.3.x/test/NWGNUtryread Wed Jul 22 17:51:19 2009
@@ -54,7 +54,6 @@
 
 XLFLAGS		+= \
 			$(EOLIST)
-						
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -92,13 +91,13 @@
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME		=	tryread
+NLM_NAME	= tryread
 
 #
 # This is used by the link '-desc ' directive. 
 # If left blank, NLM_NAME will be used.
 #
-NLM_DESCRIPTION	=  reader NLM to test flock
+NLM_DESCRIPTION	= reader NLM to test flock
 
 #
 # This is used by the '-threadname' directive.  If left blank,
@@ -116,7 +115,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
@@ -141,14 +140,14 @@
 #
 # If this is specified it will be used by the link '-flags' directive
 #
-NLM_FLAGS		= AUTOUNLOAD, PSEUDOPREEMPTION, MULTIPLE
+NLM_FLAGS	= AUTOUNLOAD, PSEUDOPREEMPTION, MULTIPLE
  
 #
 # 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)
@@ -158,7 +157,7 @@
 # If there is an NLM target, put it here
 #
 TARGET_nlm = \
-	$(OBJDIR)/tryread.nlm \
+	$(OBJDIR)/$(NLM_NAME).nlm \
 	$(EOLIST)
 
 #
@@ -172,7 +171,7 @@
 # Paths must all use the '/' character
 #
 FILES_nlm_objs = \
-	$(OBJDIR)/tryread.o \
+	$(OBJDIR)/$(NLM_NAME).o \
 	$(EOLIST)
 
 #
@@ -220,7 +219,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