diff options
author | fuankg <fuankg@13f79535-47bb-0310-9956-ffa450edef68> | 2011-04-17 21:46:14 +0000 |
---|---|---|
committer | fuankg <fuankg@13f79535-47bb-0310-9956-ffa450edef68> | 2011-04-17 21:46:14 +0000 |
commit | 887e5c37a0c9f5e0a7383bd9154b7535255ec731 (patch) | |
tree | 1e117bca542822e1ffacf3137579e1e0a6d813c6 /test | |
parent | c56c56988cabf47aaaa24a9a052d4ee4ba3784eb (diff) | |
download | libapr-887e5c37a0c9f5e0a7383bd9154b7535255ec731.tar.gz |
NetWare test makefile fixes.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.4.x@1094203 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'test')
-rw-r--r-- | test/NWGNUaprtest | 13 | ||||
-rw-r--r-- | test/NWGNUglobalmutexchild | 9 | ||||
-rw-r--r-- | test/NWGNUmod_test | 9 | ||||
-rw-r--r-- | test/NWGNUproc_child | 9 | ||||
-rw-r--r-- | test/NWGNUreadchild | 9 | ||||
-rw-r--r-- | test/NWGNUsockchild | 9 | ||||
-rw-r--r-- | test/NWGNUtestatmc | 14 | ||||
-rw-r--r-- | test/NWGNUtryread | 11 |
8 files changed, 32 insertions, 51 deletions
diff --git a/test/NWGNUaprtest b/test/NWGNUaprtest index f4c6f49d4..b142796af 100644 --- a/test/NWGNUaprtest +++ b/test/NWGNUaprtest @@ -94,13 +94,13 @@ 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, @@ -117,7 +117,7 @@ NLM_VERSION = # # If this is specified, it will override the default of 64K # -NLM_STACK_SIZE = 524288 +NLM_STACK_SIZE = 524288 # # If this is specified it will be used by the link '-entry' directive @@ -144,7 +144,7 @@ NLM_FLAGS = # 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) @@ -255,7 +255,7 @@ FILE_nlm_copyright = # FILES_nlm_Ximports = \ @libc.imp \ - @aprlib.imp \ + @aprlib.imp \ $(EOLIST) # Don't link with Winsock if standard sockets are being used @@ -269,7 +269,7 @@ endif # FILES_nlm_exports = \ $(EOLIST) - + # # These are the OBJ files needed to create the LIB target above. # Paths must all use the '/' character @@ -303,4 +303,3 @@ install :: nlms FORCE include $(APRBUILD)/NWGNUtail.inc - diff --git a/test/NWGNUglobalmutexchild b/test/NWGNUglobalmutexchild index fc93ead61..3db7a1068 100644 --- a/test/NWGNUglobalmutexchild +++ b/test/NWGNUglobalmutexchild @@ -54,7 +54,6 @@ XDEFINES += \ XLFLAGS += \ $(EOLIST) - endif ifeq "$(RELEASE)" "noopt" @@ -69,8 +68,6 @@ XDEFINES += \ XLFLAGS += \ $(EOLIST) - - $(EOLIST) endif ifeq "$(RELEASE)" "release" @@ -104,7 +101,7 @@ 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, @@ -148,7 +145,7 @@ NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION, MULTIPLE # 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) @@ -220,7 +217,7 @@ FILES_nlm_Ximports = \ # 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/NWGNUmod_test b/test/NWGNUmod_test index 10c43c4ad..b293de88f 100644 --- a/test/NWGNUmod_test +++ b/test/NWGNUmod_test @@ -54,7 +54,6 @@ XDEFINES += \ XLFLAGS += \ $(EOLIST) - endif ifeq "$(RELEASE)" "noopt" @@ -69,8 +68,6 @@ XDEFINES += \ XLFLAGS += \ $(EOLIST) - - $(EOLIST) endif ifeq "$(RELEASE)" "release" @@ -104,7 +101,7 @@ 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, @@ -148,7 +145,7 @@ NLM_FLAGS = # 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) @@ -222,7 +219,7 @@ FILES_nlm_exports = \ print_hello \ count_reps \ $(EOLIST) - + # # These are the OBJ files needed to create the LIB target above. # Paths must all use the '/' character diff --git a/test/NWGNUproc_child b/test/NWGNUproc_child index 762b9a9cb..4f3f183c1 100644 --- a/test/NWGNUproc_child +++ b/test/NWGNUproc_child @@ -54,7 +54,6 @@ XDEFINES += \ XLFLAGS += \ $(EOLIST) - endif ifeq "$(RELEASE)" "noopt" @@ -69,8 +68,6 @@ XDEFINES += \ XLFLAGS += \ $(EOLIST) - - $(EOLIST) endif ifeq "$(RELEASE)" "release" @@ -104,7 +101,7 @@ 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, @@ -148,7 +145,7 @@ NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION, MULTIPLE # 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) @@ -220,7 +217,7 @@ FILES_nlm_Ximports = \ # 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/NWGNUreadchild b/test/NWGNUreadchild index 519e72371..5e6e48487 100644 --- a/test/NWGNUreadchild +++ b/test/NWGNUreadchild @@ -54,7 +54,6 @@ XDEFINES += \ XLFLAGS += \ $(EOLIST) - endif ifeq "$(RELEASE)" "noopt" @@ -69,8 +68,6 @@ XDEFINES += \ XLFLAGS += \ $(EOLIST) - - $(EOLIST) endif ifeq "$(RELEASE)" "release" @@ -104,7 +101,7 @@ 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, @@ -148,7 +145,7 @@ NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION, MULTIPLE # 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) @@ -220,7 +217,7 @@ FILES_nlm_Ximports = \ # 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/NWGNUsockchild b/test/NWGNUsockchild index 3467f79a0..312ddd1f7 100644 --- a/test/NWGNUsockchild +++ b/test/NWGNUsockchild @@ -54,7 +54,6 @@ XDEFINES += \ XLFLAGS += \ $(EOLIST) - endif ifeq "$(RELEASE)" "noopt" @@ -69,8 +68,6 @@ XDEFINES += \ XLFLAGS += \ $(EOLIST) - - $(EOLIST) endif ifeq "$(RELEASE)" "release" @@ -104,7 +101,7 @@ 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, @@ -148,7 +145,7 @@ NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION, MULTIPLE # 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) @@ -220,7 +217,7 @@ FILES_nlm_Ximports = \ # 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/NWGNUtestatmc b/test/NWGNUtestatmc index b45544f17..d1308ea31 100644 --- a/test/NWGNUtestatmc +++ b/test/NWGNUtestatmc @@ -100,13 +100,13 @@ 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 @@ -137,14 +137,14 @@ NLM_CHECK_SYM = # # If this is specified it will be used by the link '-flags' directive # -NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION +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) @@ -173,7 +173,7 @@ FILES_nlm_objs = \ $(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. @@ -211,7 +211,7 @@ FILE_nlm_copyright = # FILES_nlm_Ximports = \ @libc.imp \ - @aprlib.imp \ + @aprlib.imp \ $(EOLIST) # @@ -219,7 +219,7 @@ FILES_nlm_Ximports = \ # 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/NWGNUtryread b/test/NWGNUtryread index 9871b88dd..0ed52ead2 100644 --- a/test/NWGNUtryread +++ b/test/NWGNUtryread @@ -54,7 +54,6 @@ XDEFINES += \ XLFLAGS += \ $(EOLIST) - endif ifeq "$(RELEASE)" "noopt" @@ -69,8 +68,6 @@ XDEFINES += \ XLFLAGS += \ $(EOLIST) - - $(EOLIST) endif ifeq "$(RELEASE)" "release" @@ -104,13 +101,13 @@ NLM_DESCRIPTION = reader NLM to test flock # This is used by the '-threadname' directive. If left blank, # NLM_NAME Thread will be used. # -NLM_THREAD_NAME = try_read +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 = DEFAULT +NLM_SCREEN_NAME = DEFAULT # # If this is specified, it will override VERSION value in @@ -148,7 +145,7 @@ NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION, MULTIPLE # 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) @@ -220,7 +217,7 @@ FILES_nlm_Ximports = \ # FILES_nlm_exports = \ $(EOLIST) - + # # These are the OBJ files needed to create the LIB target above. # Paths must all use the '/' character |