Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 11960 invoked from network); 6 Mar 2011 20:14:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 6 Mar 2011 20:14:06 -0000 Received: (qmail 42165 invoked by uid 500); 6 Mar 2011 20:14:06 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 42124 invoked by uid 500); 6 Mar 2011 20:14:06 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 42117 invoked by uid 99); 6 Mar 2011 20:14:06 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 06 Mar 2011 20:14:06 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 06 Mar 2011 20:13:58 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 69C252388A4B; Sun, 6 Mar 2011 20:13:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1078559 - in /apr/apr/trunk: ./ build/ dbd/ dbm/ ldap/ test/ xml/ Date: Sun, 06 Mar 2011 20:13:36 -0000 To: commits@apr.apache.org From: fuankg@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110306201336.69C252388A4B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: fuankg Date: Sun Mar 6 20:13:35 2011 New Revision: 1078559 URL: http://svn.apache.org/viewvc?rev=1078559&view=rev Log: NetWare build overhaul in order to compile on Linux. Part 4. Modified: apr/apr/trunk/NWGNUmakefile apr/apr/trunk/build/NWGNUenvironment.inc apr/apr/trunk/build/NWGNUhead.inc apr/apr/trunk/build/NWGNUmakefile apr/apr/trunk/build/NWGNUtail.inc apr/apr/trunk/dbd/NWGNUdbdfreetds apr/apr/trunk/dbd/NWGNUdbdmysql apr/apr/trunk/dbd/NWGNUdbdpgsql apr/apr/trunk/dbd/NWGNUdbdsqli2 apr/apr/trunk/dbd/NWGNUdbdsqli3 apr/apr/trunk/dbd/NWGNUmakefile apr/apr/trunk/dbm/NWGNUdbmdb apr/apr/trunk/dbm/NWGNUdbmgdbm apr/apr/trunk/dbm/NWGNUmakefile apr/apr/trunk/ldap/NWGNUmakefile apr/apr/trunk/test/NWGNUaprtest apr/apr/trunk/test/NWGNUechod apr/apr/trunk/test/NWGNUglobalmutexchild apr/apr/trunk/test/NWGNUmakefile apr/apr/trunk/test/NWGNUmod_test apr/apr/trunk/test/NWGNUproc_child apr/apr/trunk/test/NWGNUreadchild apr/apr/trunk/test/NWGNUsockchild apr/apr/trunk/test/NWGNUsockperf apr/apr/trunk/test/NWGNUtestatmc apr/apr/trunk/test/NWGNUtryread apr/apr/trunk/xml/NWGNUmakefile Modified: apr/apr/trunk/NWGNUmakefile URL: http://svn.apache.org/viewvc/apr/apr/trunk/NWGNUmakefile?rev=1078559&r1=1078558&r2=1078559&view=diff ============================================================================== --- apr/apr/trunk/NWGNUmakefile (original) +++ apr/apr/trunk/NWGNUmakefile Sun Mar 6 20:13:35 2011 @@ -141,12 +141,12 @@ NLM_STACK_SIZE = # # 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 @@ -156,7 +156,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 @@ -423,24 +423,24 @@ nlms :: libs $(TARGET_nlm) # correct place. (See $(APR_WORK)/build/NWGNUhead.inc for examples) # install :: nlms $(INSTDIRS) FORCE - $(call CP,$(APR)/$(TARGET_nlm),$(INSTALLBASE)/) + $(call COPY,$(APR)/$(TARGET_nlm),$(INSTALLBASE)/) ifndef DEST - -$(call CP,$(APR)/STATUS,$(INSTALLBASE)/*.apr) - -$(call CP,$(APR)/LICENSE,$(INSTALLBASE)/) - -$(call CP,$(APR)/CHANGES,$(INSTALLBASE)/*.apr) - @-$(call XCP,$(APR)/docs,$(INSTALLBASE)/docs/) + -$(call COPY,$(APR)/STATUS,$(INSTALLBASE)/*.apr) + -$(call COPY,$(APR)/LICENSE,$(INSTALLBASE)/) + -$(call COPY,$(APR)/CHANGES,$(INSTALLBASE)/*.apr) + @-$(call COPYR,$(APR)/docs,$(INSTALLBASE)/docs/) endif ifndef DEST installdev :: $(INSTDEVDIRS) FORCE - $(call CP,$(APR)/include/*.h,$(INSTALLBASE)/include/) - $(call CP,$(APR)/*.imp,$(INSTALLBASE)/lib/) - $(call CP,$(APR)/misc/netware/*.xdc,$(INSTALLBASE)/lib/) - $(call CP,$(APR)/$(TARGET_lib),$(INSTALLBASE)/lib/) - $(call CP,$(APR)/$(TARGET_nlm),$(INSTALLBASE)/bin/) + $(call COPY,$(APR)/include/*.h,$(INSTALLBASE)/include/) + $(call COPY,$(APR)/*.imp,$(INSTALLBASE)/lib/) + $(call COPY,$(APR)/misc/netware/*.xdc,$(INSTALLBASE)/lib/) + $(call COPY,$(APR)/$(TARGET_lib),$(INSTALLBASE)/lib/) + $(call COPY,$(APR)/$(TARGET_nlm),$(INSTALLBASE)/bin/) $(INSTDEVDIRS) :: - $(call MD,$@) + $(call MKDIR,$@) endif # @@ -460,7 +460,8 @@ endif vpath %.c network_io/unix $(OBJDIR)/%.o: file_io/netware/%.c $(OBJDIR)/$(NLM_NAME)_cc.opt - @echo Compiling $< +# @echo Compiling $< + @echo $(DL)CC $<$(DL) $(CC) -cwd source -o $@ $< @$(OBJDIR)/$(NLM_NAME)_cc.opt # @@ -468,6 +469,6 @@ $(OBJDIR)/%.o: file_io/netware/%.c $(OBJ # in this makefile # -include $(APR_WORK)/build/NWGNUtail.inc +include $(APRBUILD)/NWGNUtail.inc Modified: apr/apr/trunk/build/NWGNUenvironment.inc URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/NWGNUenvironment.inc?rev=1078559&r1=1078558&r2=1078559&view=diff ============================================================================== --- apr/apr/trunk/build/NWGNUenvironment.inc (original) +++ apr/apr/trunk/build/NWGNUenvironment.inc Sun Mar 6 20:13:35 2011 @@ -72,7 +72,7 @@ $(error neither EXPATSDK nor EXPATSRC de endif ifndef METROWERKS -METROWERKS = C:\Program Files\Metrowerks\CodeWarrior +METROWERKS = $(ProgramFiles)\Metrowerks\CodeWarrior endif # If LM_LICENSE_FILE isn't defined, define a variable that can be used to @@ -142,33 +142,35 @@ LIB = mwldnlm -type library -w nocmdline # Setup build tools AWK = awk +SORT = sort # # Declare Command and tool macros here # ifeq ($(findstring /sh,$(SHELL)),/sh) -DEL = $(RM) $1 -MD = mkdir -p $1 -DELTREE = rm -rf $1 -CP = cp -av $1 $2 -XCP = cp -ar +DEL = rm -f $1 +RMDIR = rm -rf $1 +MKDIR = mkdir -p $1 +COPY = cp -av $1 $2 +COPYR = cp -ar $1 $2 ECHONL = echo "" DL = ' +CAT = cat else ifeq "$(OS)" "Windows_NT" -CMD = cmd /c -DEL = $(CMD) if exist $(subst /,\,$1) del /q /f 2>NUL $(subst /,\,$1) -DELTREE = rd /s /q 2>NUL $(subst /,\,$1) +DEL = $(shell if exist $(subst /,\,$1) del /q /f 2>NUL $(subst /,\,$1)) +RMDIR = $(shell if exist $(subst /,\,$1)\NUL rd /q /s 2>NUL $(subst /,\,$1)) +ECHONL = cmd /c echo. else -CMD = command /c -DEL = $(CMD) if exist $(subst /,\,$1) del 2>NUL $(subst /,\,$1) -DELTREE = deltree /y $(subst /,\,$1) -endif -MD = $(CMD) if not exist $(subst /,\,$1)\NUL md 2>NUL $(subst /,\,$1) -CP = copy /y 2>NUL $(subst /,\,$1) $(subst /,\,$2) -XCP = xcopy /e /y 2>NUL $(subst /,\,$1) $(subst /,\,$2) -ECHONL = $(CMD) echo. +DEL = $(shell if exist $(subst /,\,$1) del 2>NUL $(subst /,\,$1)) +RMDIR = $(shell if exist $(subst /,\,$1)\NUL deltree /y 2>NUL $(subst /,\,$1)) +ECHONL = command /c echo. +endif +MKDIR = $(shell if not exist $(subst /,\,$1)\NUL md 2>NUL $(subst /,\,$1)) +COPY = copy /y 2>NUL $(subst /,\,$1) $(subst /,\,$2) +COPYR = xcopy /y /e 2>NUL $(subst /,\,$1) $(subst /,\,$2) +CAT = type endif ifdef IPV6 Modified: apr/apr/trunk/build/NWGNUhead.inc URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/NWGNUhead.inc?rev=1078559&r1=1078558&r2=1078559&view=diff ============================================================================== --- apr/apr/trunk/build/NWGNUhead.inc (original) +++ apr/apr/trunk/build/NWGNUhead.inc Sun Mar 6 20:13:35 2011 @@ -86,12 +86,12 @@ FORCE : ; clean :: $(SUBDIRS) $(APRTEST) @echo Cleaning up $(CURDIR) - -$(call DELTREE,$(OBJDIR)) + $(call RMDIR,$(OBJDIR)) $(call DEL,*.err) $(call DEL,*.map) -# $(call DEL,*.d) $(call DEL,*.tmp) +# $(call DEL,*.d) $(OBJDIR) :: - $(call MD,$@) + $(call MKDIR,$@) Modified: apr/apr/trunk/build/NWGNUmakefile URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/NWGNUmakefile?rev=1078559&r1=1078558&r2=1078559&view=diff ============================================================================== --- apr/apr/trunk/build/NWGNUmakefile (original) +++ apr/apr/trunk/build/NWGNUmakefile Sun Mar 6 20:13:35 2011 @@ -19,7 +19,6 @@ FILES_prebuild_headers = \ $(APR)/include/apr.h \ $(APR)/include/apu_want.h \ $(APR)/include/apr_ldap.h \ - $(APR)/include/private/apu_config.h \ $(APR)/include/private/apu_select_dbm.h \ $(EOLIST) @@ -28,7 +27,7 @@ nlms :: $(APR)/aprlib.imp $(APR)/aprlib.imp : make_nw_export.awk nw_export.i # @echo Generating $@ @echo GEN $@ - $(AWK) -v EXPPREFIX=APR$(VERSION_MAJMIN) -f $^ | sort >$@ + $(AWK) -v EXPPREFIX=APR$(VERSION_MAJMIN) -f $^ | $(SORT) >$@ nw_export.i : nw_export.inc $(FILES_prebuild_headers) $(NLM_NAME)_cc.opt # @echo Generating $@ @@ -51,19 +50,13 @@ ifneq "$(LDAPSDK)" "" @echo -ir $(LDAPSDK) >> $@ endif -$(APR)/include/%.h: $(APR)/include/%.hnw +%.h: %.hnw @echo Creating $@ - $(call CP,$<,$@) + $(call COPY,$<,$@) -$(APR)/include/private/%.h: $(APR)/include/private/%.hnw +%.h: %.hw @echo Creating $@ - $(call CP,$<,$@) - -$(APR)/include/private/%.h: $(APR)/include/private/%.hw - @echo Creating $@ - $(call CP,$<,$@) - -$(APR)/include/private/apu_config.h: FORCE + $(call COPY,$<,$@) # # You can use this target if all that is needed is to copy files to the @@ -76,17 +69,14 @@ clean :: $(call DEL,nw_export.i) $(call DEL,$(NLM_NAME)_cc.opt) $(call DEL,NWGNUversion.inc) - $(call DEL,$(APR)/include/apr.h) - $(call DEL,$(APR)/include/apu_want.h) - $(call DEL,$(APR)/include/apr_ldap.h) - $(call DEL,$(APR)/include/private/apu_config.h) - $(call DEL,$(APR)/include/private/apu_select_dbm.h) $(call DEL,$(APR)/aprlib.imp) + $(foreach file,$(FILES_prebuild_headers),$(call DEL,$(file))) # # Include the 'tail' makefile that has targets that depend on variables defined # in this makefile # -include $(APR_WORK)/build/NWGNUtail.inc +include $(APRBUILD)/NWGNUtail.inc + Modified: apr/apr/trunk/build/NWGNUtail.inc URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/NWGNUtail.inc?rev=1078559&r1=1078558&r2=1078559&view=diff ============================================================================== --- apr/apr/trunk/build/NWGNUtail.inc (original) +++ apr/apr/trunk/build/NWGNUtail.inc Sun Mar 6 20:13:35 2011 @@ -28,6 +28,22 @@ ifndef NLM_COPYRIGHT NLM_COPYRIGHT = Licensed under the Apache License, Version 2.0 endif +ifeq "$(NLM_FLAGS)" "" +NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION +endif + +ifeq "$(NLM_STACK_SIZE)" "" +NLM_STACK_SIZE = 65536 +endif + +ifeq "$(NLM_ENTRY_SYM)" "" +NLM_ENTRY_SYM = _LibCPrelude +endif + +ifeq "$(NLM_EXIT_SYM)" "" +NLM_EXIT_SYM = _LibCPostlude +endif + # # Create dependency lists based on the files available # @@ -114,14 +130,14 @@ ifeq "$(INCLUDE_BLDCMDS)" "1" $(OBJDIR)/%.o: %.c $(OBJDIR)/$(CCOPT_NAME)_cc.opt # @echo Compiling $< - @echo CC $< + @echo $(DL)CC $<$(DL) $(CC) -o $@ $< @$(word 2, $^) $(OBJDIR)/$(CCOPT_NAME)_cc.opt: $(CCOPT_DEPENDS) $(call DEL,$@) # @echo CCOPT_DEPENDS=$^ # @echo Generating $@ - @echo GEN $@ + @echo $(DL)GEN $@$(DL) ifneq "$(strip $(CFLAGS))" "" @echo $(CFLAGS) >> $@ endif @@ -143,14 +159,14 @@ endif $(OBJDIR)/%.o: %.cpp $(OBJDIR)/$(CCOPT_NAME)_cpp.opt # @echo Compiling $< - @echo CC $< + @echo $(DL)CPP $<$(DL) $(CCP) -o $@ $< @$(word 2, $^) $(OBJDIR)/$(CCOPT_NAME)_cpp.opt: $(CPPOPT_DEPENDS) $(call DEL,$@) - @echo CPPOPT_DEPENDS=$^ +# @echo CPPOPT_DEPENDS=$^ # @echo Generating $@ - @echo GEN $@ + @echo $(DL)GEN $@$(DL) ifneq "$(strip $(CFLAGS))" "" @echo $(CFLAGS) >> $@ endif @@ -183,14 +199,14 @@ ifeq "$(words $(strip $(TARGET_lib)))" " $(TARGET_lib) : $(OBJDIR)/$(LIB_NAME)_lib.lst $(call DEL,$@) # @echo Generating $@ - @echo AR $@ + @echo $(DL)AR $@$(DL) $(LIB) -o $@ @$< $(OBJDIR)/aprlib_lib.lst: $(aprlib_LIBLST_DEPENDS) $(call DEL,$@) ifneq "$(strip $(FILES_lib_objs))" "" # @echo Generating $@ - @echo GEN $@ + @echo $(DL)GEN $@$(DL) @echo $(wordlist 1, 10, $(FILES_lib_objs)) >> $@ @echo $(wordlist 11, 20, $(FILES_lib_objs)) >> $@ @echo $(wordlist 21, 30, $(FILES_lib_objs)) >> $@ @@ -208,7 +224,7 @@ $(OBJDIR)/%_lib.lst: $($(LIB_NAME)_LIBLS $(call DEL,$@) ifneq "$(strip $(FILES_lib_objs))" "" # @echo Generating $@ - @echo GEN $@ + @echo $(DL)GEN $@$(DL) @echo $(FILES_lib_objs) >> $@ endif @@ -231,7 +247,7 @@ ifeq "$(words $(strip $(TARGET_nlm)))" " $(TARGET_nlm) : $(FILES_nlm_objs) $(FILES_nlm_libs) $(OBJDIR)/$(NLM_NAME)_link.opt # @echo Linking $@ - @echo LINK $@ + @echo $(DL)LINK $@$(DL) $(LINK) @$(OBJDIR)/$(NLM_NAME)_link.opt # This will force the link option file to be rebuilt if we change the @@ -241,18 +257,20 @@ $(OBJDIR)/$(NLM_NAME)_link.opt : $($(NLM $(call DEL,$@) $(call DEL,$(@:.opt=.def)) # @echo Generating $@ - @echo GEN $@ + @echo $(DL)GEN $@$(DL) + @echo $(DL)# Do not edit this file - it is created by make!$(DL) > $@ + @echo $(DL)# All your changes will be lost!!$(DL) >> $@ @echo -warnings off >> $@ @echo -zerobss >> $@ @echo -o $(TARGET_nlm) >> $@ ifneq "$(FILE_nlm_copyright)" "" - @-type $(FILE_nlm_copyright) >> $@ + @-$(CAT) $(FILE_nlm_copyright) >> $@ endif ifeq "$(RELEASE)" "debug" @echo -g >> $@ @echo -sym internal >> $@ @echo -sym codeview4 >> $@ - @echo -osym $(OBJDIR)\$(NLM_NAME).sym >> $@ + @echo -osym $(OBJDIR)/$(NLM_NAME).sym >> $@ else @echo -sym internal >> $@ endif @@ -295,29 +313,19 @@ ifeq "$(FILE_nlm_copyright)" "" endif @echo $(DL)description "$(NLM_DESCRIPTION)"$(DL) >> $(@:.opt=.def) @echo $(DL)threadname "$(NLM_THREAD_NAME)"$(DL) >> $(@:.opt=.def) -ifneq "$(NLM_STACK_SIZE)" "" - @echo stacksize $(subst K,000,$(subst k,K,$(strip $(NLM_STACK_SIZE)))) >> $(@:.opt=.def) -else - @echo stacksize 64000 >> $(@:.opt=.def) -endif @echo $(DL)screenname "$(NLM_SCREEN_NAME)"$(DL) >> $(@:.opt=.def) + @echo stacksize $(subst K,000,$(subst k,K,$(strip $(NLM_STACK_SIZE)))) >> $(@:.opt=.def) ifneq "$(NLM_VERSION)" "" @echo version $(NLM_VERSION) >> $(@:.opt=.def) else @echo version $(VERSION) >> $(@:.opt=.def) endif -ifneq "$(NLM_ENTRY_SYM)" "" + @echo $(strip $(NLM_FLAGS)) >> $(@:.opt=.def) @echo start $(NLM_ENTRY_SYM) >> $(@:.opt=.def) -endif -ifneq "$(NLM_EXIT_SYM)" "" @echo exit $(NLM_EXIT_SYM) >> $(@:.opt=.def) -endif ifneq "$(NLM_CHECK_SYM)" "" @echo check $(NLM_CHECK_SYM) >> $(@:.opt=.def) endif -ifneq "$(NLM_FLAGS)" "" - @echo $(strip $(NLM_FLAGS)) >> $(@:.opt=.def) -endif ifneq "$(FILES_nlm_modules)" "" @echo module $(foreach module,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_modules))),$(module)) >> $(@:.opt=.def) endif @@ -327,7 +335,6 @@ endif ifneq "$(FILES_nlm_exports)" "" @echo export $(foreach export,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_exports))),$(export)) >> $(@:.opt=.def) endif - # if APACHE_UNIPROC is defined, don't include XDCData ifndef APACHE_UNIPROC ifneq "$(string $(XDCDATA))" "" @@ -358,6 +365,6 @@ endif # NO_LICENSE_FILE endif # multiple targets $(INSTDIRS) :: - $(call MD,$@) + $(call MKDIR,$@) Modified: apr/apr/trunk/dbd/NWGNUdbdfreetds URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/NWGNUdbdfreetds?rev=1078559&r1=1078558&r2=1078559&view=diff ============================================================================== --- apr/apr/trunk/dbd/NWGNUdbdfreetds (original) +++ apr/apr/trunk/dbd/NWGNUdbdfreetds Sun Mar 6 20:13:35 2011 @@ -14,8 +14,6 @@ ifndef EnvironmentDefined include $(APR_WORK)/build/NWGNUhead.inc endif -#include $(APR)/build/NWGNUcustom.inc - # # build this level's files @@ -142,18 +140,17 @@ NLM_VERSION = # # If this is specified, it will override the default of 64K # -NLM_STACK_SIZE = 8192 - +NLM_STACK_SIZE = # # 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 @@ -163,7 +160,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 @@ -288,7 +285,5 @@ install :: nlms FORCE # in this makefile # -include $(APR_WORK)/build/NWGNUtail.inc - - +include $(APRBUILD)/NWGNUtail.inc Modified: apr/apr/trunk/dbd/NWGNUdbdmysql URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/NWGNUdbdmysql?rev=1078559&r1=1078558&r2=1078559&view=diff ============================================================================== --- apr/apr/trunk/dbd/NWGNUdbdmysql (original) +++ apr/apr/trunk/dbd/NWGNUdbdmysql Sun Mar 6 20:13:35 2011 @@ -14,8 +14,6 @@ ifndef EnvironmentDefined include $(APR_WORK)/build/NWGNUhead.inc endif -#include $(APR)/build/NWGNUcustom.inc - # # build this level's files @@ -146,18 +144,17 @@ NLM_VERSION = # # If this is specified, it will override the default of 64K # -NLM_STACK_SIZE = 8192 - +NLM_STACK_SIZE = # # 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 @@ -167,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 @@ -292,7 +289,5 @@ install :: nlms FORCE # in this makefile # -include $(APR_WORK)/build/NWGNUtail.inc - - +include $(APRBUILD)/NWGNUtail.inc Modified: apr/apr/trunk/dbd/NWGNUdbdpgsql URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/NWGNUdbdpgsql?rev=1078559&r1=1078558&r2=1078559&view=diff ============================================================================== --- apr/apr/trunk/dbd/NWGNUdbdpgsql (original) +++ apr/apr/trunk/dbd/NWGNUdbdpgsql Sun Mar 6 20:13:35 2011 @@ -14,8 +14,6 @@ ifndef EnvironmentDefined include $(APR_WORK)/build/NWGNUhead.inc endif -#include $(APR)/build/NWGNUcustom.inc - # # build this level's files @@ -143,18 +141,17 @@ NLM_VERSION = # # If this is specified, it will override the default of 64K # -NLM_STACK_SIZE = 8192 - +NLM_STACK_SIZE = # # 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 @@ -164,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 @@ -289,7 +286,5 @@ install :: nlms FORCE # in this makefile # -include $(APR_WORK)/build/NWGNUtail.inc - - +include $(APRBUILD)/NWGNUtail.inc Modified: apr/apr/trunk/dbd/NWGNUdbdsqli2 URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/NWGNUdbdsqli2?rev=1078559&r1=1078558&r2=1078559&view=diff ============================================================================== --- apr/apr/trunk/dbd/NWGNUdbdsqli2 (original) +++ apr/apr/trunk/dbd/NWGNUdbdsqli2 Sun Mar 6 20:13:35 2011 @@ -14,8 +14,6 @@ ifndef EnvironmentDefined include $(APR_WORK)/build/NWGNUhead.inc endif -#include $(APR)/build/NWGNUcustom.inc - # # build this level's files @@ -142,18 +140,17 @@ NLM_VERSION = # # If this is specified, it will override the default of 64K # -NLM_STACK_SIZE = 8192 - +NLM_STACK_SIZE = # # 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 @@ -163,7 +160,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 @@ -288,7 +285,5 @@ install :: nlms FORCE # in this makefile # -include $(APR_WORK)/build/NWGNUtail.inc - - +include $(APRBUILD)/NWGNUtail.inc Modified: apr/apr/trunk/dbd/NWGNUdbdsqli3 URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/NWGNUdbdsqli3?rev=1078559&r1=1078558&r2=1078559&view=diff ============================================================================== --- apr/apr/trunk/dbd/NWGNUdbdsqli3 (original) +++ apr/apr/trunk/dbd/NWGNUdbdsqli3 Sun Mar 6 20:13:35 2011 @@ -14,8 +14,6 @@ ifndef EnvironmentDefined include $(APR_WORK)/build/NWGNUhead.inc endif -#include $(APR)/build/NWGNUcustom.inc - # # build this level's files @@ -142,18 +140,17 @@ NLM_VERSION = # # If this is specified, it will override the default of 64K # -NLM_STACK_SIZE = 8192 - +NLM_STACK_SIZE = # # 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 @@ -163,7 +160,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 @@ -290,7 +287,5 @@ install :: nlms FORCE # in this makefile # -include $(APR_WORK)/build/NWGNUtail.inc - - +include $(APRBUILD)/NWGNUtail.inc Modified: apr/apr/trunk/dbd/NWGNUmakefile URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/NWGNUmakefile?rev=1078559&r1=1078558&r2=1078559&view=diff ============================================================================== --- apr/apr/trunk/dbd/NWGNUmakefile (original) +++ apr/apr/trunk/dbd/NWGNUmakefile Sun Mar 6 20:13:35 2011 @@ -244,7 +244,7 @@ nlms :: libs $(TARGET_nlm) # correct place. (See $(APR_WORK)/build/NWGNUhead.inc for examples) # install :: nlms $(INSTDIRS) FORCE - $(CP) $(OBJDIR)\*.nlm $(INSTALLBASE) + $(call COPY,$(OBJDIR)/*.nlm,$(INSTALLBASE)/) # # Any specialized rules here @@ -255,6 +255,6 @@ install :: nlms $(INSTDIRS) FORCE # in this makefile # -include $(APR_WORK)/build/NWGNUtail.inc +include $(APRBUILD)/NWGNUtail.inc Modified: apr/apr/trunk/dbm/NWGNUdbmdb URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbm/NWGNUdbmdb?rev=1078559&r1=1078558&r2=1078559&view=diff ============================================================================== --- apr/apr/trunk/dbm/NWGNUdbmdb (original) +++ apr/apr/trunk/dbm/NWGNUdbmdb Sun Mar 6 20:13:35 2011 @@ -14,8 +14,6 @@ ifndef EnvironmentDefined include $(APR_WORK)/build/NWGNUhead.inc endif -#include $(APR)\build\NWGNUcustom.inc - # # build this level's files @@ -145,18 +143,17 @@ NLM_VERSION = # # If this is specified, it will override the default of 64K # -NLM_STACK_SIZE = 8192 - +NLM_STACK_SIZE = # # 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 +163,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 @@ -291,7 +288,5 @@ install :: nlms FORCE # in this makefile # -include $(APR_WORK)/build/NWGNUtail.inc - - +include $(APRBUILD)/NWGNUtail.inc Modified: apr/apr/trunk/dbm/NWGNUdbmgdbm URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbm/NWGNUdbmgdbm?rev=1078559&r1=1078558&r2=1078559&view=diff ============================================================================== --- apr/apr/trunk/dbm/NWGNUdbmgdbm (original) +++ apr/apr/trunk/dbm/NWGNUdbmgdbm Sun Mar 6 20:13:35 2011 @@ -14,8 +14,6 @@ ifndef EnvironmentDefined include $(APR_WORK)/build/NWGNUhead.inc endif -#include $(APR)\build\NWGNUcustom.inc - # # build this level's files @@ -144,18 +142,17 @@ NLM_VERSION = # # If this is specified, it will override the default of 64K # -NLM_STACK_SIZE = 8192 - +NLM_STACK_SIZE = # # 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 +162,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 @@ -290,7 +287,5 @@ install :: nlms FORCE # in this makefile # -include $(APR_WORK)/build/NWGNUtail.inc - - +include $(APRBUILD)/NWGNUtail.inc Modified: apr/apr/trunk/dbm/NWGNUmakefile URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbm/NWGNUmakefile?rev=1078559&r1=1078558&r2=1078559&view=diff ============================================================================== --- apr/apr/trunk/dbm/NWGNUmakefile (original) +++ apr/apr/trunk/dbm/NWGNUmakefile Sun Mar 6 20:13:35 2011 @@ -235,7 +235,7 @@ nlms :: libs $(TARGET_nlm) # correct place. (See $(APR_WORK)/build/NWGNUhead.inc for examples) # install :: nlms $(INSTDIRS) FORCE - copy $(OBJDIR)\*.nlm $(INSTALLBASE) + $(call COPY,$(OBJDIR)/*.nlm,$(INSTALLBASE)/) # # Any specialized rules here @@ -246,6 +246,6 @@ install :: nlms $(INSTDIRS) FORCE # in this makefile # -include $(APR_WORK)/build/NWGNUtail.inc +include $(APRBUILD)/NWGNUtail.inc Modified: apr/apr/trunk/ldap/NWGNUmakefile URL: http://svn.apache.org/viewvc/apr/apr/trunk/ldap/NWGNUmakefile?rev=1078559&r1=1078558&r2=1078559&view=diff ============================================================================== --- apr/apr/trunk/ldap/NWGNUmakefile (original) +++ apr/apr/trunk/ldap/NWGNUmakefile Sun Mar 6 20:13:35 2011 @@ -250,5 +250,5 @@ install :: nlms FORCE # in this makefile # -include $(APR_WORK)/build/NWGNUtail.inc +include $(APRBUILD)/NWGNUtail.inc Modified: apr/apr/trunk/test/NWGNUaprtest URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUaprtest?rev=1078559&r1=1078558&r2=1078559&view=diff ============================================================================== --- apr/apr/trunk/test/NWGNUaprtest (original) +++ apr/apr/trunk/test/NWGNUaprtest Sun Mar 6 20:13:35 2011 @@ -123,12 +123,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 @@ -138,7 +138,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 @@ -333,6 +333,5 @@ install :: nlms FORCE # in this makefile # -include $(APR_WORK)/build/NWGNUtail.inc - +include $(APRBUILD)/NWGNUtail.inc Modified: apr/apr/trunk/test/NWGNUechod URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUechod?rev=1078559&r1=1078558&r2=1078559&view=diff ============================================================================== --- apr/apr/trunk/test/NWGNUechod (original) +++ apr/apr/trunk/test/NWGNUechod Sun Mar 6 20:13:35 2011 @@ -123,12 +123,12 @@ NLM_STACK_SIZE = # # 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 @@ -249,5 +249,5 @@ install :: nlms FORCE # in this makefile # -include $(APR_WORK)/build/NWGNUtail.inc +include $(APRBUILD)/NWGNUtail.inc Modified: apr/apr/trunk/test/NWGNUglobalmutexchild URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUglobalmutexchild?rev=1078559&r1=1078558&r2=1078559&view=diff ============================================================================== --- apr/apr/trunk/test/NWGNUglobalmutexchild (original) +++ apr/apr/trunk/test/NWGNUglobalmutexchild Sun Mar 6 20:13:35 2011 @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(APR_WORK)\build\NWGNUhead.inc +include $(APR_WORK)/build/NWGNUhead.inc endif # @@ -113,7 +113,7 @@ NLM_SCREEN_NAME = DEFAULT # # If this is specified, it will override VERSION value in -# $(APR_WORK)\build\NWGNUenvironment.inc +# $(APR_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -125,12 +125,12 @@ NLM_STACK_SIZE = # # 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 @@ -237,7 +237,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 @@ -250,5 +250,5 @@ install :: nlms FORCE # in this makefile # -include $(APR_WORK)\build\NWGNUtail.inc +include $(APRBUILD)/NWGNUtail.inc Modified: apr/apr/trunk/test/NWGNUmakefile URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUmakefile?rev=1078559&r1=1078558&r2=1078559&view=diff ============================================================================== --- apr/apr/trunk/test/NWGNUmakefile (original) +++ apr/apr/trunk/test/NWGNUmakefile Sun Mar 6 20:13:35 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 @@ -118,7 +118,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 = @@ -245,10 +245,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 - $(CP) $(OBJDIR)\*.nlm $(INSTALLBASE) + $(call COPY,$(OBJDIR)/*.nlm,$(INSTALLBASE)/) # # Any specialized rules here @@ -259,5 +259,5 @@ install :: nlms FORCE # in this makefile # -include $(APR_WORK)\build\NWGNUtail.inc +include $(APRBUILD)/NWGNUtail.inc Modified: apr/apr/trunk/test/NWGNUmod_test URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUmod_test?rev=1078559&r1=1078558&r2=1078559&view=diff ============================================================================== --- apr/apr/trunk/test/NWGNUmod_test (original) +++ apr/apr/trunk/test/NWGNUmod_test Sun Mar 6 20:13:35 2011 @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(APR_WORK)\build\NWGNUhead.inc +include $(APR_WORK)/build/NWGNUhead.inc endif # @@ -111,7 +111,7 @@ NLM_SCREEN_NAME = DEFAULT # # If this is specified, it will override VERSION value in -# $(APR_WORK)\build\NWGNUenvironment.inc +# $(APR_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -123,12 +123,12 @@ NLM_STACK_SIZE = # # 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 @@ -138,7 +138,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 @@ -237,7 +237,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 @@ -250,5 +250,5 @@ install :: nlms FORCE # in this makefile # -include $(APR_WORK)\build\NWGNUtail.inc +include $(APRBUILD)/NWGNUtail.inc Modified: apr/apr/trunk/test/NWGNUproc_child URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUproc_child?rev=1078559&r1=1078558&r2=1078559&view=diff ============================================================================== --- apr/apr/trunk/test/NWGNUproc_child (original) +++ apr/apr/trunk/test/NWGNUproc_child Sun Mar 6 20:13:35 2011 @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(APR_WORK)\build\NWGNUhead.inc +include $(APR_WORK)/build/NWGNUhead.inc endif # @@ -111,7 +111,7 @@ NLM_SCREEN_NAME = DEFAULT # # If this is specified, it will override VERSION value in -# $(APR_WORK)\build\NWGNUenvironment.inc +# $(APR_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -123,12 +123,12 @@ NLM_STACK_SIZE = # # 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 @@ -235,7 +235,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 @@ -248,5 +248,5 @@ install :: nlms FORCE # in this makefile # -include $(APR_WORK)\build\NWGNUtail.inc +include $(APRBUILD)/NWGNUtail.inc Modified: apr/apr/trunk/test/NWGNUreadchild URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUreadchild?rev=1078559&r1=1078558&r2=1078559&view=diff ============================================================================== --- apr/apr/trunk/test/NWGNUreadchild (original) +++ apr/apr/trunk/test/NWGNUreadchild Sun Mar 6 20:13:35 2011 @@ -123,12 +123,12 @@ NLM_STACK_SIZE = # # 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 @@ -248,5 +248,5 @@ install :: nlms FORCE # in this makefile # -include $(APR_WORK)/build/NWGNUtail.inc +include $(APRBUILD)/NWGNUtail.inc Modified: apr/apr/trunk/test/NWGNUsockchild URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUsockchild?rev=1078559&r1=1078558&r2=1078559&view=diff ============================================================================== --- apr/apr/trunk/test/NWGNUsockchild (original) +++ apr/apr/trunk/test/NWGNUsockchild Sun Mar 6 20:13:35 2011 @@ -123,12 +123,12 @@ NLM_STACK_SIZE = # # 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 @@ -248,5 +248,5 @@ install :: nlms FORCE # in this makefile # -include $(APR_WORK)/build/NWGNUtail.inc +include $(APRBUILD)/NWGNUtail.inc Modified: apr/apr/trunk/test/NWGNUsockperf URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUsockperf?rev=1078559&r1=1078558&r2=1078559&view=diff ============================================================================== --- apr/apr/trunk/test/NWGNUsockperf (original) +++ apr/apr/trunk/test/NWGNUsockperf Sun Mar 6 20:13:35 2011 @@ -123,12 +123,12 @@ NLM_STACK_SIZE = # # 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 @@ -249,5 +249,5 @@ install :: nlms FORCE # in this makefile # -include $(APR_WORK)/build/NWGNUtail.inc +include $(APRBUILD)/NWGNUtail.inc Modified: apr/apr/trunk/test/NWGNUtestatmc URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUtestatmc?rev=1078559&r1=1078558&r2=1078559&view=diff ============================================================================== --- apr/apr/trunk/test/NWGNUtestatmc (original) +++ apr/apr/trunk/test/NWGNUtestatmc Sun Mar 6 20:13:35 2011 @@ -122,12 +122,12 @@ NLM_STACK_SIZE = # # 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 @@ -137,7 +137,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 @@ -251,5 +251,5 @@ install :: nlms FORCE # in this makefile # -include $(APR_WORK)/build/NWGNUtail.inc +include $(APRBUILD)/NWGNUtail.inc Modified: apr/apr/trunk/test/NWGNUtryread URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUtryread?rev=1078559&r1=1078558&r2=1078559&view=diff ============================================================================== --- apr/apr/trunk/test/NWGNUtryread (original) +++ apr/apr/trunk/test/NWGNUtryread Sun Mar 6 20:13:35 2011 @@ -123,12 +123,12 @@ NLM_STACK_SIZE = # # 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 @@ -248,5 +248,6 @@ install :: nlms FORCE # in this makefile # -include $(APR_WORK)/build/NWGNUtail.inc +include $(APRBUILD)/NWGNUtail.inc + Modified: apr/apr/trunk/xml/NWGNUmakefile URL: http://svn.apache.org/viewvc/apr/apr/trunk/xml/NWGNUmakefile?rev=1078559&r1=1078558&r2=1078559&view=diff ============================================================================== --- apr/apr/trunk/xml/NWGNUmakefile (original) +++ apr/apr/trunk/xml/NWGNUmakefile Sun Mar 6 20:13:35 2011 @@ -33,15 +33,15 @@ endif $(EXPATSRC)/lib/%.h: $(EXPATSRC)/lib/%.hnw @echo Creating $@ - $(call CP,$<,$@) + $(call COPY,$<,$@) $(EXPATSRC)/lib/%.h: $(EXPATSRC)/lib/%.h.in @echo Creating $@ - $(call CP,$<,$@) + $(call COPY,$<,$@) $(EXPATSRC)/lib/%.h: $(CURDIR)/%.hnw @echo Creating $@ - $(call CP,$<,$@) + $(call COPY,$<,$@) vpath %.c $(EXPATSRC)/lib @@ -286,5 +286,5 @@ clean :: # in this makefile # -include $(APR_WORK)/build/NWGNUtail.inc +include $(APRBUILD)/NWGNUtail.inc