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 2011/03/18 02:08:18 UTC
svn commit: r1082778 [1/4] - in /apr: apr-util/branches/1.3.x/
apr-util/branches/1.3.x/dbd/ apr-util/branches/1.3.x/dbm/
apr-util/branches/1.3.x/ldap/ apr-util/branches/1.3.x/test/
apr-util/branches/1.3.x/xml/ apr-util/branches/1.3.x/xml/expat/lib/ apr...
Author: fuankg
Date: Fri Mar 18 01:08:15 2011
New Revision: 1082778
URL: http://svn.apache.org/viewvc?rev=1082778&view=rev
Log:
NetWare build overhaul in order to compile on Linux.
Backport of all recent changes to trunk.
Modified:
apr/apr-util/branches/1.3.x/NWGNUmakefile
apr/apr-util/branches/1.3.x/dbd/NWGNUdbdfreetds
apr/apr-util/branches/1.3.x/dbd/NWGNUdbdmysql
apr/apr-util/branches/1.3.x/dbd/NWGNUdbdpgsql
apr/apr-util/branches/1.3.x/dbd/NWGNUdbdsqli2
apr/apr-util/branches/1.3.x/dbd/NWGNUdbdsqli3
apr/apr-util/branches/1.3.x/dbd/NWGNUmakefile
apr/apr-util/branches/1.3.x/dbm/NWGNUdbmdb
apr/apr-util/branches/1.3.x/dbm/NWGNUdbmgdbm
apr/apr-util/branches/1.3.x/dbm/NWGNUmakefile
apr/apr-util/branches/1.3.x/ldap/NWGNUmakefile
apr/apr-util/branches/1.3.x/test/NWGNUaputest
apr/apr-util/branches/1.3.x/test/NWGNUmakefile
apr/apr-util/branches/1.3.x/test/nw_misc.c
apr/apr-util/branches/1.3.x/xml/NWGNUmakefile
apr/apr-util/branches/1.3.x/xml/expat/lib/expat_config.hnw
apr/apr-util/branches/1.4.x/NWGNUmakefile
apr/apr-util/branches/1.4.x/dbd/NWGNUdbdfreetds
apr/apr-util/branches/1.4.x/dbd/NWGNUdbdmysql
apr/apr-util/branches/1.4.x/dbd/NWGNUdbdpgsql
apr/apr-util/branches/1.4.x/dbd/NWGNUdbdsqli2
apr/apr-util/branches/1.4.x/dbd/NWGNUdbdsqli3
apr/apr-util/branches/1.4.x/dbd/NWGNUmakefile
apr/apr-util/branches/1.4.x/dbm/NWGNUdbmdb
apr/apr-util/branches/1.4.x/dbm/NWGNUdbmgdbm
apr/apr-util/branches/1.4.x/dbm/NWGNUmakefile
apr/apr-util/branches/1.4.x/ldap/NWGNUmakefile
apr/apr-util/branches/1.4.x/test/NWGNUaputest
apr/apr-util/branches/1.4.x/test/NWGNUmakefile
apr/apr-util/branches/1.4.x/test/nw_misc.c
apr/apr-util/branches/1.4.x/xml/NWGNUmakefile
apr/apr-util/branches/1.4.x/xml/expat/lib/expat_config.hnw
apr/apr-util/branches/1.5.x/NWGNUmakefile
apr/apr-util/branches/1.5.x/dbd/NWGNUdbdfreetds
apr/apr-util/branches/1.5.x/dbd/NWGNUdbdmysql
apr/apr-util/branches/1.5.x/dbd/NWGNUdbdpgsql
apr/apr-util/branches/1.5.x/dbd/NWGNUdbdsqli2
apr/apr-util/branches/1.5.x/dbd/NWGNUdbdsqli3
apr/apr-util/branches/1.5.x/dbd/NWGNUmakefile
apr/apr-util/branches/1.5.x/dbm/NWGNUdbmdb
apr/apr-util/branches/1.5.x/dbm/NWGNUdbmgdbm
apr/apr-util/branches/1.5.x/dbm/NWGNUmakefile
apr/apr-util/branches/1.5.x/ldap/NWGNUmakefile
apr/apr-util/branches/1.5.x/test/NWGNUaputest
apr/apr-util/branches/1.5.x/test/NWGNUmakefile
apr/apr-util/branches/1.5.x/test/nw_misc.c
apr/apr-util/branches/1.5.x/xml/NWGNUmakefile
apr/apr-util/branches/1.5.x/xml/expat/lib/expat_config.hnw
apr/apr/branches/1.3.x/NWGNUmakefile
apr/apr/branches/1.3.x/build/NWGNUenvironment.inc
apr/apr/branches/1.3.x/build/NWGNUhead.inc
apr/apr/branches/1.3.x/build/NWGNUmakefile
apr/apr/branches/1.3.x/build/NWGNUtail.inc
apr/apr/branches/1.3.x/build/make_nw_export.awk
apr/apr/branches/1.3.x/test/NWGNUaprtest
apr/apr/branches/1.3.x/test/NWGNUechod
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/NWGNUsockperf
apr/apr/branches/1.3.x/test/NWGNUtestatmc
apr/apr/branches/1.3.x/test/NWGNUtryread
apr/apr/branches/1.3.x/test/nw_misc.c
apr/apr/branches/1.4.x/NWGNUmakefile
apr/apr/branches/1.4.x/build/NWGNUenvironment.inc
apr/apr/branches/1.4.x/build/NWGNUhead.inc
apr/apr/branches/1.4.x/build/NWGNUmakefile
apr/apr/branches/1.4.x/build/NWGNUtail.inc
apr/apr/branches/1.4.x/build/make_nw_export.awk
apr/apr/branches/1.4.x/test/NWGNUaprtest
apr/apr/branches/1.4.x/test/NWGNUechod
apr/apr/branches/1.4.x/test/NWGNUglobalmutexchild
apr/apr/branches/1.4.x/test/NWGNUmakefile
apr/apr/branches/1.4.x/test/NWGNUmod_test
apr/apr/branches/1.4.x/test/NWGNUproc_child
apr/apr/branches/1.4.x/test/NWGNUreadchild
apr/apr/branches/1.4.x/test/NWGNUsockchild
apr/apr/branches/1.4.x/test/NWGNUsockperf
apr/apr/branches/1.4.x/test/NWGNUtestatmc
apr/apr/branches/1.4.x/test/NWGNUtryread
apr/apr/branches/1.4.x/test/nw_misc.c
apr/apr/branches/1.5.x/NWGNUmakefile
apr/apr/branches/1.5.x/build/NWGNUenvironment.inc
apr/apr/branches/1.5.x/build/NWGNUhead.inc
apr/apr/branches/1.5.x/build/NWGNUmakefile
apr/apr/branches/1.5.x/build/NWGNUtail.inc
apr/apr/branches/1.5.x/build/make_nw_export.awk
apr/apr/branches/1.5.x/test/NWGNUaprtest
apr/apr/branches/1.5.x/test/NWGNUechod
apr/apr/branches/1.5.x/test/NWGNUglobalmutexchild
apr/apr/branches/1.5.x/test/NWGNUmakefile
apr/apr/branches/1.5.x/test/NWGNUmod_test
apr/apr/branches/1.5.x/test/NWGNUproc_child
apr/apr/branches/1.5.x/test/NWGNUreadchild
apr/apr/branches/1.5.x/test/NWGNUsockchild
apr/apr/branches/1.5.x/test/NWGNUsockperf
apr/apr/branches/1.5.x/test/NWGNUtestatmc
apr/apr/branches/1.5.x/test/NWGNUtryread
apr/apr/branches/1.5.x/test/nw_misc.c
Modified: apr/apr-util/branches/1.3.x/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/NWGNUmakefile?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/NWGNUmakefile (original)
+++ apr/apr-util/branches/1.3.x/NWGNUmakefile Fri Mar 18 01:08:15 2011
@@ -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
#
@@ -24,7 +24,7 @@ endif
# paths to tools
#
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
#
# Make sure all needed macro's are defined
@@ -37,11 +37,11 @@ include $(APR_WORK)\build\NWGNUhead.inc
XINCDIRS += \
$(APR)/include \
$(APR)/include/arch/NetWare \
- $(APRUTIL)/include \
- $(APRUTIL)/uri \
- $(APRUTIL)/dbm/sdbm \
- $(APRUTIL)/include/private \
- $(APRUTIL)/xml/expat/lib \
+ $(APU)/include \
+ $(APU)/uri \
+ $(APU)/dbm/sdbm \
+ $(APU)/include/private \
+ $(APUXML)/expat/lib \
$(LDAPSDK)/inc \
$(EOLIST)
@@ -114,21 +114,21 @@ 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 =
+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 =
@@ -136,17 +136,17 @@ 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
@@ -159,11 +159,11 @@ NLM_CHECK_SYM =
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)
@@ -179,7 +179,7 @@ TARGET_nlm = \
# If there is an LIB target, put it here
#
TARGET_lib = \
- $(OBJDIR)/aprutil.lib \
+ $(OBJDIR)/apulib.lib \
$(EOLIST)
#
@@ -207,7 +207,7 @@ FILES_nlm_modules = \
# 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 @@ FILE_nlm_copyright =
#
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
#
@@ -284,8 +284,8 @@ libs :: $(OBJDIR) $(TARGET_lib)
nlms :: libs $(TARGET_nlm)
#
-# Updated this target to create necessary directories and copy files to the
-# correct place. (See $(APR_WORK)\build\NWGNUhead.inc for examples)
+# 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
@@ -300,6 +300,6 @@ vpath %.c buckets:crypto:dbd:dbm:dbm/sdb
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Modified: apr/apr-util/branches/1.3.x/dbd/NWGNUdbdfreetds
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/dbd/NWGNUdbdfreetds?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/dbd/NWGNUdbdfreetds (original)
+++ apr/apr-util/branches/1.3.x/dbd/NWGNUdbdfreetds Fri Mar 18 01:08:15 2011
@@ -11,7 +11,7 @@ SUBDIRS = \
#
ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
endif
#include $(APR)\build\NWGNUcustom.inc
@@ -38,8 +38,8 @@ FREETDS_NLM = libfreetds
XINCDIRS += \
$(APR)/include/arch/netware \
$(APR)/include \
- $(APRUTIL)/include \
- $(APRUTIL)/include/private \
+ $(APU)/include \
+ $(APU)/include/private \
$(APR) \
$(FREETDS_INC) \
$(EOLIST)
@@ -150,12 +150,12 @@ NLM_STACK_SIZE = 8192
#
# If this is specified it will be used by the link '-entry' directive
#
-NLM_ENTRY_SYM = _LibCPrelude
+NLM_ENTRY_SYM =
#
# If this is specified it will be used by the link '-exit' directive
#
-NLM_EXIT_SYM = _LibCPostlude
+NLM_EXIT_SYM =
#
# If this is specified it will be used by the link '-check' directive
@@ -165,7 +165,7 @@ NLM_CHECK_SYM =
#
# If these are 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
@@ -200,7 +200,7 @@ FILES_nlm_objs = \
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- libcpre.o \
+ $(PRELUDE) \
$(EOLIST)
ifeq ($(LINK_STATIC),1)
@@ -290,7 +290,7 @@ install :: nlms FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Modified: apr/apr-util/branches/1.3.x/dbd/NWGNUdbdmysql
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/dbd/NWGNUdbdmysql?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/dbd/NWGNUdbdmysql (original)
+++ apr/apr-util/branches/1.3.x/dbd/NWGNUdbdmysql Fri Mar 18 01:08:15 2011
@@ -11,7 +11,7 @@ SUBDIRS = \
#
ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
endif
#include $(APR)\build\NWGNUcustom.inc
@@ -27,8 +27,8 @@ endif
# for now defined here - should finally go into build/NWGNUenvironment.inc
MYSQL_INC = $(MYSQLSDK)/include
-MYSQL_IMP = $(MYSQLSDK)/lib/libmysql.imp
-MYSQL_LIB = $(MYSQLSDK)/lib/libmysqlclient_r.lib $(MYSQLSDK)/lib/libz.lib
+MYSQL_IMP = libmysql.imp
+MYSQL_LIB = libmysqlclient_r.lib libz.lib
MYSQL_NLM = libmysql
ifneq "$(wildcard $(MYSQL_INC)/mysql.h)" "$(MYSQL_INC)/mysql.h"
$(error MYSQLSDK does not point to a valid MySQL SDK)
@@ -41,8 +41,8 @@ endif
XINCDIRS += \
$(APR)/include/arch/netware \
$(APR)/include \
- $(APRUTIL)/include \
- $(APRUTIL)/include/private \
+ $(APU)/include \
+ $(APU)/include/private \
$(APR) \
$(MYSQL_INC) \
$(EOLIST)
@@ -66,13 +66,8 @@ XDEFINES += \
# These flags will be added to the link.opt file
#
XLFLAGS += \
- $(EOLIST)
-
-ifdef LINK_STATIC
-XLFLAGS += \
-l $(MYSQLSDK)/lib \
$(EOLIST)
-endif
#
# These values will be appended to the correct variables based on the value of
@@ -154,12 +149,12 @@ NLM_STACK_SIZE = 8192
#
# If this is specified it will be used by the link '-entry' directive
#
-NLM_ENTRY_SYM = _LibCPrelude
+NLM_ENTRY_SYM =
#
# If this is specified it will be used by the link '-exit' directive
#
-NLM_EXIT_SYM = _LibCPostlude
+NLM_EXIT_SYM =
#
# If this is specified it will be used by the link '-check' directive
@@ -169,7 +164,7 @@ NLM_CHECK_SYM =
#
# If these are 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
@@ -182,7 +177,7 @@ XDCDATA =
# If there is an NLM target, put it here
#
TARGET_nlm = \
- $(OBJDIR)\$(NLM_NAME).nlm \
+ $(OBJDIR)/$(NLM_NAME).nlm \
$(EOLIST)
#
@@ -204,7 +199,7 @@ FILES_nlm_objs = \
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- libcpre.o \
+ $(PRELUDE) \
$(EOLIST)
ifeq ($(LINK_STATIC),1)
@@ -247,7 +242,7 @@ FILE_nlm_copyright =
# Any additional imports go here
#
FILES_nlm_Ximports = \
- @$(APR)/aprlib.imp \
+ @aprlib.imp \
@libc.imp \
$(EOLIST)
@@ -294,7 +289,7 @@ install :: nlms FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Modified: apr/apr-util/branches/1.3.x/dbd/NWGNUdbdpgsql
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/dbd/NWGNUdbdpgsql?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/dbd/NWGNUdbdpgsql (original)
+++ apr/apr-util/branches/1.3.x/dbd/NWGNUdbdpgsql Fri Mar 18 01:08:15 2011
@@ -11,7 +11,7 @@ SUBDIRS = \
#
ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
endif
#include $(APR)\build\NWGNUcustom.inc
@@ -27,8 +27,8 @@ endif
# for now defined here - should finally go into build/NWGNUenvironment.inc
PGSQL_INC = $(PGSQLSDK)/inc
-PGSQL_IMP = $(PGSQLSDK)/imp/libpq.imp
-PGSQL_LIB = $(PGSQLSDK)/lib/libpq.lib
+PGSQL_IMP = libpq.imp
+PGSQL_LIB = libpq.lib
PGSQL_NLM = libpq
#
@@ -38,8 +38,8 @@ PGSQL_NLM = libpq
XINCDIRS += \
$(APR)/include/arch/netware \
$(APR)/include \
- $(APRUTIL)/include \
- $(APRUTIL)/include/private \
+ $(APU)/include \
+ $(APU)/include/private \
$(APR) \
$(PGSQL_INC) \
$(EOLIST)
@@ -69,6 +69,10 @@ ifdef LINK_STATIC
XLFLAGS += \
-l $(PGSQLSDK)/lib \
$(EOLIST)
+else
+XLFLAGS += \
+ -l $(PGSQLSDK)/imp \
+ $(EOLIST)
endif
#
@@ -151,12 +155,12 @@ NLM_STACK_SIZE = 8192
#
# If this is specified it will be used by the link '-entry' directive
#
-NLM_ENTRY_SYM = _LibCPrelude
+NLM_ENTRY_SYM =
#
# If this is specified it will be used by the link '-exit' directive
#
-NLM_EXIT_SYM = _LibCPostlude
+NLM_EXIT_SYM =
#
# If this is specified it will be used by the link '-check' directive
@@ -166,7 +170,7 @@ NLM_CHECK_SYM =
#
# If these are 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
@@ -179,7 +183,7 @@ XDCDATA =
# If there is an NLM target, put it here
#
TARGET_nlm = \
- $(OBJDIR)\$(NLM_NAME).nlm \
+ $(OBJDIR)/$(NLM_NAME).nlm \
$(EOLIST)
#
@@ -201,7 +205,7 @@ FILES_nlm_objs = \
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- libcpre.o \
+ $(PRELUDE) \
$(EOLIST)
ifeq ($(LINK_STATIC),1)
@@ -244,7 +248,7 @@ FILE_nlm_copyright =
# Any additional imports go here
#
FILES_nlm_Ximports = \
- @$(APR)/aprlib.imp \
+ @aprlib.imp \
@libc.imp \
$(EOLIST)
@@ -291,7 +295,7 @@ install :: nlms FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Modified: apr/apr-util/branches/1.3.x/dbd/NWGNUdbdsqli2
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/dbd/NWGNUdbdsqli2?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/dbd/NWGNUdbdsqli2 (original)
+++ apr/apr-util/branches/1.3.x/dbd/NWGNUdbdsqli2 Fri Mar 18 01:08:15 2011
@@ -11,7 +11,7 @@ SUBDIRS = \
#
ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
endif
#include $(APR)\build\NWGNUcustom.inc
@@ -38,8 +38,8 @@ SQLITE2_NLM = lsqlite2
XINCDIRS += \
$(APR)/include/arch/netware \
$(APR)/include \
- $(APRUTIL)/include \
- $(APRUTIL)/include/private \
+ $(APU)/include \
+ $(APU)/include/private \
$(APR) \
$(SQLITE2_INC) \
$(EOLIST)
@@ -150,12 +150,12 @@ NLM_STACK_SIZE = 8192
#
# If this is specified it will be used by the link '-entry' directive
#
-NLM_ENTRY_SYM = _LibCPrelude
+NLM_ENTRY_SYM =
#
# If this is specified it will be used by the link '-exit' directive
#
-NLM_EXIT_SYM = _LibCPostlude
+NLM_EXIT_SYM =
#
# If this is specified it will be used by the link '-check' directive
@@ -165,7 +165,7 @@ NLM_CHECK_SYM =
#
# If these are 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
@@ -200,7 +200,7 @@ FILES_nlm_objs = \
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- libcpre.o \
+ $(PRELUDE) \
$(EOLIST)
ifeq ($(LINK_STATIC),1)
@@ -290,7 +290,7 @@ install :: nlms FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Modified: apr/apr-util/branches/1.3.x/dbd/NWGNUdbdsqli3
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/dbd/NWGNUdbdsqli3?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/dbd/NWGNUdbdsqli3 (original)
+++ apr/apr-util/branches/1.3.x/dbd/NWGNUdbdsqli3 Fri Mar 18 01:08:15 2011
@@ -11,7 +11,7 @@ SUBDIRS = \
#
ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
endif
#include $(APR)\build\NWGNUcustom.inc
@@ -38,8 +38,8 @@ SQLITE3_NLM = lsqlite3
XINCDIRS += \
$(APR)/include/arch/netware \
$(APR)/include \
- $(APRUTIL)/include \
- $(APRUTIL)/include/private \
+ $(APU)/include \
+ $(APU)/include/private \
$(APR) \
$(SQLITE3_INC) \
$(EOLIST)
@@ -150,12 +150,12 @@ NLM_STACK_SIZE = 8192
#
# If this is specified it will be used by the link '-entry' directive
#
-NLM_ENTRY_SYM = _LibCPrelude
+NLM_ENTRY_SYM =
#
# If this is specified it will be used by the link '-exit' directive
#
-NLM_EXIT_SYM = _LibCPostlude
+NLM_EXIT_SYM =
#
# If this is specified it will be used by the link '-check' directive
@@ -165,7 +165,7 @@ NLM_CHECK_SYM =
#
# If these are 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
@@ -200,7 +200,7 @@ FILES_nlm_objs = \
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- libcpre.o \
+ $(PRELUDE) \
$(EOLIST)
ifeq ($(LINK_STATIC),1)
@@ -292,7 +292,7 @@ install :: nlms FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Modified: apr/apr-util/branches/1.3.x/dbd/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/dbd/NWGNUmakefile?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/dbd/NWGNUmakefile (original)
+++ apr/apr-util/branches/1.3.x/dbd/NWGNUmakefile Fri Mar 18 01:08:15 2011
@@ -10,7 +10,7 @@ SUBDIRS = \
# paths to tools
#
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
#
# build this level's files
@@ -246,7 +246,7 @@ nlms :: libs $(TARGET_nlm)
# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples)
#
install :: nlms $(INSTDIRS) FORCE
- copy $(OBJDIR)\*.nlm $(INSTALLBASE)
+ $(call COPY,$(OBJDIR)/*.nlm,$(INSTALLBASE))
#
# Any specialized rules here
@@ -257,6 +257,6 @@ install :: nlms $(INSTDIRS) FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Modified: apr/apr-util/branches/1.3.x/dbm/NWGNUdbmdb
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/dbm/NWGNUdbmdb?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/dbm/NWGNUdbmdb (original)
+++ apr/apr-util/branches/1.3.x/dbm/NWGNUdbmdb Fri Mar 18 01:08:15 2011
@@ -11,7 +11,7 @@ SUBDIRS = \
#
ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
endif
#include $(APR)\build\NWGNUcustom.inc
@@ -151,12 +151,12 @@ NLM_STACK_SIZE = 8192
#
# If this is specified it will be used by the link '-entry' directive
#
-NLM_ENTRY_SYM = _LibCPrelude
+NLM_ENTRY_SYM =
#
# If this is specified it will be used by the link '-exit' directive
#
-NLM_EXIT_SYM = _LibCPostlude
+NLM_EXIT_SYM =
#
# If this is specified it will be used by the link '-check' directive
@@ -166,7 +166,7 @@ NLM_CHECK_SYM =
#
# If these are 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
@@ -201,7 +201,7 @@ FILES_nlm_objs = \
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- libcpre.o \
+ $(PRELUDE) \
$(EOLIST)
ifeq ($(LINK_STATIC),1)
@@ -291,7 +291,7 @@ install :: nlms FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Modified: apr/apr-util/branches/1.3.x/dbm/NWGNUdbmgdbm
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/dbm/NWGNUdbmgdbm?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/dbm/NWGNUdbmgdbm (original)
+++ apr/apr-util/branches/1.3.x/dbm/NWGNUdbmgdbm Fri Mar 18 01:08:15 2011
@@ -11,7 +11,7 @@ SUBDIRS = \
#
ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
endif
#include $(APR)\build\NWGNUcustom.inc
@@ -150,12 +150,12 @@ NLM_STACK_SIZE = 8192
#
# If this is specified it will be used by the link '-entry' directive
#
-NLM_ENTRY_SYM = _LibCPrelude
+NLM_ENTRY_SYM =
#
# If this is specified it will be used by the link '-exit' directive
#
-NLM_EXIT_SYM = _LibCPostlude
+NLM_EXIT_SYM =
#
# If this is specified it will be used by the link '-check' directive
@@ -165,7 +165,7 @@ NLM_CHECK_SYM =
#
# If these are 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
@@ -200,7 +200,7 @@ FILES_nlm_objs = \
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- libcpre.o \
+ $(PRELUDE) \
$(EOLIST)
ifeq ($(LINK_STATIC),1)
@@ -290,7 +290,7 @@ install :: nlms FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Modified: apr/apr-util/branches/1.3.x/dbm/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/dbm/NWGNUmakefile?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/dbm/NWGNUmakefile (original)
+++ apr/apr-util/branches/1.3.x/dbm/NWGNUmakefile Fri Mar 18 01:08:15 2011
@@ -10,7 +10,7 @@ SUBDIRS = \
# paths to tools
#
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
#
# build this level's files
@@ -246,6 +246,6 @@ install :: nlms $(INSTDIRS) FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Modified: apr/apr-util/branches/1.3.x/ldap/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/ldap/NWGNUmakefile?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/ldap/NWGNUmakefile (original)
+++ apr/apr-util/branches/1.3.x/ldap/NWGNUmakefile Fri Mar 18 01:08:15 2011
@@ -10,7 +10,7 @@ SUBDIRS = \
# paths to tools
#
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
#
# build this level's files
@@ -26,8 +26,8 @@ include $(APR_WORK)\build\NWGNUhead.inc
XINCDIRS += \
$(APR)/include \
$(APR)/include/arch/NetWare \
- $(APRUTIL)/include \
- $(APRUTIL)/include/private \
+ $(APU)/include \
+ $(APU)/include/private \
$(LDAPSDK)/inc \
$(EOLIST)
@@ -123,7 +123,7 @@ NLM_DESCRIPTION =
NLM_THREAD_NAME =
#
# If this is specified, it will override VERSION value in
-# $(APR_WORK)\build\NWGNUenvironment.inc
+# $(APR_WORK)/build/NWGNUenvironment.inc
#
NLM_VERSION =
@@ -135,12 +135,12 @@ 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
@@ -246,7 +246,7 @@ nlms :: libs $(TARGET_nlm)
#
# Updated this target to create necessary directories and copy files to the
-# correct place. (See $(APR_WORK)\build\NWGNUhead.inc for examples)
+# correct place. (See $(APR_WORK)/build/NWGNUhead.inc for examples)
#
install :: nlms FORCE
@@ -259,5 +259,5 @@ install :: nlms FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Modified: apr/apr-util/branches/1.3.x/test/NWGNUaputest
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/test/NWGNUaputest?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/test/NWGNUaputest (original)
+++ apr/apr-util/branches/1.3.x/test/NWGNUaputest Fri Mar 18 01:08:15 2011
@@ -8,7 +8,7 @@
#
ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
endif
#
@@ -18,7 +18,7 @@ endif
XINCDIRS += \
$(APR)/include \
$(APR)/include/arch/NetWare \
- $(APRUTIL)/include \
+ $(APU)/include \
$(LDAPSDK)/inc \
$(EOLIST)
@@ -112,7 +112,7 @@ NLM_SCREEN_NAME = aputest
#
# If this is specified, it will override VERSION value in
-# $(APR_WORK)\build\NWGNUenvironment.inc
+# $(APR_WORK)/build/NWGNUenvironment.inc
#
NLM_VERSION =
@@ -124,12 +124,12 @@ NLM_STACK_SIZE = 524288
#
# If this is specified it will be used by the link '-entry' directive
#
-NLM_ENTRY_SYM = _LibCPrelude
+NLM_ENTRY_SYM =
#
# If this is specified it will be used by the link '-exit' directive
#
-NLM_EXIT_SYM = _LibCPostlude
+NLM_EXIT_SYM =
#
# If this is specified it will be used by the link '-check' directive
@@ -139,7 +139,7 @@ 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
@@ -200,7 +200,7 @@ FILES_nlm_objs = \
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- libcpre.o \
+ $(PRELUDE) \
$(EOLIST)
#
@@ -212,7 +212,6 @@ FILES_nlm_modules = \
APRLIB \
lldapsdk \
lldapssl \
- lldapx \
$(EOLIST)
#
@@ -235,9 +234,9 @@ FILE_nlm_copyright =
#
FILES_nlm_Ximports = \
@libc.imp \
- @$(APR)/aprlib.imp \
- @$(LDAPSDK)/imports/lldapsdk.imp \
- @$(LDAPSDK)/imports/lldapssl.imp \
+ @aprlib.imp \
+ @lldapsdk.imp \
+ @lldapssl.imp \
$(EOLIST)
#
@@ -263,7 +262,7 @@ nlms :: libs $(TARGET_nlm)
#
# Updated this target to create necessary directories and copy files to the
-# correct place. (See $(APR_WORK)\build\NWGNUhead.inc for examples)
+# correct place. (See $(APR_WORK)/build/NWGNUhead.inc for examples)
#
install :: nlms FORCE
@@ -277,5 +276,5 @@ install :: nlms FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Modified: apr/apr-util/branches/1.3.x/test/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/test/NWGNUmakefile?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/test/NWGNUmakefile (original)
+++ apr/apr-util/branches/1.3.x/test/NWGNUmakefile Fri Mar 18 01:08:15 2011
@@ -10,7 +10,7 @@ SUBDIRS = \
# paths to tools
#
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
#
# build this level's files
@@ -239,10 +239,10 @@ nlms :: libs $(TARGET_nlm)
#
# Updated this target to create necessary directories and copy files to the
-# correct place. (See $(APR_WORK)\build\NWGNUhead.inc for examples)
+# correct place. (See $(APR_WORK)/build/NWGNUhead.inc for examples)
#
install :: nlms FORCE
- copy $(OBJDIR)\*.nlm $(INSTALLBASE)
+ $(call COPY,$(OBJDIR)/*.nlm,$(INSTALLBASE))
#
# Any specialized rules here
@@ -253,5 +253,5 @@ install :: nlms FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Modified: apr/apr-util/branches/1.3.x/test/nw_misc.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/test/nw_misc.c?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/test/nw_misc.c (original)
+++ apr/apr-util/branches/1.3.x/test/nw_misc.c Fri Mar 18 01:08:15 2011
@@ -1,3 +1,4 @@
+#include <stdio.h>
#include <stdlib.h>
#include <netware.h>
#include <screen.h>
Modified: apr/apr-util/branches/1.3.x/xml/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/xml/NWGNUmakefile?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/xml/NWGNUmakefile (original)
+++ apr/apr-util/branches/1.3.x/xml/NWGNUmakefile Fri Mar 18 01:08:15 2011
@@ -10,7 +10,7 @@ SUBDIRS = \
# paths to tools
#
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
#
# build this level's files
@@ -26,11 +26,11 @@ include $(APR_WORK)\build\NWGNUhead.inc
XINCDIRS += \
$(APR)/include \
$(APR)/include/arch/NetWare \
- $(APRUTIL)/include \
- $(APRUTIL)/uri \
- $(APRUTIL)/dbm/sdbm \
- $(APRUTIL)/include/private \
- $(APRUTIL)/xml/expat/lib \
+ $(APU)/include \
+ $(APU)/uri \
+ $(APU)/dbm/sdbm \
+ $(APU)/include/private \
+ $(APUXML)/expat/lib \
$(EOLIST)
#
@@ -118,7 +118,7 @@ NLM_DESCRIPTION =
NLM_THREAD_NAME =
#
# If this is specified, it will override VERSION value in
-# $(APR_WORK)\build\NWGNUenvironment.inc
+# $(APR_WORK)/build/NWGNUenvironment.inc
#
NLM_VERSION =
@@ -168,7 +168,7 @@ TARGET_nlm = \
# If there is an LIB target, put it here
#
TARGET_lib = \
- $(OBJDIR)/xmllib.lib \
+ $(OBJDIR)/apuxml.lib \
$(EOLIST)
#
@@ -240,7 +240,7 @@ nlms :: libs $(TARGET_nlm)
#
# Updated this target to create necessary directories and copy files to the
-# correct place. (See $(APR_WORK)\build\NWGNUhead.inc for examples)
+# correct place. (See $(APR_WORK)/build/NWGNUhead.inc for examples)
#
install :: nlms FORCE
@@ -255,5 +255,5 @@ vpath %.c expat/lib
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Modified: apr/apr-util/branches/1.3.x/xml/expat/lib/expat_config.hnw
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/xml/expat/lib/expat_config.hnw?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/xml/expat/lib/expat_config.hnw (original)
+++ apr/apr-util/branches/1.3.x/xml/expat/lib/expat_config.hnw Fri Mar 18 01:08:15 2011
@@ -12,7 +12,6 @@
#ifndef EXPAT_CONFIG_HNW
#define EXPAT_CONFIG_HNW
-#include <memory.h>
#include <string.h>
#define HAVE_MEMMOVE
Modified: apr/apr-util/branches/1.4.x/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/NWGNUmakefile?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/NWGNUmakefile (original)
+++ apr/apr-util/branches/1.4.x/NWGNUmakefile Fri Mar 18 01:08:15 2011
@@ -24,7 +24,7 @@ endif
# paths to tools
#
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
#
# Make sure all needed macro's are defined
@@ -37,11 +37,11 @@ include $(APR_WORK)\build\NWGNUhead.inc
XINCDIRS += \
$(APR)/include \
$(APR)/include/arch/NetWare \
- $(APRUTIL)/include \
- $(APRUTIL)/uri \
- $(APRUTIL)/dbm/sdbm \
- $(APRUTIL)/include/private \
- $(APRUTIL)/xml/expat/lib \
+ $(APU)/include \
+ $(APU)/uri \
+ $(APU)/dbm/sdbm \
+ $(APU)/include/private \
+ $(APUXML)/expat/lib \
$(LDAPSDK)/inc \
$(EOLIST)
@@ -129,7 +129,7 @@ NLM_DESCRIPTION =
NLM_THREAD_NAME =
#
# If this is specified, it will override VERSION value in
-# $(APR_WORK)\build\NWGNUenvironment.inc
+# $(APR_WORK)/build/NWGNUenvironment.inc
#
NLM_VERSION =
@@ -179,7 +179,7 @@ TARGET_nlm = \
# If there is an LIB target, put it here
#
TARGET_lib = \
- $(OBJDIR)/aprutil.lib \
+ $(OBJDIR)/apulib.lib \
$(EOLIST)
#
@@ -285,7 +285,7 @@ nlms :: libs $(TARGET_nlm)
#
# Updated this target to create necessary directories and copy files to the
-# correct place. (See $(APR_WORK)\build\NWGNUhead.inc for examples)
+# correct place. (See $(APR_WORK)/build/NWGNUhead.inc for examples)
#
install :: nlms FORCE
@@ -300,6 +300,6 @@ vpath %.c buckets:crypto:dbd:dbm:dbm/sdb
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Modified: apr/apr-util/branches/1.4.x/dbd/NWGNUdbdfreetds
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/dbd/NWGNUdbdfreetds?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/dbd/NWGNUdbdfreetds (original)
+++ apr/apr-util/branches/1.4.x/dbd/NWGNUdbdfreetds Fri Mar 18 01:08:15 2011
@@ -11,7 +11,7 @@ SUBDIRS = \
#
ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
endif
#include $(APR)\build\NWGNUcustom.inc
@@ -38,8 +38,8 @@ FREETDS_NLM = libfreetds
XINCDIRS += \
$(APR)/include/arch/netware \
$(APR)/include \
- $(APRUTIL)/include \
- $(APRUTIL)/include/private \
+ $(APU)/include \
+ $(APU)/include/private \
$(APR) \
$(FREETDS_INC) \
$(EOLIST)
@@ -150,12 +150,12 @@ NLM_STACK_SIZE = 8192
#
# If this is specified it will be used by the link '-entry' directive
#
-NLM_ENTRY_SYM = _LibCPrelude
+NLM_ENTRY_SYM =
#
# If this is specified it will be used by the link '-exit' directive
#
-NLM_EXIT_SYM = _LibCPostlude
+NLM_EXIT_SYM =
#
# If this is specified it will be used by the link '-check' directive
@@ -165,7 +165,7 @@ NLM_CHECK_SYM =
#
# If these are 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
@@ -200,7 +200,7 @@ FILES_nlm_objs = \
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- libcpre.o \
+ $(PRELUDE) \
$(EOLIST)
ifeq ($(LINK_STATIC),1)
@@ -290,7 +290,7 @@ install :: nlms FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Modified: apr/apr-util/branches/1.4.x/dbd/NWGNUdbdmysql
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/dbd/NWGNUdbdmysql?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/dbd/NWGNUdbdmysql (original)
+++ apr/apr-util/branches/1.4.x/dbd/NWGNUdbdmysql Fri Mar 18 01:08:15 2011
@@ -11,7 +11,7 @@ SUBDIRS = \
#
ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
endif
#include $(APR)\build\NWGNUcustom.inc
@@ -27,8 +27,8 @@ endif
# for now defined here - should finally go into build/NWGNUenvironment.inc
MYSQL_INC = $(MYSQLSDK)/include
-MYSQL_IMP = $(MYSQLSDK)/lib/libmysql.imp
-MYSQL_LIB = $(MYSQLSDK)/lib/libmysqlclient_r.lib $(MYSQLSDK)/lib/libz.lib
+MYSQL_IMP = libmysql.imp
+MYSQL_LIB = libmysqlclient_r.lib libz.lib
MYSQL_NLM = libmysql
#
@@ -38,8 +38,8 @@ MYSQL_NLM = libmysql
XINCDIRS += \
$(APR)/include/arch/netware \
$(APR)/include \
- $(APRUTIL)/include \
- $(APRUTIL)/include/private \
+ $(APU)/include \
+ $(APU)/include/private \
$(APR) \
$(MYSQL_INC) \
$(EOLIST)
@@ -63,13 +63,8 @@ XDEFINES += \
# These flags will be added to the link.opt file
#
XLFLAGS += \
- $(EOLIST)
-
-ifdef LINK_STATIC
-XLFLAGS += \
-l $(MYSQLSDK)/lib \
$(EOLIST)
-endif
#
# These values will be appended to the correct variables based on the value of
@@ -151,12 +146,12 @@ NLM_STACK_SIZE = 8192
#
# If this is specified it will be used by the link '-entry' directive
#
-NLM_ENTRY_SYM = _LibCPrelude
+NLM_ENTRY_SYM =
#
# If this is specified it will be used by the link '-exit' directive
#
-NLM_EXIT_SYM = _LibCPostlude
+NLM_EXIT_SYM =
#
# If this is specified it will be used by the link '-check' directive
@@ -166,7 +161,7 @@ NLM_CHECK_SYM =
#
# If these are 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
@@ -179,7 +174,7 @@ XDCDATA =
# If there is an NLM target, put it here
#
TARGET_nlm = \
- $(OBJDIR)\$(NLM_NAME).nlm \
+ $(OBJDIR)/$(NLM_NAME).nlm \
$(EOLIST)
#
@@ -201,7 +196,7 @@ FILES_nlm_objs = \
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- libcpre.o \
+ $(PRELUDE) \
$(EOLIST)
ifeq ($(LINK_STATIC),1)
@@ -244,7 +239,7 @@ FILE_nlm_copyright =
# Any additional imports go here
#
FILES_nlm_Ximports = \
- @$(APR)/aprlib.imp \
+ @aprlib.imp \
@libc.imp \
$(EOLIST)
@@ -291,7 +286,7 @@ install :: nlms FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Modified: apr/apr-util/branches/1.4.x/dbd/NWGNUdbdpgsql
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/dbd/NWGNUdbdpgsql?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/dbd/NWGNUdbdpgsql (original)
+++ apr/apr-util/branches/1.4.x/dbd/NWGNUdbdpgsql Fri Mar 18 01:08:15 2011
@@ -11,7 +11,7 @@ SUBDIRS = \
#
ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
endif
#include $(APR)\build\NWGNUcustom.inc
@@ -27,8 +27,8 @@ endif
# for now defined here - should finally go into build/NWGNUenvironment.inc
PGSQL_INC = $(PGSQLSDK)/inc
-PGSQL_IMP = $(PGSQLSDK)/imp/libpq.imp
-PGSQL_LIB = $(PGSQLSDK)/lib/libpq.lib
+PGSQL_IMP = libpq.imp
+PGSQL_LIB = libpq.lib
PGSQL_NLM = libpq
#
@@ -38,8 +38,8 @@ PGSQL_NLM = libpq
XINCDIRS += \
$(APR)/include/arch/netware \
$(APR)/include \
- $(APRUTIL)/include \
- $(APRUTIL)/include/private \
+ $(APU)/include \
+ $(APU)/include/private \
$(APR) \
$(PGSQL_INC) \
$(EOLIST)
@@ -69,6 +69,10 @@ ifdef LINK_STATIC
XLFLAGS += \
-l $(PGSQLSDK)/lib \
$(EOLIST)
+else
+XLFLAGS += \
+ -l $(PGSQLSDK)/imp \
+ $(EOLIST)
endif
#
@@ -151,12 +155,12 @@ NLM_STACK_SIZE = 8192
#
# If this is specified it will be used by the link '-entry' directive
#
-NLM_ENTRY_SYM = _LibCPrelude
+NLM_ENTRY_SYM =
#
# If this is specified it will be used by the link '-exit' directive
#
-NLM_EXIT_SYM = _LibCPostlude
+NLM_EXIT_SYM =
#
# If this is specified it will be used by the link '-check' directive
@@ -166,7 +170,7 @@ NLM_CHECK_SYM =
#
# If these are 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
@@ -179,7 +183,7 @@ XDCDATA =
# If there is an NLM target, put it here
#
TARGET_nlm = \
- $(OBJDIR)\$(NLM_NAME).nlm \
+ $(OBJDIR)/$(NLM_NAME).nlm \
$(EOLIST)
#
@@ -201,7 +205,7 @@ FILES_nlm_objs = \
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- libcpre.o \
+ $(PRELUDE) \
$(EOLIST)
ifeq ($(LINK_STATIC),1)
@@ -244,7 +248,7 @@ FILE_nlm_copyright =
# Any additional imports go here
#
FILES_nlm_Ximports = \
- @$(APR)/aprlib.imp \
+ @aprlib.imp \
@libc.imp \
$(EOLIST)
@@ -291,7 +295,7 @@ install :: nlms FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Modified: apr/apr-util/branches/1.4.x/dbd/NWGNUdbdsqli2
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/dbd/NWGNUdbdsqli2?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/dbd/NWGNUdbdsqli2 (original)
+++ apr/apr-util/branches/1.4.x/dbd/NWGNUdbdsqli2 Fri Mar 18 01:08:15 2011
@@ -11,7 +11,7 @@ SUBDIRS = \
#
ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
endif
#include $(APR)\build\NWGNUcustom.inc
@@ -38,8 +38,8 @@ SQLITE2_NLM = lsqlite2
XINCDIRS += \
$(APR)/include/arch/netware \
$(APR)/include \
- $(APRUTIL)/include \
- $(APRUTIL)/include/private \
+ $(APU)/include \
+ $(APU)/include/private \
$(APR) \
$(SQLITE2_INC) \
$(EOLIST)
@@ -150,12 +150,12 @@ NLM_STACK_SIZE = 8192
#
# If this is specified it will be used by the link '-entry' directive
#
-NLM_ENTRY_SYM = _LibCPrelude
+NLM_ENTRY_SYM =
#
# If this is specified it will be used by the link '-exit' directive
#
-NLM_EXIT_SYM = _LibCPostlude
+NLM_EXIT_SYM =
#
# If this is specified it will be used by the link '-check' directive
@@ -165,7 +165,7 @@ NLM_CHECK_SYM =
#
# If these are 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
@@ -200,7 +200,7 @@ FILES_nlm_objs = \
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- libcpre.o \
+ $(PRELUDE) \
$(EOLIST)
ifeq ($(LINK_STATIC),1)
@@ -290,7 +290,7 @@ install :: nlms FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Modified: apr/apr-util/branches/1.4.x/dbd/NWGNUdbdsqli3
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/dbd/NWGNUdbdsqli3?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/dbd/NWGNUdbdsqli3 (original)
+++ apr/apr-util/branches/1.4.x/dbd/NWGNUdbdsqli3 Fri Mar 18 01:08:15 2011
@@ -11,7 +11,7 @@ SUBDIRS = \
#
ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
endif
#include $(APR)\build\NWGNUcustom.inc
@@ -38,8 +38,8 @@ SQLITE3_NLM = lsqlite3
XINCDIRS += \
$(APR)/include/arch/netware \
$(APR)/include \
- $(APRUTIL)/include \
- $(APRUTIL)/include/private \
+ $(APU)/include \
+ $(APU)/include/private \
$(APR) \
$(SQLITE3_INC) \
$(EOLIST)
@@ -150,12 +150,12 @@ NLM_STACK_SIZE = 8192
#
# If this is specified it will be used by the link '-entry' directive
#
-NLM_ENTRY_SYM = _LibCPrelude
+NLM_ENTRY_SYM =
#
# If this is specified it will be used by the link '-exit' directive
#
-NLM_EXIT_SYM = _LibCPostlude
+NLM_EXIT_SYM =
#
# If this is specified it will be used by the link '-check' directive
@@ -165,7 +165,7 @@ NLM_CHECK_SYM =
#
# If these are 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
@@ -200,7 +200,7 @@ FILES_nlm_objs = \
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- libcpre.o \
+ $(PRELUDE) \
$(EOLIST)
ifeq ($(LINK_STATIC),1)
@@ -292,7 +292,7 @@ install :: nlms FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Modified: apr/apr-util/branches/1.4.x/dbd/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/dbd/NWGNUmakefile?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/dbd/NWGNUmakefile (original)
+++ apr/apr-util/branches/1.4.x/dbd/NWGNUmakefile Fri Mar 18 01:08:15 2011
@@ -10,7 +10,7 @@ SUBDIRS = \
# paths to tools
#
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
#
# build this level's files
@@ -246,7 +246,7 @@ nlms :: libs $(TARGET_nlm)
# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples)
#
install :: nlms $(INSTDIRS) FORCE
- copy $(OBJDIR)\*.nlm $(INSTALLBASE)
+ $(call COPY,$(OBJDIR)/*.nlm,$(INSTALLBASE))
#
# Any specialized rules here
@@ -257,6 +257,6 @@ install :: nlms $(INSTDIRS) FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Modified: apr/apr-util/branches/1.4.x/dbm/NWGNUdbmdb
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/dbm/NWGNUdbmdb?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/dbm/NWGNUdbmdb (original)
+++ apr/apr-util/branches/1.4.x/dbm/NWGNUdbmdb Fri Mar 18 01:08:15 2011
@@ -11,7 +11,7 @@ SUBDIRS = \
#
ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
endif
#include $(APR)\build\NWGNUcustom.inc
@@ -151,12 +151,12 @@ NLM_STACK_SIZE = 8192
#
# If this is specified it will be used by the link '-entry' directive
#
-NLM_ENTRY_SYM = _LibCPrelude
+NLM_ENTRY_SYM =
#
# If this is specified it will be used by the link '-exit' directive
#
-NLM_EXIT_SYM = _LibCPostlude
+NLM_EXIT_SYM =
#
# If this is specified it will be used by the link '-check' directive
@@ -166,7 +166,7 @@ NLM_CHECK_SYM =
#
# If these are 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
@@ -201,7 +201,7 @@ FILES_nlm_objs = \
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- libcpre.o \
+ $(PRELUDE) \
$(EOLIST)
ifeq ($(LINK_STATIC),1)
@@ -291,7 +291,7 @@ install :: nlms FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Modified: apr/apr-util/branches/1.4.x/dbm/NWGNUdbmgdbm
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/dbm/NWGNUdbmgdbm?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/dbm/NWGNUdbmgdbm (original)
+++ apr/apr-util/branches/1.4.x/dbm/NWGNUdbmgdbm Fri Mar 18 01:08:15 2011
@@ -11,7 +11,7 @@ SUBDIRS = \
#
ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
endif
#include $(APR)\build\NWGNUcustom.inc
@@ -150,12 +150,12 @@ NLM_STACK_SIZE = 8192
#
# If this is specified it will be used by the link '-entry' directive
#
-NLM_ENTRY_SYM = _LibCPrelude
+NLM_ENTRY_SYM =
#
# If this is specified it will be used by the link '-exit' directive
#
-NLM_EXIT_SYM = _LibCPostlude
+NLM_EXIT_SYM =
#
# If this is specified it will be used by the link '-check' directive
@@ -165,7 +165,7 @@ NLM_CHECK_SYM =
#
# If these are 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
@@ -200,7 +200,7 @@ FILES_nlm_objs = \
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- libcpre.o \
+ $(PRELUDE) \
$(EOLIST)
ifeq ($(LINK_STATIC),1)
@@ -290,7 +290,7 @@ install :: nlms FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Modified: apr/apr-util/branches/1.4.x/dbm/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/dbm/NWGNUmakefile?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/dbm/NWGNUmakefile (original)
+++ apr/apr-util/branches/1.4.x/dbm/NWGNUmakefile Fri Mar 18 01:08:15 2011
@@ -10,7 +10,7 @@ SUBDIRS = \
# paths to tools
#
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
#
# build this level's files
@@ -246,6 +246,6 @@ install :: nlms $(INSTDIRS) FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Modified: apr/apr-util/branches/1.4.x/ldap/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/ldap/NWGNUmakefile?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/ldap/NWGNUmakefile (original)
+++ apr/apr-util/branches/1.4.x/ldap/NWGNUmakefile Fri Mar 18 01:08:15 2011
@@ -10,7 +10,7 @@ SUBDIRS = \
# paths to tools
#
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
#
# build this level's files
@@ -26,8 +26,8 @@ include $(APR_WORK)\build\NWGNUhead.inc
XINCDIRS += \
$(APR)/include \
$(APR)/include/arch/NetWare \
- $(APRUTIL)/include \
- $(APRUTIL)/include/private \
+ $(APU)/include \
+ $(APU)/include/private \
$(LDAPSDK)/inc \
$(EOLIST)
@@ -123,7 +123,7 @@ NLM_DESCRIPTION =
NLM_THREAD_NAME =
#
# If this is specified, it will override VERSION value in
-# $(APR_WORK)\build\NWGNUenvironment.inc
+# $(APR_WORK)/build/NWGNUenvironment.inc
#
NLM_VERSION =
@@ -135,12 +135,12 @@ 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
@@ -246,7 +246,7 @@ nlms :: libs $(TARGET_nlm)
#
# Updated this target to create necessary directories and copy files to the
-# correct place. (See $(APR_WORK)\build\NWGNUhead.inc for examples)
+# correct place. (See $(APR_WORK)/build/NWGNUhead.inc for examples)
#
install :: nlms FORCE
@@ -259,5 +259,5 @@ install :: nlms FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
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=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/test/NWGNUaputest (original)
+++ apr/apr-util/branches/1.4.x/test/NWGNUaputest Fri Mar 18 01:08:15 2011
@@ -8,7 +8,7 @@
#
ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
endif
#
@@ -18,7 +18,7 @@ endif
XINCDIRS += \
$(APR)/include \
$(APR)/include/arch/NetWare \
- $(APRUTIL)/include \
+ $(APU)/include \
$(LDAPSDK)/inc \
$(EOLIST)
@@ -112,7 +112,7 @@ NLM_SCREEN_NAME = aputest
#
# If this is specified, it will override VERSION value in
-# $(APR_WORK)\build\NWGNUenvironment.inc
+# $(APR_WORK)/build/NWGNUenvironment.inc
#
NLM_VERSION =
@@ -124,12 +124,12 @@ NLM_STACK_SIZE = 524288
#
# If this is specified it will be used by the link '-entry' directive
#
-NLM_ENTRY_SYM = _LibCPrelude
+NLM_ENTRY_SYM =
#
# If this is specified it will be used by the link '-exit' directive
#
-NLM_EXIT_SYM = _LibCPostlude
+NLM_EXIT_SYM =
#
# If this is specified it will be used by the link '-check' directive
@@ -139,7 +139,7 @@ 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
@@ -201,7 +201,7 @@ FILES_nlm_objs = \
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- libcpre.o \
+ $(PRELUDE) \
$(EOLIST)
#
@@ -213,7 +213,6 @@ FILES_nlm_modules = \
APRLIB \
lldapsdk \
lldapssl \
- lldapx \
$(EOLIST)
#
@@ -236,9 +235,9 @@ FILE_nlm_copyright =
#
FILES_nlm_Ximports = \
@libc.imp \
- @$(APR)/aprlib.imp \
- @$(LDAPSDK)/imports/lldapsdk.imp \
- @$(LDAPSDK)/imports/lldapssl.imp \
+ @aprlib.imp \
+ @lldapsdk.imp \
+ @lldapssl.imp \
$(EOLIST)
#
@@ -264,7 +263,7 @@ nlms :: libs $(TARGET_nlm)
#
# Updated this target to create necessary directories and copy files to the
-# correct place. (See $(APR_WORK)\build\NWGNUhead.inc for examples)
+# correct place. (See $(APR_WORK)/build/NWGNUhead.inc for examples)
#
install :: nlms FORCE
@@ -278,5 +277,5 @@ install :: nlms FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
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=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/test/NWGNUmakefile (original)
+++ apr/apr-util/branches/1.4.x/test/NWGNUmakefile Fri Mar 18 01:08:15 2011
@@ -10,7 +10,7 @@ SUBDIRS = \
# paths to tools
#
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
#
# build this level's files
@@ -120,7 +120,7 @@ NLM_SCREEN_NAME =
#
# If this is specified, it will override VERSION value in
-# $(APR_WORK)\build\NWGNUenvironment.inc
+# $(APR_WORK)/build/NWGNUenvironment.inc
#
NLM_VERSION =
@@ -239,10 +239,10 @@ nlms :: libs $(TARGET_nlm)
#
# Updated this target to create necessary directories and copy files to the
-# correct place. (See $(APR_WORK)\build\NWGNUhead.inc for examples)
+# correct place. (See $(APR_WORK)/build/NWGNUhead.inc for examples)
#
install :: nlms FORCE
- copy $(OBJDIR)\*.nlm $(INSTALLBASE)
+ $(call COPY,$(OBJDIR)/*.nlm,$(INSTALLBASE))
#
# Any specialized rules here
@@ -253,5 +253,5 @@ install :: nlms FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Modified: apr/apr-util/branches/1.4.x/test/nw_misc.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/test/nw_misc.c?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/test/nw_misc.c (original)
+++ apr/apr-util/branches/1.4.x/test/nw_misc.c Fri Mar 18 01:08:15 2011
@@ -1,4 +1,6 @@
+#include <stdio.h>
#include <stdlib.h>
+#include <screen.h>
/*
#include "testutil.h"
*/
@@ -6,6 +8,7 @@
/* function to keep the screen open if not launched from bash */
void _NonAppStop( void )
{
+ if (getenv("_IN_NETWARE_BASH_") == NULL) {
printf("\r\n<Press any key to close screen> ");
getcharacter();
}
Modified: apr/apr-util/branches/1.4.x/xml/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/xml/NWGNUmakefile?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/xml/NWGNUmakefile (original)
+++ apr/apr-util/branches/1.4.x/xml/NWGNUmakefile Fri Mar 18 01:08:15 2011
@@ -10,7 +10,7 @@ SUBDIRS = \
# paths to tools
#
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
#
# build this level's files
@@ -26,11 +26,11 @@ include $(APR_WORK)\build\NWGNUhead.inc
XINCDIRS += \
$(APR)/include \
$(APR)/include/arch/NetWare \
- $(APRUTIL)/include \
- $(APRUTIL)/uri \
- $(APRUTIL)/dbm/sdbm \
- $(APRUTIL)/include/private \
- $(APRUTIL)/xml/expat/lib \
+ $(APU)/include \
+ $(APU)/uri \
+ $(APU)/dbm/sdbm \
+ $(APU)/include/private \
+ $(APUXML)/expat/lib \
$(EOLIST)
#
@@ -118,7 +118,7 @@ NLM_DESCRIPTION =
NLM_THREAD_NAME =
#
# If this is specified, it will override VERSION value in
-# $(APR_WORK)\build\NWGNUenvironment.inc
+# $(APR_WORK)/build/NWGNUenvironment.inc
#
NLM_VERSION =
@@ -168,7 +168,7 @@ TARGET_nlm = \
# If there is an LIB target, put it here
#
TARGET_lib = \
- $(OBJDIR)/xmllib.lib \
+ $(OBJDIR)/apuxml.lib \
$(EOLIST)
#
@@ -240,7 +240,7 @@ nlms :: libs $(TARGET_nlm)
#
# Updated this target to create necessary directories and copy files to the
-# correct place. (See $(APR_WORK)\build\NWGNUhead.inc for examples)
+# correct place. (See $(APR_WORK)/build/NWGNUhead.inc for examples)
#
install :: nlms FORCE
@@ -255,5 +255,5 @@ vpath %.c expat/lib
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Modified: apr/apr-util/branches/1.4.x/xml/expat/lib/expat_config.hnw
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/xml/expat/lib/expat_config.hnw?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/xml/expat/lib/expat_config.hnw (original)
+++ apr/apr-util/branches/1.4.x/xml/expat/lib/expat_config.hnw Fri Mar 18 01:08:15 2011
@@ -12,7 +12,6 @@
#ifndef EXPAT_CONFIG_HNW
#define EXPAT_CONFIG_HNW
-#include <memory.h>
#include <string.h>
#define HAVE_MEMMOVE
Modified: apr/apr-util/branches/1.5.x/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/NWGNUmakefile?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/NWGNUmakefile (original)
+++ apr/apr-util/branches/1.5.x/NWGNUmakefile Fri Mar 18 01:08:15 2011
@@ -24,7 +24,7 @@ endif
# paths to tools
#
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
#
# Make sure all needed macro's are defined
@@ -37,11 +37,11 @@ include $(APR_WORK)\build\NWGNUhead.inc
XINCDIRS += \
$(APR)/include \
$(APR)/include/arch/NetWare \
- $(APRUTIL)/include \
- $(APRUTIL)/uri \
- $(APRUTIL)/dbm/sdbm \
- $(APRUTIL)/include/private \
- $(APRUTIL)/xml/expat/lib \
+ $(APU)/include \
+ $(APU)/uri \
+ $(APU)/dbm/sdbm \
+ $(APU)/include/private \
+ $(APUXML)/expat/lib \
$(LDAPSDK)/inc \
$(EOLIST)
@@ -129,7 +129,7 @@ NLM_DESCRIPTION =
NLM_THREAD_NAME =
#
# If this is specified, it will override VERSION value in
-# $(APR_WORK)\build\NWGNUenvironment.inc
+# $(APR_WORK)/build/NWGNUenvironment.inc
#
NLM_VERSION =
@@ -179,7 +179,7 @@ TARGET_nlm = \
# If there is an LIB target, put it here
#
TARGET_lib = \
- $(OBJDIR)/aprutil.lib \
+ $(OBJDIR)/apulib.lib \
$(EOLIST)
#
@@ -285,7 +285,7 @@ nlms :: libs $(TARGET_nlm)
#
# Updated this target to create necessary directories and copy files to the
-# correct place. (See $(APR_WORK)\build\NWGNUhead.inc for examples)
+# correct place. (See $(APR_WORK)/build/NWGNUhead.inc for examples)
#
install :: nlms FORCE
@@ -300,6 +300,6 @@ vpath %.c buckets:crypto:dbd:dbm:dbm/sdb
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Modified: apr/apr-util/branches/1.5.x/dbd/NWGNUdbdfreetds
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/dbd/NWGNUdbdfreetds?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/dbd/NWGNUdbdfreetds (original)
+++ apr/apr-util/branches/1.5.x/dbd/NWGNUdbdfreetds Fri Mar 18 01:08:15 2011
@@ -11,7 +11,7 @@ SUBDIRS = \
#
ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
endif
#include $(APR)\build\NWGNUcustom.inc
@@ -38,8 +38,8 @@ FREETDS_NLM = libfreetds
XINCDIRS += \
$(APR)/include/arch/netware \
$(APR)/include \
- $(APRUTIL)/include \
- $(APRUTIL)/include/private \
+ $(APU)/include \
+ $(APU)/include/private \
$(APR) \
$(FREETDS_INC) \
$(EOLIST)
@@ -150,12 +150,12 @@ NLM_STACK_SIZE = 8192
#
# If this is specified it will be used by the link '-entry' directive
#
-NLM_ENTRY_SYM = _LibCPrelude
+NLM_ENTRY_SYM =
#
# If this is specified it will be used by the link '-exit' directive
#
-NLM_EXIT_SYM = _LibCPostlude
+NLM_EXIT_SYM =
#
# If this is specified it will be used by the link '-check' directive
@@ -165,7 +165,7 @@ NLM_CHECK_SYM =
#
# If these are 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
@@ -200,7 +200,7 @@ FILES_nlm_objs = \
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- libcpre.o \
+ $(PRELUDE) \
$(EOLIST)
ifeq ($(LINK_STATIC),1)
@@ -290,7 +290,7 @@ install :: nlms FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Modified: apr/apr-util/branches/1.5.x/dbd/NWGNUdbdmysql
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/dbd/NWGNUdbdmysql?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/dbd/NWGNUdbdmysql (original)
+++ apr/apr-util/branches/1.5.x/dbd/NWGNUdbdmysql Fri Mar 18 01:08:15 2011
@@ -11,7 +11,7 @@ SUBDIRS = \
#
ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
endif
#include $(APR)\build\NWGNUcustom.inc
@@ -27,8 +27,8 @@ endif
# for now defined here - should finally go into build/NWGNUenvironment.inc
MYSQL_INC = $(MYSQLSDK)/include
-MYSQL_IMP = $(MYSQLSDK)/lib/libmysql.imp
-MYSQL_LIB = $(MYSQLSDK)/lib/libmysqlclient_r.lib $(MYSQLSDK)/lib/libz.lib
+MYSQL_IMP = libmysql.imp
+MYSQL_LIB = libmysqlclient_r.lib libz.lib
MYSQL_NLM = libmysql
#
@@ -38,8 +38,8 @@ MYSQL_NLM = libmysql
XINCDIRS += \
$(APR)/include/arch/netware \
$(APR)/include \
- $(APRUTIL)/include \
- $(APRUTIL)/include/private \
+ $(APU)/include \
+ $(APU)/include/private \
$(APR) \
$(MYSQL_INC) \
$(EOLIST)
@@ -63,13 +63,8 @@ XDEFINES += \
# These flags will be added to the link.opt file
#
XLFLAGS += \
- $(EOLIST)
-
-ifdef LINK_STATIC
-XLFLAGS += \
-l $(MYSQLSDK)/lib \
$(EOLIST)
-endif
#
# These values will be appended to the correct variables based on the value of
@@ -151,12 +146,12 @@ NLM_STACK_SIZE = 8192
#
# If this is specified it will be used by the link '-entry' directive
#
-NLM_ENTRY_SYM = _LibCPrelude
+NLM_ENTRY_SYM =
#
# If this is specified it will be used by the link '-exit' directive
#
-NLM_EXIT_SYM = _LibCPostlude
+NLM_EXIT_SYM =
#
# If this is specified it will be used by the link '-check' directive
@@ -166,7 +161,7 @@ NLM_CHECK_SYM =
#
# If these are 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
@@ -179,7 +174,7 @@ XDCDATA =
# If there is an NLM target, put it here
#
TARGET_nlm = \
- $(OBJDIR)\$(NLM_NAME).nlm \
+ $(OBJDIR)/$(NLM_NAME).nlm \
$(EOLIST)
#
@@ -201,7 +196,7 @@ FILES_nlm_objs = \
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- libcpre.o \
+ $(PRELUDE) \
$(EOLIST)
ifeq ($(LINK_STATIC),1)
@@ -244,7 +239,7 @@ FILE_nlm_copyright =
# Any additional imports go here
#
FILES_nlm_Ximports = \
- @$(APR)/aprlib.imp \
+ @aprlib.imp \
@libc.imp \
$(EOLIST)
@@ -291,7 +286,7 @@ install :: nlms FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Modified: apr/apr-util/branches/1.5.x/dbd/NWGNUdbdpgsql
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/dbd/NWGNUdbdpgsql?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/dbd/NWGNUdbdpgsql (original)
+++ apr/apr-util/branches/1.5.x/dbd/NWGNUdbdpgsql Fri Mar 18 01:08:15 2011
@@ -11,7 +11,7 @@ SUBDIRS = \
#
ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
endif
#include $(APR)\build\NWGNUcustom.inc
@@ -27,8 +27,8 @@ endif
# for now defined here - should finally go into build/NWGNUenvironment.inc
PGSQL_INC = $(PGSQLSDK)/inc
-PGSQL_IMP = $(PGSQLSDK)/imp/libpq.imp
-PGSQL_LIB = $(PGSQLSDK)/lib/libpq.lib
+PGSQL_IMP = libpq.imp
+PGSQL_LIB = libpq.lib
PGSQL_NLM = libpq
#
@@ -38,8 +38,8 @@ PGSQL_NLM = libpq
XINCDIRS += \
$(APR)/include/arch/netware \
$(APR)/include \
- $(APRUTIL)/include \
- $(APRUTIL)/include/private \
+ $(APU)/include \
+ $(APU)/include/private \
$(APR) \
$(PGSQL_INC) \
$(EOLIST)
@@ -69,6 +69,10 @@ ifdef LINK_STATIC
XLFLAGS += \
-l $(PGSQLSDK)/lib \
$(EOLIST)
+else
+XLFLAGS += \
+ -l $(PGSQLSDK)/imp \
+ $(EOLIST)
endif
#
@@ -151,12 +155,12 @@ NLM_STACK_SIZE = 8192
#
# If this is specified it will be used by the link '-entry' directive
#
-NLM_ENTRY_SYM = _LibCPrelude
+NLM_ENTRY_SYM =
#
# If this is specified it will be used by the link '-exit' directive
#
-NLM_EXIT_SYM = _LibCPostlude
+NLM_EXIT_SYM =
#
# If this is specified it will be used by the link '-check' directive
@@ -166,7 +170,7 @@ NLM_CHECK_SYM =
#
# If these are 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
@@ -179,7 +183,7 @@ XDCDATA =
# If there is an NLM target, put it here
#
TARGET_nlm = \
- $(OBJDIR)\$(NLM_NAME).nlm \
+ $(OBJDIR)/$(NLM_NAME).nlm \
$(EOLIST)
#
@@ -201,7 +205,7 @@ FILES_nlm_objs = \
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- libcpre.o \
+ $(PRELUDE) \
$(EOLIST)
ifeq ($(LINK_STATIC),1)
@@ -244,7 +248,7 @@ FILE_nlm_copyright =
# Any additional imports go here
#
FILES_nlm_Ximports = \
- @$(APR)/aprlib.imp \
+ @aprlib.imp \
@libc.imp \
$(EOLIST)
@@ -291,7 +295,7 @@ install :: nlms FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Modified: apr/apr-util/branches/1.5.x/dbd/NWGNUdbdsqli2
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/dbd/NWGNUdbdsqli2?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/dbd/NWGNUdbdsqli2 (original)
+++ apr/apr-util/branches/1.5.x/dbd/NWGNUdbdsqli2 Fri Mar 18 01:08:15 2011
@@ -11,7 +11,7 @@ SUBDIRS = \
#
ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
endif
#include $(APR)\build\NWGNUcustom.inc
@@ -38,8 +38,8 @@ SQLITE2_NLM = lsqlite2
XINCDIRS += \
$(APR)/include/arch/netware \
$(APR)/include \
- $(APRUTIL)/include \
- $(APRUTIL)/include/private \
+ $(APU)/include \
+ $(APU)/include/private \
$(APR) \
$(SQLITE2_INC) \
$(EOLIST)
@@ -150,12 +150,12 @@ NLM_STACK_SIZE = 8192
#
# If this is specified it will be used by the link '-entry' directive
#
-NLM_ENTRY_SYM = _LibCPrelude
+NLM_ENTRY_SYM =
#
# If this is specified it will be used by the link '-exit' directive
#
-NLM_EXIT_SYM = _LibCPostlude
+NLM_EXIT_SYM =
#
# If this is specified it will be used by the link '-check' directive
@@ -165,7 +165,7 @@ NLM_CHECK_SYM =
#
# If these are 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
@@ -200,7 +200,7 @@ FILES_nlm_objs = \
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- libcpre.o \
+ $(PRELUDE) \
$(EOLIST)
ifeq ($(LINK_STATIC),1)
@@ -290,7 +290,7 @@ install :: nlms FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Modified: apr/apr-util/branches/1.5.x/dbd/NWGNUdbdsqli3
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/dbd/NWGNUdbdsqli3?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/dbd/NWGNUdbdsqli3 (original)
+++ apr/apr-util/branches/1.5.x/dbd/NWGNUdbdsqli3 Fri Mar 18 01:08:15 2011
@@ -11,7 +11,7 @@ SUBDIRS = \
#
ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
endif
#include $(APR)\build\NWGNUcustom.inc
@@ -38,8 +38,8 @@ SQLITE3_NLM = lsqlite3
XINCDIRS += \
$(APR)/include/arch/netware \
$(APR)/include \
- $(APRUTIL)/include \
- $(APRUTIL)/include/private \
+ $(APU)/include \
+ $(APU)/include/private \
$(APR) \
$(SQLITE3_INC) \
$(EOLIST)
@@ -150,12 +150,12 @@ NLM_STACK_SIZE = 8192
#
# If this is specified it will be used by the link '-entry' directive
#
-NLM_ENTRY_SYM = _LibCPrelude
+NLM_ENTRY_SYM =
#
# If this is specified it will be used by the link '-exit' directive
#
-NLM_EXIT_SYM = _LibCPostlude
+NLM_EXIT_SYM =
#
# If this is specified it will be used by the link '-check' directive
@@ -165,7 +165,7 @@ NLM_CHECK_SYM =
#
# If these are 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
@@ -200,7 +200,7 @@ FILES_nlm_objs = \
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- libcpre.o \
+ $(PRELUDE) \
$(EOLIST)
ifeq ($(LINK_STATIC),1)
@@ -292,7 +292,7 @@ install :: nlms FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Modified: apr/apr-util/branches/1.5.x/dbd/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/dbd/NWGNUmakefile?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/dbd/NWGNUmakefile (original)
+++ apr/apr-util/branches/1.5.x/dbd/NWGNUmakefile Fri Mar 18 01:08:15 2011
@@ -10,7 +10,7 @@ SUBDIRS = \
# paths to tools
#
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
#
# build this level's files
@@ -246,7 +246,7 @@ nlms :: libs $(TARGET_nlm)
# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples)
#
install :: nlms $(INSTDIRS) FORCE
- copy $(OBJDIR)\*.nlm $(INSTALLBASE)
+ $(call COPY,$(OBJDIR)/*.nlm,$(INSTALLBASE))
#
# Any specialized rules here
@@ -257,6 +257,6 @@ install :: nlms $(INSTDIRS) FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Modified: apr/apr-util/branches/1.5.x/dbm/NWGNUdbmdb
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/dbm/NWGNUdbmdb?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/dbm/NWGNUdbmdb (original)
+++ apr/apr-util/branches/1.5.x/dbm/NWGNUdbmdb Fri Mar 18 01:08:15 2011
@@ -11,7 +11,7 @@ SUBDIRS = \
#
ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
endif
#include $(APR)\build\NWGNUcustom.inc
@@ -151,12 +151,12 @@ NLM_STACK_SIZE = 8192
#
# If this is specified it will be used by the link '-entry' directive
#
-NLM_ENTRY_SYM = _LibCPrelude
+NLM_ENTRY_SYM =
#
# If this is specified it will be used by the link '-exit' directive
#
-NLM_EXIT_SYM = _LibCPostlude
+NLM_EXIT_SYM =
#
# If this is specified it will be used by the link '-check' directive
@@ -166,7 +166,7 @@ NLM_CHECK_SYM =
#
# If these are 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
@@ -201,7 +201,7 @@ FILES_nlm_objs = \
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- libcpre.o \
+ $(PRELUDE) \
$(EOLIST)
ifeq ($(LINK_STATIC),1)
@@ -291,7 +291,7 @@ install :: nlms FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Modified: apr/apr-util/branches/1.5.x/dbm/NWGNUdbmgdbm
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/dbm/NWGNUdbmgdbm?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/dbm/NWGNUdbmgdbm (original)
+++ apr/apr-util/branches/1.5.x/dbm/NWGNUdbmgdbm Fri Mar 18 01:08:15 2011
@@ -11,7 +11,7 @@ SUBDIRS = \
#
ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
endif
#include $(APR)\build\NWGNUcustom.inc
@@ -150,12 +150,12 @@ NLM_STACK_SIZE = 8192
#
# If this is specified it will be used by the link '-entry' directive
#
-NLM_ENTRY_SYM = _LibCPrelude
+NLM_ENTRY_SYM =
#
# If this is specified it will be used by the link '-exit' directive
#
-NLM_EXIT_SYM = _LibCPostlude
+NLM_EXIT_SYM =
#
# If this is specified it will be used by the link '-check' directive
@@ -165,7 +165,7 @@ NLM_CHECK_SYM =
#
# If these are 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
@@ -200,7 +200,7 @@ FILES_nlm_objs = \
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- libcpre.o \
+ $(PRELUDE) \
$(EOLIST)
ifeq ($(LINK_STATIC),1)
@@ -290,7 +290,7 @@ install :: nlms FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Modified: apr/apr-util/branches/1.5.x/dbm/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/dbm/NWGNUmakefile?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/dbm/NWGNUmakefile (original)
+++ apr/apr-util/branches/1.5.x/dbm/NWGNUmakefile Fri Mar 18 01:08:15 2011
@@ -10,7 +10,7 @@ SUBDIRS = \
# paths to tools
#
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
#
# build this level's files
@@ -246,6 +246,6 @@ install :: nlms $(INSTDIRS) FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Modified: apr/apr-util/branches/1.5.x/ldap/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/ldap/NWGNUmakefile?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/ldap/NWGNUmakefile (original)
+++ apr/apr-util/branches/1.5.x/ldap/NWGNUmakefile Fri Mar 18 01:08:15 2011
@@ -10,7 +10,7 @@ SUBDIRS = \
# paths to tools
#
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
#
# build this level's files
@@ -26,8 +26,8 @@ include $(APR_WORK)\build\NWGNUhead.inc
XINCDIRS += \
$(APR)/include \
$(APR)/include/arch/NetWare \
- $(APRUTIL)/include \
- $(APRUTIL)/include/private \
+ $(APU)/include \
+ $(APU)/include/private \
$(LDAPSDK)/inc \
$(EOLIST)
@@ -123,7 +123,7 @@ NLM_DESCRIPTION =
NLM_THREAD_NAME =
#
# If this is specified, it will override VERSION value in
-# $(APR_WORK)\build\NWGNUenvironment.inc
+# $(APR_WORK)/build/NWGNUenvironment.inc
#
NLM_VERSION =
@@ -135,12 +135,12 @@ 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
@@ -246,7 +246,7 @@ nlms :: libs $(TARGET_nlm)
#
# Updated this target to create necessary directories and copy files to the
-# correct place. (See $(APR_WORK)\build\NWGNUhead.inc for examples)
+# correct place. (See $(APR_WORK)/build/NWGNUhead.inc for examples)
#
install :: nlms FORCE
@@ -259,5 +259,5 @@ install :: nlms FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Modified: apr/apr-util/branches/1.5.x/test/NWGNUaputest
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/test/NWGNUaputest?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/test/NWGNUaputest (original)
+++ apr/apr-util/branches/1.5.x/test/NWGNUaputest Fri Mar 18 01:08:15 2011
@@ -8,7 +8,7 @@
#
ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
endif
#
@@ -18,7 +18,7 @@ endif
XINCDIRS += \
$(APR)/include \
$(APR)/include/arch/NetWare \
- $(APRUTIL)/include \
+ $(APU)/include \
$(LDAPSDK)/inc \
$(EOLIST)
@@ -112,7 +112,7 @@ NLM_SCREEN_NAME = aputest
#
# If this is specified, it will override VERSION value in
-# $(APR_WORK)\build\NWGNUenvironment.inc
+# $(APR_WORK)/build/NWGNUenvironment.inc
#
NLM_VERSION =
@@ -124,12 +124,12 @@ NLM_STACK_SIZE = 524288
#
# If this is specified it will be used by the link '-entry' directive
#
-NLM_ENTRY_SYM = _LibCPrelude
+NLM_ENTRY_SYM =
#
# If this is specified it will be used by the link '-exit' directive
#
-NLM_EXIT_SYM = _LibCPostlude
+NLM_EXIT_SYM =
#
# If this is specified it will be used by the link '-check' directive
@@ -139,7 +139,7 @@ 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
@@ -201,7 +201,7 @@ FILES_nlm_objs = \
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- libcpre.o \
+ $(PRELUDE) \
$(EOLIST)
#
@@ -213,7 +213,6 @@ FILES_nlm_modules = \
APRLIB \
lldapsdk \
lldapssl \
- lldapx \
$(EOLIST)
#
@@ -236,9 +235,9 @@ FILE_nlm_copyright =
#
FILES_nlm_Ximports = \
@libc.imp \
- @$(APR)/aprlib.imp \
- @$(LDAPSDK)/imports/lldapsdk.imp \
- @$(LDAPSDK)/imports/lldapssl.imp \
+ @aprlib.imp \
+ @lldapsdk.imp \
+ @lldapssl.imp \
$(EOLIST)
#
@@ -264,7 +263,7 @@ nlms :: libs $(TARGET_nlm)
#
# Updated this target to create necessary directories and copy files to the
-# correct place. (See $(APR_WORK)\build\NWGNUhead.inc for examples)
+# correct place. (See $(APR_WORK)/build/NWGNUhead.inc for examples)
#
install :: nlms FORCE
@@ -278,5 +277,5 @@ install :: nlms FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Modified: apr/apr-util/branches/1.5.x/test/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/test/NWGNUmakefile?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/test/NWGNUmakefile (original)
+++ apr/apr-util/branches/1.5.x/test/NWGNUmakefile Fri Mar 18 01:08:15 2011
@@ -10,7 +10,7 @@ SUBDIRS = \
# paths to tools
#
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
#
# build this level's files
@@ -120,7 +120,7 @@ NLM_SCREEN_NAME =
#
# If this is specified, it will override VERSION value in
-# $(APR_WORK)\build\NWGNUenvironment.inc
+# $(APR_WORK)/build/NWGNUenvironment.inc
#
NLM_VERSION =
@@ -239,10 +239,10 @@ nlms :: libs $(TARGET_nlm)
#
# Updated this target to create necessary directories and copy files to the
-# correct place. (See $(APR_WORK)\build\NWGNUhead.inc for examples)
+# correct place. (See $(APR_WORK)/build/NWGNUhead.inc for examples)
#
install :: nlms FORCE
- copy $(OBJDIR)\*.nlm $(INSTALLBASE)
+ $(call COPY,$(OBJDIR)/*.nlm,$(INSTALLBASE))
#
# Any specialized rules here
@@ -253,5 +253,5 @@ install :: nlms FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Modified: apr/apr-util/branches/1.5.x/test/nw_misc.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/test/nw_misc.c?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/test/nw_misc.c (original)
+++ apr/apr-util/branches/1.5.x/test/nw_misc.c Fri Mar 18 01:08:15 2011
@@ -1,4 +1,6 @@
+#include <stdio.h>
#include <stdlib.h>
+#include <screen.h>
/*
#include "testutil.h"
*/
@@ -6,6 +8,7 @@
/* function to keep the screen open if not launched from bash */
void _NonAppStop( void )
{
+ if (getenv("_IN_NETWARE_BASH_") == NULL) {
printf("\r\n<Press any key to close screen> ");
getcharacter();
}
Modified: apr/apr-util/branches/1.5.x/xml/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/xml/NWGNUmakefile?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/xml/NWGNUmakefile (original)
+++ apr/apr-util/branches/1.5.x/xml/NWGNUmakefile Fri Mar 18 01:08:15 2011
@@ -10,7 +10,7 @@ SUBDIRS = \
# paths to tools
#
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
#
# build this level's files
@@ -26,11 +26,11 @@ include $(APR_WORK)\build\NWGNUhead.inc
XINCDIRS += \
$(APR)/include \
$(APR)/include/arch/NetWare \
- $(APRUTIL)/include \
- $(APRUTIL)/uri \
- $(APRUTIL)/dbm/sdbm \
- $(APRUTIL)/include/private \
- $(APRUTIL)/xml/expat/lib \
+ $(APU)/include \
+ $(APU)/uri \
+ $(APU)/dbm/sdbm \
+ $(APU)/include/private \
+ $(APUXML)/expat/lib \
$(EOLIST)
#
@@ -118,7 +118,7 @@ NLM_DESCRIPTION =
NLM_THREAD_NAME =
#
# If this is specified, it will override VERSION value in
-# $(APR_WORK)\build\NWGNUenvironment.inc
+# $(APR_WORK)/build/NWGNUenvironment.inc
#
NLM_VERSION =
@@ -168,7 +168,7 @@ TARGET_nlm = \
# If there is an LIB target, put it here
#
TARGET_lib = \
- $(OBJDIR)/xmllib.lib \
+ $(OBJDIR)/apuxml.lib \
$(EOLIST)
#
@@ -240,7 +240,7 @@ nlms :: libs $(TARGET_nlm)
#
# Updated this target to create necessary directories and copy files to the
-# correct place. (See $(APR_WORK)\build\NWGNUhead.inc for examples)
+# correct place. (See $(APR_WORK)/build/NWGNUhead.inc for examples)
#
install :: nlms FORCE
@@ -255,5 +255,5 @@ vpath %.c expat/lib
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Modified: apr/apr-util/branches/1.5.x/xml/expat/lib/expat_config.hnw
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/xml/expat/lib/expat_config.hnw?rev=1082778&r1=1082777&r2=1082778&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/xml/expat/lib/expat_config.hnw (original)
+++ apr/apr-util/branches/1.5.x/xml/expat/lib/expat_config.hnw Fri Mar 18 01:08:15 2011
@@ -12,7 +12,6 @@
#ifndef EXPAT_CONFIG_HNW
#define EXPAT_CONFIG_HNW
-#include <memory.h>
#include <string.h>
#define HAVE_MEMMOVE