You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by fu...@apache.org on 2010/10/09 04:20:46 UTC
svn commit: r1006103 - in /apr/apr/branches/0.9.x/test: NWGNUaprtest
NWGNUmod_test NWGNUproc_child NWGNUtestatmc
Author: fuankg
Date: Sat Oct 9 02:20:45 2010
New Revision: 1006103
URL: http://svn.apache.org/viewvc?rev=1006103&view=rev
Log:
Some more NetWare makefile fixes.
Modified:
apr/apr/branches/0.9.x/test/NWGNUaprtest
apr/apr/branches/0.9.x/test/NWGNUmod_test
apr/apr/branches/0.9.x/test/NWGNUproc_child
apr/apr/branches/0.9.x/test/NWGNUtestatmc
Modified: apr/apr/branches/0.9.x/test/NWGNUaprtest
URL: http://svn.apache.org/viewvc/apr/apr/branches/0.9.x/test/NWGNUaprtest?rev=1006103&r1=1006102&r2=1006103&view=diff
==============================================================================
--- apr/apr/branches/0.9.x/test/NWGNUaprtest (original)
+++ apr/apr/branches/0.9.x/test/NWGNUaprtest Sat Oct 9 02:20:45 2010
@@ -112,7 +112,7 @@ 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
Modified: apr/apr/branches/0.9.x/test/NWGNUmod_test
URL: http://svn.apache.org/viewvc/apr/apr/branches/0.9.x/test/NWGNUmod_test?rev=1006103&r1=1006102&r2=1006103&view=diff
==============================================================================
--- apr/apr/branches/0.9.x/test/NWGNUmod_test (original)
+++ apr/apr/branches/0.9.x/test/NWGNUmod_test Sat Oct 9 02:20:45 2010
@@ -54,7 +54,6 @@ XDEFINES += \
XLFLAGS += \
$(EOLIST)
-
endif
ifeq "$(RELEASE)" "noopt"
@@ -69,8 +68,6 @@ XDEFINES += \
XLFLAGS += \
$(EOLIST)
-
- $(EOLIST)
endif
ifeq "$(RELEASE)" "release"
@@ -92,7 +89,7 @@ endif
# 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.
@@ -104,7 +101,7 @@ NLM_DESCRIPTION = DSO NLM to test the a
# 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) Thread
#
# This is used by the '-screenname' directive. If left blank,
@@ -116,7 +113,7 @@ NLM_SCREEN_NAME = DEFAULT
# 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 +138,14 @@ NLM_CHECK_SYM =
#
# 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)
@@ -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
Modified: apr/apr/branches/0.9.x/test/NWGNUproc_child
URL: http://svn.apache.org/viewvc/apr/apr/branches/0.9.x/test/NWGNUproc_child?rev=1006103&r1=1006102&r2=1006103&view=diff
==============================================================================
--- apr/apr/branches/0.9.x/test/NWGNUproc_child (original)
+++ apr/apr/branches/0.9.x/test/NWGNUproc_child Sat Oct 9 02:20:45 2010
@@ -54,7 +54,6 @@ XDEFINES += \
XLFLAGS += \
$(EOLIST)
-
endif
ifeq "$(RELEASE)" "noopt"
@@ -69,8 +68,6 @@ XDEFINES += \
XLFLAGS += \
$(EOLIST)
-
- $(EOLIST)
endif
ifeq "$(RELEASE)" "release"
@@ -92,19 +89,19 @@ endif
# 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) Thread
#
# This is used by the '-screenname' directive. If left blank,
@@ -116,7 +113,7 @@ NLM_SCREEN_NAME = DEFAULT
# 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 +138,14 @@ NLM_CHECK_SYM =
#
# 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)
@@ -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
Modified: apr/apr/branches/0.9.x/test/NWGNUtestatmc
URL: http://svn.apache.org/viewvc/apr/apr/branches/0.9.x/test/NWGNUtestatmc?rev=1006103&r1=1006102&r2=1006103&view=diff
==============================================================================
--- apr/apr/branches/0.9.x/test/NWGNUtestatmc (original)
+++ apr/apr/branches/0.9.x/test/NWGNUtestatmc Sat Oct 9 02:20:45 2010
@@ -89,30 +89,30 @@ endif
# 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) Thread
#
# 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 @@ NLM_CHECK_SYM =
#
# 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)
@@ -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 \
- @$(APR)/aprlib.imp \
+ @$(APR)/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