From 91ca47f9ecac33e9fe3fa18ff25fb2b9f69eb0c8 Mon Sep 17 00:00:00 2001 From: Guenter Knauf Date: Thu, 31 Mar 2011 23:53:41 +0000 Subject: [PATCH] NetWare build overhaul in order to compile on Linux. Backport of (hopefully) all recent HEAD changes to the NetWare build system related to building on Linux. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1087510 13f79535-47bb-0310-9956-ffa450edef68 --- NWGNUmakefile | 20 +- build/NWGNUenvironment.inc | 232 ++++++++++++--------- build/NWGNUhead.inc | 71 ++++--- build/NWGNUmakefile | 129 ++++++------ build/NWGNUscripts.inc | 81 ++++---- build/NWGNUtail.inc | 277 +++++++++++++------------- build/make_nw_export.awk | 80 +++++--- modules/NWGNUmakefile | 8 +- modules/aaa/NWGNUauthbasc | 20 +- modules/aaa/NWGNUauthdigt | 20 +- modules/aaa/NWGNUauthnalias | 20 +- modules/aaa/NWGNUauthnano | 20 +- modules/aaa/NWGNUauthndbd | 20 +- modules/aaa/NWGNUauthndbm | 20 +- modules/aaa/NWGNUauthndef | 20 +- modules/aaa/NWGNUauthnfil | 20 +- modules/aaa/NWGNUauthnzldap | 22 +- modules/aaa/NWGNUauthzdbm | 20 +- modules/aaa/NWGNUauthzdef | 20 +- modules/aaa/NWGNUauthzgrp | 20 +- modules/aaa/NWGNUauthzusr | 20 +- modules/aaa/NWGNUmakefile | 10 +- modules/cache/NWGNUdsk_cach | 18 +- modules/cache/NWGNUmakefile | 10 +- modules/cache/NWGNUmem_cach | 18 +- modules/cache/NWGNUmod_cach | 18 +- modules/database/NWGNUmakefile | 22 +- modules/dav/fs/NWGNUmakefile | 18 +- modules/dav/lock/NWGNUmakefile | 18 +- modules/dav/main/NWGNUmakefile | 18 +- modules/debug/NWGNUmakefile | 10 +- modules/debug/NWGNUmodbucketeer | 20 +- modules/debug/NWGNUmoddumpio | 20 +- modules/echo/NWGNUmakefile | 22 +- modules/experimental/NWGNUcase_flt | 20 +- modules/experimental/NWGNUcase_flt_in | 20 +- modules/experimental/NWGNUexample | 20 +- modules/experimental/NWGNUmakefile | 10 +- modules/filters/NWGNUcharsetl | 20 +- modules/filters/NWGNUdeflate | 22 +- modules/filters/NWGNUextfiltr | 20 +- modules/filters/NWGNUmakefile | 10 +- modules/filters/NWGNUmod_filter | 20 +- modules/filters/NWGNUreqtimeout | 20 +- modules/filters/NWGNUsubstitute | 20 +- modules/generators/NWGNUautoindex | 20 +- modules/generators/NWGNUinfo | 20 +- modules/generators/NWGNUmakefile | 10 +- modules/generators/NWGNUmod_asis | 20 +- modules/generators/NWGNUmod_cgi | 20 +- modules/generators/NWGNUstatus | 20 +- modules/ldap/NWGNUmakefile | 26 +-- modules/loggers/NWGNUforensic | 22 +- modules/loggers/NWGNUmakefile | 10 +- modules/loggers/NWGNUmodlogio | 22 +- modules/mappers/NWGNUactions | 20 +- modules/mappers/NWGNUimagemap | 20 +- modules/mappers/NWGNUmakefile | 10 +- modules/mappers/NWGNUrewrite | 20 +- modules/mappers/NWGNUspeling | 20 +- modules/mappers/NWGNUuserdir | 20 +- modules/mappers/NWGNUvhost | 20 +- modules/metadata/NWGNUcernmeta | 20 +- modules/metadata/NWGNUexpires | 20 +- modules/metadata/NWGNUheaders | 20 +- modules/metadata/NWGNUmakefile | 10 +- modules/metadata/NWGNUmimemagi | 20 +- modules/metadata/NWGNUmodident | 20 +- modules/metadata/NWGNUmodversion | 20 +- modules/metadata/NWGNUuniqueid | 20 +- modules/metadata/NWGNUusertrk | 20 +- modules/proxy/NWGNUmakefile | 10 +- modules/proxy/NWGNUproxy | 20 +- modules/proxy/NWGNUproxyajp | 20 +- modules/proxy/NWGNUproxybalancer | 20 +- modules/proxy/NWGNUproxycon | 20 +- modules/proxy/NWGNUproxyftp | 20 +- modules/proxy/NWGNUproxyhtp | 20 +- modules/proxy/NWGNUproxyscgi | 20 +- modules/ssl/NWGNUmakefile | 18 +- server/NWGNUmakefile | 12 +- srclib/pcre/NWGNUmakefile | 6 +- support/NWGNUab | 18 +- support/NWGNUhtcacheclean | 18 +- support/NWGNUhtdbm | 18 +- support/NWGNUhtdigest | 18 +- support/NWGNUhtpasswd | 18 +- support/NWGNUhttxt2dbm | 18 +- support/NWGNUlogres | 18 +- support/NWGNUmakefile | 8 +- support/NWGNUrotlogs | 16 +- 91 files changed, 1240 insertions(+), 1170 deletions(-) diff --git a/NWGNUmakefile b/NWGNUmakefile index 61a3526046b..ecba7eaa4ce 100644 --- a/NWGNUmakefile +++ b/NWGNUmakefile @@ -45,7 +45,7 @@ SUBDIRS = \ # paths to tools # -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc # # build this level's files @@ -165,7 +165,7 @@ NLM_SCREEN_NAME = Apache $(VERSION_STR) for NetWare # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -178,12 +178,12 @@ NLM_STACK_SIZE = 65536 # # 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 @@ -281,7 +281,7 @@ endif # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -313,7 +313,7 @@ FILE_nlm_copyright = # FILES_nlm_Ximports = \ @netware.imp \ - @$(APR)/aprlib.imp \ + @aprlib.imp \ @libc.imp \ GetCurrentAddressSpace \ $(EOLIST) @@ -328,7 +328,7 @@ endif # Any symbols exported to here # FILES_nlm_exports = \ - @$(NWOS)/httpd.imp \ + @httpd.imp \ $(EOLIST) # @@ -348,7 +348,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms instscripts FORCE -copy $(OBJDIR)\$(NLM_NAME).nlm $(INSTALL)\$(BASEDIR)\*.* @@ -414,8 +414,8 @@ vpath %.c os/netware:server/mpm/netware:srclib/pcre # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc -include $(AP_WORK)\build\NWGNUscripts.inc +include $(AP_WORK)/build/NWGNUscripts.inc diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc index e318b0e295b..713264d92bf 100644 --- a/build/NWGNUenvironment.inc +++ b/build/NWGNUenvironment.inc @@ -2,9 +2,9 @@ # Setup needed Tools and Libraries # -ifeq "$(wildcard $(AP_WORK)\NWGNUcustom.ini)" "$(AP_WORK)\NWGNUcustom.ini" -include $(AP_WORK)\NWGNUcustom.ini -CUSTOM_INI = $(AP_WORK)\NWGNUcustom.ini +ifeq "$(wildcard $(AP_WORK)/NWGNUcustom.ini)" "$(AP_WORK)/NWGNUcustom.ini" +include $(AP_WORK)/NWGNUcustom.ini +CUSTOM_INI = $(AP_WORK)/NWGNUcustom.ini endif ifndef VERBOSE @@ -49,13 +49,20 @@ ifneq "$(wildcard $(LDAPSDK)/inc/ldap.h)" "$(LDAPSDK)/inc/ldap.h" $(error LDAPSDK does not point to a valid Novell CLDAP SDK) endif +#ifndef PCRESRC +PCRESRC = $(AP_WORK)/srclib/pcre +#endif +ifneq "$(wildcard $(PCRESRC)/pcre-config.in)" "$(PCRESRC)/pcre-config.in" +$(error PCRESRC does not point to a valid PCRE source tree) +endif + # This is a placeholder # ifndef ZLIBSDK # ZLIBSDK = C:/novell/ndk/zlibsdk # 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 @@ -109,6 +116,9 @@ endif OBJDIR = obj_$(RELEASE) +# Define minimum APR version to check for +APR_WANTED = 1003000 + # # Setup compiler information # @@ -123,21 +133,61 @@ WIN_CC = mwcc # Setup build tools AWK = awk +# Setup distribution tools +ZIP = zip -qr9 +7ZA = 7za >NUL a + +# +# Declare Command and tool macros here +# + +ifeq ($(findstring /sh,$(SHELL)),/sh) +DEL = rm -f $1 +RMDIR = rm -fr $1 +MKDIR = mkdir -p $1 +COPY = -cp -afv $1 $2 +#COPYR = -cp -afr $1/* $2 +COPYR = -rsync -aC $1/* $2 +ECHONL = echo "" +DL = ' +CAT = cat +else +ifeq "$(OS)" "Windows_NT" +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)) +else +DEL = $(shell if exist $(subst /,\,$1) del 2>NUL $(subst /,\,$1)) +RMDIR = $(shell if exist $(subst /,\,$1)\NUL deltree /y 2>NUL $(subst /,\,$1)) +endif +ECHONL = $(ComSpec) /c echo. +MKDIR = $(shell if not exist $(subst /,\,$1)\NUL md 2>NUL $(subst /,\,$1)) +COPY = -copy /y 2>NUL $(subst /,\,$1) $(subst /,\,$2) +COPYR = -xcopy /q /y /e 2>NUL $(subst /,\,$1) $(subst /,\,$2) +CAT = type +endif + ifdef IPV6 ifndef USE_STDSOCKETS USE_STDSOCKETS=1 endif endif -NOVI = $(NOVELLLIBC)\imports +NOVI = $(NOVELLLIBC)/imports +PRELUDE = $(NOVI)/libcpre.o -INCDIRS = $(NOVELLLIBC)\include;$(NOVELLLIBC)\include\nks;$(NOVELLLIBC)\include\winsock; +INCDIRS = $(NOVELLLIBC)/include; +ifndef USE_STDSOCKETS +INCDIRS += $(NOVELLLIBC)/include/winsock; +endif ifneq "$(LDAPSDK)" "" -INCDIRS := $(INCDIRS);$(LDAPSDK)/inc +INCDIRS += $(LDAPSDK)/inc; endif ifneq "$(ZLIBSDK)" "" -INCDIRS := $(INCDIRS);$(ZLIBSDK) +INCDIRS += $(ZLIBSDK); endif +#ifneq "$(PCRESRC)" "" +#INCDIRS += $(PCRESRC); +#endif DEFINES = -DNETWARE ifndef USE_STDSOCKETS @@ -154,16 +204,23 @@ VERSION_SKT = (WINSOCK) endif # MetroWerks static Libraries -CLIB3S = $(METROWERKS)\Novell Support\Metrowerks Support\Libraries\Runtime\mwcrtl.lib +CLIB3S = $(METROWERKS)/Novell Support/Metrowerks Support/Libraries/Runtime/mwcrtl.lib MATH3S = -PLIB3S = $(METROWERKS)\Novell Support\Metrowerks Support\Libraries\MSL C++\MWCPP.lib +PLIB3S = $(METROWERKS)/Novell Support/Metrowerks Support/Libraries/MSL C++/MWCPP.lib -# MetroWerks Win32 build flags to create build tool -MWCW_MSL = "$(METROWERKS)/MSL" -MWCW_W32 = "$(METROWERKS)/Win32-x86 Support" -WIN_CFLAGS = -O2 -gccinc -nodefaults -proc 586 -w off -WIN_CFLAGS += -ir $(MWCW_MSL) -ir $(MWCW_W32) -lr $(MWCW_MSL) -lr $(MWCW_W32) -WIN_CFLAGS += -lMSL_All_x86.lib -lkernel32.lib -luser32.lib +ifeq "$(OS)" "Windows_NT" +# MetroWerks Win32 build flags to create build tools +MWCW_MSL = "$(METROWERKS)/MSL" +MWCW_W32 = "$(METROWERKS)/Win32-x86 Support" +HOST_CC = $(WIN_CC) +HOST_CFLAGS = -O2 -gccinc -nodefaults -proc 586 -w off +HOST_CFLAGS += -ir $(MWCW_MSL) -ir $(MWCW_W32) -lr $(MWCW_MSL) -lr $(MWCW_W32) +HOST_CFLAGS += -lMSL_All_x86.lib -lkernel32.lib -luser32.lib +else +# GNUC build flags to create build tools +HOST_CC = gcc +HOST_CFLAGS = -Wall -O2 +endif # Base compile flags # and prefix or precompiled header added here. @@ -179,7 +236,7 @@ WIN_CFLAGS += -lMSL_All_x86.lib -lkernel32.lib -luser32.lib # -proc PII generate code base on Pentium II instruction set # -inst mmx use MMX extensions (Not used) -CFLAGS = -c -nosyspath -Cpp_exceptions off -RTTI off -align 4 -w nocmdline -proc PII +CFLAGS = -c -nosyspath -Cpp_exceptions off -RTTI off -align 4 -w nocmdline -proc PII ifeq "$(REQUIRE_PROTOTYPES)" "1" CFLAGS += -r @@ -187,7 +244,6 @@ endif # -g generate debugging information # -O0 level 0 optimizations - ifeq "$(RELEASE)" "debug" CFLAGS += -g -O0 endif @@ -198,52 +254,58 @@ CFLAGS += -O4,p endif # -prefix pre_nw.h #include pre_nw.h for all files - CFLAGS += -prefix pre_nw.h +ifneq ($(findstring /sh,$(SHELL)),/sh) PATH:=$(PATH);$(METROWERKS)\bin;$(METROWERKS)\Other Metrowerks Tools\Command Line Tools +endif # # Declare major project deliverables output directories here # +ifndef PORT +PORT = 80 +endif + +ifndef SSLPORT +SSLPORT = 443 +endif + ifdef DEST -INSTALL = $(DEST) -ifeq (\, $(findstring \,$(INSTALL))) -INSTDIRS = $(DEST) +INSTALL = $(subst \,/,$(DEST)) +ifeq (/, $(findstring /,$(INSTALL))) +INSTDIRS = $(INSTALL) endif endif ifdef dest -INSTALL = $(dest) -ifeq (\, $(findstring \,$(INSTALL))) -INSTDIRS = $(dest) +INSTALL = $(subst \,/,$(dest)) +ifeq (/, $(findstring /,$(INSTALL))) +INSTDIRS = $(INSTALL) endif endif ifndef INSTALL -INSTALL = $(AP_WORK)\Dist -INSTDIRS = $(AP_WORK)\Dist +INSTALL = $(AP_WORK)/Dist +INSTDIRS = $(INSTALL) endif +ifeq ($(MAKECMDGOALS),installdev) ifndef BASEDIR -BASEDIR = Apache22 -export BASEDIR +export BASEDIR = apache_$(VERSION_STR)-sdk endif - -ifndef PORT -PORT = 80 +else +ifndef BASEDIR +export BASEDIR = Apache$(VERSION_MAJMIN) endif - -ifndef SSLPORT -SSLPORT = 443 endif # Add support for building IPV6 alongside ifneq "$(IPV6)" "" DEFINES += -DNW_BUILD_IPV6 -# INCDIRS := $(NOVELLLIBC)\include\winsock\IPV6;$(INCDIRS) +# INCDIRS := $(NOVELLLIBC)/include/winsock/IPV6;$(INCDIRS) ifneq "$(findstring IPV6,$(OBJDIR))" "IPV6" OBJDIR := $(OBJDIR)_IPV6 @@ -259,71 +321,51 @@ endif endif -INSTDEVDIRS := \ - $(INSTDIRS) \ - $(INSTALL)\$(BASEDIR)\include \ - $(INSTALL)\$(BASEDIR)\lib \ +INSTALLBASE = $(INSTALL)/$(BASEDIR) -INSTDIRS += \ - $(INSTALL)\$(BASEDIR) \ - $(INSTALL)\$(BASEDIR)\bin \ - $(INSTALL)\$(BASEDIR)\cgi-bin \ - $(INSTALL)\$(BASEDIR)\conf \ - $(INSTALL)\$(BASEDIR)\error \ - $(INSTALL)\$(BASEDIR)\htdocs \ - $(INSTALL)\$(BASEDIR)\icons \ - $(INSTALL)\$(BASEDIR)\logs \ - $(INSTALL)\$(BASEDIR)\man \ - $(INSTALL)\$(BASEDIR)\manual \ - $(INSTALL)\$(BASEDIR)\modules \ +INSTDEVDIRS = \ + $(INSTALL) \ + $(INSTALLBASE) \ + $(INSTALLBASE)/build \ + $(INSTALLBASE)/include \ + $(INSTALLBASE)/lib \ + $(EOLIST) -# -# Declare Command and tool macros here -# - -# Os2LibPath is an extra check to see if we are on NT -ifdef Os2LibPath -OS = Windows_NT -endif - -ifeq "$(OS)" "Windows_NT" -CMD = cmd /C -DEL = del /F -DELTREE = rd /s/q -WINNT = 1 -XCOPYSW = /E -else -CMD = command /C -DEL = del -DELTREE = deltree /y -XCOPYSW = /E /Y -endif - -CHK = $(CMD) if exist -CHKNOT = $(CMD) if not exist - - -# -# Setup base C compiler flags -# +INSTDIRS += \ + $(INSTALLBASE) \ + $(INSTALLBASE)/bin \ + $(INSTALLBASE)/cgi-bin \ + $(INSTALLBASE)/conf \ + $(INSTALLBASE)/conf/extra \ + $(INSTALLBASE)/error \ + $(INSTALLBASE)/htdocs \ + $(INSTALLBASE)/icons \ + $(INSTALLBASE)/logs \ + $(INSTALLBASE)/man \ + $(INSTALLBASE)/manual \ + $(INSTALLBASE)/modules \ + $(EOLIST) # # Common directories # -STDMOD = $(AP_WORK)/modules -NWOS = $(AP_WORK)/os/netware -SERVER = $(AP_WORK)/server -SRC = $(AP_WORK) -APR = $(APR_WORK) -APRUTIL = $(APU_WORK) -APULDAP = $(APU_WORK)/ldap -SUPMOD = $(AP_WORK)/support -PCRE = $(AP_WORK)/srclib/pcre -APRTEST = $(APR_WORK)/test -HTTPD = $(AP_WORK)/modules/http -XML = $(APU_WORK)/xml -PREBUILD_INST = $(AP_WORK)\nwprebuild +SRC = $(subst \,/,$(AP_WORK)) +APR = $(subst \,/,$(APR_WORK)) +APRUTIL = $(subst \,/,$(APU_WORK)) +APBUILD = $(SRC)/build +STDMOD = $(SRC)/modules +HTTPD = $(SRC)/modules/http +DAV = $(SRC)/modules/dav +NWOS = $(SRC)/os/netware +SERVER = $(SRC)/server +SUPMOD = $(SRC)/support +APULDAP = $(APRUTIL)/ldap +XML = $(APRUTIL)/xml +APRTEST = $(APR)/test +PCRE = $(PCRESRC) + +PREBUILD_INST = $(SRC)/nwprebuild # # Internal Libraries @@ -333,7 +375,7 @@ APRLIB = $(APR)/$(OBJDIR)/aprlib.lib APRUTLIB = $(APRUTIL)/$(OBJDIR)/aprutil.lib APULDAPLIB = $(APULDAP)/$(OBJDIR)/apuldap.lib STMODLIB = $(STDMOD)/$(OBJDIR)/stdmod.lib -PCRELIB = $(PCRE)/$(OBJDIR)/pcre.lib +PCRELIB = $(SRC)/$(OBJDIR)/pcre.lib NWOSLIB = $(NWOS)/$(OBJDIR)/netware.lib SERVLIB = $(SERVER)/$(OBJDIR)/server.lib HTTPDLIB = $(HTTPD)/$(OBJDIR)/httpd.lib diff --git a/build/NWGNUhead.inc b/build/NWGNUhead.inc index cdbaf2728fd..78a96db7c6a 100644 --- a/build/NWGNUhead.inc +++ b/build/NWGNUhead.inc @@ -2,7 +2,7 @@ # Obtain the global build environment # -include $(AP_WORK)\build\NWGNUenvironment.inc +include $(AP_WORK)/build/NWGNUenvironment.inc # # Define base targets and rules @@ -26,7 +26,7 @@ install :: NO_LICENSE_FILE installdev :: NO_LICENSE_FILE NO_LICENSE_FILE : - $(MAKE) $(MAKECMDGOALS) -f NWGNUmakefile RELEASE=$(RELEASE) DEST="$(INSTALL)" LM_LICENSE_FILE="$(METROWERKS)\license.dat" + $(MAKE) $(MAKECMDGOALS) -f NWGNUmakefile RELEASE=$(RELEASE) DEST="$(INSTALL)" LM_LICENSE_FILE="$(METROWERKS)/license.dat" else # LM_LICENSE_FILE must be defined so use the real targets @@ -41,41 +41,40 @@ install :: nlms $(INSTDIRS) installdev :: $(INSTDEVDIRS) $(INSTDIRS) :: - $(CHKNOT) $@\NUL mkdir $@ + $(call MKDIR,$@) $(INSTDEVDIRS) :: - $(CHKNOT) $@\NUL mkdir $@ + $(call MKDIR,$@) endif #NO_LICENSE_FILE check help : - @echo targets for RELEASE=$(RELEASE): - @echo (default) . . . . libs nlms - @echo all . . . . . . . does everything (libs nlms install) - @echo libs. . . . . . . builds all libs - @echo nlms. . . . . . . builds all nlms - @echo install . . . . . builds libs and nlms and copies install files to - @echo "$(INSTALL)" - @echo installdev. . . . copies headers and files needed for development to - @echo "$(INSTALL)" - @echo clean . . . . . . deletes $(OBJDIR) dirs, *.err, and *.map - @echo clobber_all . . . deletes all possible output from the make - @echo clobber_install . deletes all files in $(INSTALL) - @$(CMD) echo. - @echo Multiple targets can be used on a single nmake command line - - @echo (i.e. $(MAKE) clean all) - @$(CMD) echo. - @echo You can also specify RELEASE=debug, RELEASE=noopt, or RELEASE=optimized - @echo The default is RELEASE=optimized + @echo $(DL)targets for RELEASE=$(RELEASE):$(DL) + @echo $(DL)(default) . . . . libs nlms$(DL) + @echo $(DL)all . . . . . . . does everything (libs nlms install)$(DL) + @echo $(DL)libs. . . . . . . builds all libs$(DL) + @echo $(DL)nlms. . . . . . . builds all nlms$(DL) + @echo $(DL)install . . . . . builds libs and nlms and copies install files to$(DL) + @echo $(DL) "$(INSTALL)"$(DL) + @echo $(DL)installdev. . . . copies headers and files needed for development to$(DL) + @echo $(DL) "$(INSTALL)"$(DL) + @echo $(DL)clean . . . . . . deletes $(OBJDIR) dirs, *.err, and *.map$(DL) + @echo $(DL)clobber_all . . . deletes all possible output from the make$(DL) + @echo $(DL)clobber_install . deletes all files in $(INSTALL)$(DL) + @$(ECHONL) + @echo $(DL)Multiple targets can be used on a single nmake command line -$(DL) + @echo $(DL)(i.e. $(MAKE) clean all)$(DL) + @$(ECHONL) + @echo $(DL)You can also specify RELEASE=debug, RELEASE=noopt, or RELEASE=optimized$(DL) + @echo $(DL)The default is RELEASE=optimized$(DL) clobber_all :: clean clobber_install clobber_prebuild clobber_install :: - -$(DELTREE) $(INSTALL) 2>NUL + $(call RMDIR,$(INSTALL)) clobber_prebuild :: - $(CHK) $(PREBUILD_INST)\*.* $(DEL) $(PREBUILD_INST)\*.* - -$(DELTREE) $(PREBUILD_INST) 2> NUL + $(call RMDIR,$(PREBUILD_INST)) # # build recursive targets @@ -83,11 +82,11 @@ clobber_prebuild :: $(SUBDIRS) : FORCE ifneq "$(MAKECMDGOALS)" "clean" - $(CMD) echo. - @echo Building $(CURDIR)/$@ + @$(ECHONL) + @echo $(DL)Building $(CURDIR)/$@$(DL) endif $(MAKE) -C $@ $(MAKECMDGOALS) -f NWGNUmakefile RELEASE=$(RELEASE) DEST="$(INSTALL)" LM_LICENSE_FILE="$(LM_LICENSE_FILE)" - $(CMD) echo. + @$(ECHONL) FORCE: @@ -96,15 +95,13 @@ FORCE: # clean :: $(SUBDIRS) - @echo Cleaning up $(CURDIR) - -$(DELTREE) $(OBJDIR) 2> NUL - $(CHK) *.err $(DEL) *.err - $(CHK) *.map $(DEL) *.map - $(CHK) *.d $(DEL) *.d - $(CHK) *.tmp $(DEL) *.tmp - $(CHK) xc.bat $(DEL) xc.bat - -$(DELTREE) $(OBJDIR) 2> NUL + @echo $(DL)Cleaning up $(CURDIR)$(DL) + $(call RMDIR,$(OBJDIR)) + $(call DEL,*.err) + $(call DEL,*.map) + $(call DEL,*.tmp) +# $(call DEL,*.d) $(OBJDIR) :: - $(CHKNOT) $(OBJDIR)\nul mkdir $(OBJDIR) + $(call MKDIR,$@) diff --git a/build/NWGNUmakefile b/build/NWGNUmakefile index fac1a828ab7..a2618bf8933 100644 --- a/build/NWGNUmakefile +++ b/build/NWGNUmakefile @@ -3,6 +3,7 @@ # SUBDIRS = \ + $(APR_WORK)/build \ $(EOLIST) # @@ -10,76 +11,74 @@ SUBDIRS = \ # paths to tools # -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc # # build this level's files FILES_prebuild_headers = \ - $(APR)/include/apr.h \ - $(APRUTIL)/include/apu.h \ - $(APRUTIL)/include/apr_ldap.h \ $(NWOS)/test_char.h \ $(PCRE)/config.h \ $(PCRE)/pcre.h \ $(EOLIST) -nlms :: $(NWOS)/httpd.imp $(NWOS)/chartables.c +nlms :: libs $(NWOS)/httpd.imp $(DAV)/main/dav.imp + +libs :: chkapr $(NWOS)/chartables.c + +$(DAV)/main/dav.imp : make_nw_export.awk $(DAV)/main/mod_dav.h + @echo $(DL)GEN $@$(DL) + $(AWK) -v EXPPREFIX=AP$(VERSION_MAJMIN) -f $^ >$@ $(NWOS)/httpd.imp : make_nw_export.awk nw_export.i - @echo Generating $(subst /,\,$@) - $(AWK) -v EXPPREFIX=AP$(VERSION_MAJMIN) -f $^ | sort >$@ + @echo $(DL)GEN $@$(DL) + $(AWK) -v EXPPREFIX=AP$(VERSION_MAJMIN) -f $^ >$@ nw_export.i : nw_export.inc $(FILES_prebuild_headers) cc.opt - @echo Generating $(subst /,\,$@) + @echo $(DL)GEN $@$(DL) $(CC) $< @cc.opt - -cc.opt : NWGNUmakefile $(AP_WORK)\build\NWGNUenvironment.inc $(AP_WORK)\build\NWGNUtail.inc $(AP_WORK)\build\NWGNUhead.inc - $(CHK) $@ $(DEL) $@ - @echo -P >> $@ - @echo -EP >> $@ - @echo -nosyspath >> $@ - @echo -w nocmdline >> $@ - @echo $(DEFINES) >> $@ - @echo -DCORE_PRIVATE >> $@ - @echo -I..\include >> $@ - @echo -I..\modules\http >> $@ - @echo -I..\modules\aaa >> $@ - @echo -I..\os\netware >> $@ - @echo -I..\server\mpm\netware >> $@ - @echo -I$(APR)\include >> $@ - @echo -I$(APRUTIL)\include >> $@ - @echo -ir $(NOVELLLIBC) >> $@ - -$(APR)/include/%.h: $(subst /,\,$(APR))\include\%.hnw - @echo Creating $(subst /,\,$@) - copy $< $(subst /,\,$(APR))\include\$(@F) - -$(APRUTIL)/include/%.h: $(subst /,\,$(APRUTIL))\include\%.hnw - @echo Creating $(subst /,\,$@) - copy $< $(subst /,\,$(APRUTIL))\include\$(@F) - -$(PCRE)/%.h: $(subst /,\,$(PCRE))\%.hw - @echo Creating $(subst /,\,$@) - copy $< $(subst /,\,$(PCRE))\$(@F) + +cc.opt : NWGNUmakefile $(APBUILD)/NWGNUenvironment.inc $(APBUILD)/NWGNUtail.inc $(APBUILD)/NWGNUhead.inc + @echo $(DL)-P$(DL)> $@ + @echo $(DL)-EP$(DL)>> $@ + @echo $(DL)-nosyspath$(DL)>> $@ + @echo $(DL)-w nocmdline$(DL)>> $@ + @echo $(DL)$(DEFINES)$(DL)>> $@ + @echo $(DL)-DCORE_PRIVATE$(DL) >> $@ + @echo $(DL)-I$(SRC)/include$(DL)>> $@ + @echo $(DL)-I$(HTTPD)$(DL)>> $@ + @echo $(DL)-I$(STDMOD)/aaa$(DL)>> $@ + @echo $(DL)-I$(NWOS)$(DL)>> $@ + @echo $(DL)-I$(SERVER)/mpm/netware$(DL)>> $@ + @echo $(DL)-I$(APR)/include$(DL)>> $@ + @echo $(DL)-I$(APRUTIL)/include$(DL)>> $@ + @echo $(DL)-ir $(NOVELLLIBC)$(DL)>> $@ + +$(PCRE)/%.h: $(PCRE)/%.h.generic + @echo Creating $@ + $(call COPY,$<,$@) + +$(PCRE)/%.h: $(PCRE)/%.hw + @echo Creating $@ + $(call COPY,$<,$@) ifneq "$(BUILDTOOL_AS_NLM)" "1" -$(NWOS)/chartables.c: dftables.exe $(PCRE)/dftables.c $(FILES_prebuild_headers) - @echo Creating $(subst /,\,$@) - @$< $@ +$(NWOS)/chartables.c: dftables.exe $(PCRE)/dftables.c + @echo $(DL)GEN $@$(DL) + $< $@ -%.exe: $(PCRE)/%.c - @echo Creating Build Helper $@ - @$(WIN_CC) $(WIN_CFLAGS) $< -o $@ +%.exe: $(PCRE)/%.c $(PCRE)/config.h $(PCRE)/pcre.h + @echo $(DL)Creating Build Helper $@$(DL) + $(HOST_CC) $(HOST_CFLAGS) -DHAVE_CONFIG_H $< -o $@ -$(NWOS)/test_char.h: gen_test_char.exe $(AP_WORK)/server/gen_test_char.c - @echo Creating $(subst /,\,$@) - @$< > $@ +$(NWOS)/test_char.h: gen_test_char.exe $(SERVER)/gen_test_char.c + @echo $(DL)GEN $@$(DL) + $< > $@ -%.exe: $(AP_WORK)/server/%.c - @echo Creating Build Helper $@ - @$(WIN_CC) $(WIN_CFLAGS) -DCROSS_COMPILE $< -o $@ +%.exe: $(SERVER)/%.c + @echo $(DL)Creating Build Helper $@$(DL) + $(HOST_CC) $(HOST_CFLAGS) -DCROSS_COMPILE $< -o $@ else @@ -93,6 +92,13 @@ endif endif +# +# Check for minimum APR version +# +chkapr: $(APR)/build/nw_ver.awk $(APR)/include/apr_version.h + @echo $(DL)Checking for APR version...$(DL) + $(AWK) -v WANTED=$(APR_WANTED) -f $^ + # # You can use this target if all that is needed is to copy files to the # installation area @@ -100,18 +106,19 @@ endif install :: nlms FORCE clean :: - $(CHK) nw_export.i $(DEL) nw_export.i - $(CHK) cc.opt $(DEL) cc.opt - $(CHK) NWGNUversion.inc $(DEL) NWGNUversion.inc - $(CHK) $(subst /,\,$(PCRE))\config.h $(DEL) $(subst /,\,$(PCRE))\config.h - $(CHK) $(subst /,\,$(PCRE))\pcre.h $(DEL) $(subst /,\,$(PCRE))\pcre.h - $(CHK) $(subst /,\,$(NWOS))\httpd.imp $(DEL) $(subst /,\,$(NWOS))\httpd.imp - $(MAKE) -C $(APR) -f NWGNUmakefile clean + $(call DEL,$(SRC)/include/ap_config_layout.h) + $(call DEL,$(PCRE)/config.h) + $(call DEL,$(PCRE)/pcre.h) + $(call DEL,$(DAV)/main/dav.imp) + $(call DEL,$(NWOS)/httpd.imp) + $(call DEL,nw_export.i) + $(call DEL,cc.opt) + $(call DEL,NWGNUversion.inc) ifneq "$(BUILDTOOL_AS_NLM)" "1" - $(CHK) $(subst /,\,$(NWOS))\chartables.c $(DEL) $(subst /,\,$(NWOS))\chartables.c - $(CHK) $(subst /,\,$(NWOS))\test_char.h $(DEL) $(subst /,\,$(NWOS))\test_char.h - $(CHK) dftables.exe $(DEL) dftables.exe - $(CHK) gen_test_char.exe $(DEL) gen_test_char.exe + $(call DEL,$(NWOS)/chartables.c) + $(call DEL,$(NWOS)/test_char.h) + $(call DEL,dftables.exe) + $(call DEL,gen_test_char.exe) endif # @@ -119,5 +126,5 @@ endif # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/build/NWGNUscripts.inc b/build/NWGNUscripts.inc index 090dd9f29ef..27029ebb744 100644 --- a/build/NWGNUscripts.inc +++ b/build/NWGNUscripts.inc @@ -1,44 +1,43 @@ # Include for creating start/stop/restart NCF scripts. -instscripts:: FORCE $(INSTALL)/$(BASEDIR)/ap2start.ncf $(INSTALL)/$(BASEDIR)/ap2auto.ncf $(INSTALL)/$(BASEDIR)/ap2rest.ncf $(INSTALL)/$(BASEDIR)/ap2stop.ncf - -$(INSTALL)/$(BASEDIR)/ap2start.ncf: - @echo # NCF to start Apache 2.x in own address space > $@ - @echo # Make sure that httpstk isn't listening on 80 >> $@ - @echo # httpcloseport 80 /silent >> $@ - @echo # search add SYS:/$(BASEDIR) >> $@ - @echo load address space = $(BASEDIR) SYS:/$(BASEDIR)/apache2 >> $@ - @echo # If you have problems with 3rd-party modules try to load in OS space. >> $@ - @echo # load SYS:/$(BASEDIR)/apache2 >> $@ - @echo. >> $@ - -$(INSTALL)/$(BASEDIR)/ap2auto.ncf: - @echo # NCF to start Apache 2.x in own address space > $@ - @echo # and let automatically restart in case it crashes >> $@ - @echo # Make sure that httpstk isn't listening on 80 >> $@ - @echo # httpcloseport 80 /silent >> $@ - @echo # search add SYS:/$(BASEDIR) >> $@ - @echo restart address space = $(BASEDIR) SYS:/$(BASEDIR)/apache2 >> $@ - @echo. >> $@ - -$(INSTALL)/$(BASEDIR)/ap2rest.ncf: - @echo # NCF to restart Apache 2.x in own address space > $@ - @echo apache2 restart -p $(BASEDIR) >> $@ - @echo # If you have loaded Apache2.x in OS space use the line below. >> $@ - @echo # apache2 restart >> $@ - @echo. >> $@ - -$(INSTALL)/$(BASEDIR)/ap2stop.ncf: - @echo # NCF to stop Apache 2.x in own address space > $@ - @echo apache2 shutdown -p $(BASEDIR) >> $@ - @echo # If you have loaded Apache2.x in OS space use the line below. >> $@ - @echo # apache2 shutdown >> $@ - @echo. >> $@ - -$(INSTALL)/$(BASEDIR)/ap2prod.ncf: - @echo # NCF to create a product record for Apache 2.x in product database > $@ - @echo PRODSYNC DEL APACHE$(VERSION_MAJMIN) >> $@ - @echo PRODSYNC ADD APACHE$(VERSION_MAJMIN) ProductRecord "$(VERSION_STR)" "Apache $(VERSION_STR) Webserver" >> $@ - @echo. >> $@ - +instscripts:: FORCE $(INSTALLBASE)/ap2start.ncf $(INSTALLBASE)/ap2auto.ncf $(INSTALLBASE)/ap2rest.ncf $(INSTALLBASE)/ap2stop.ncf + +$(INSTALLBASE)/ap2start.ncf: + @echo $(DL)# NCF to start Apache 2.x in own address space$(DL)> $@ + @echo $(DL)# Make sure that httpstk is not listening on 80$(DL)>> $@ + @echo $(DL)# httpcloseport 80 /silent$(DL)>> $@ + @echo $(DL)# search add SYS:/$(BASEDIR)$(DL)>> $@ + @echo $(DL)load address space = $(BASEDIR) SYS:/$(BASEDIR)/apache2$(DL)>> $@ + @echo $(DL)# If you have problems with 3rd-party modules try to load in OS space.$(DL)>> $@ + @echo $(DL)# load SYS:/$(BASEDIR)/apache2$(DL)>> $@ + @$(ECHONL)>> $@ + +$(INSTALLBASE)/ap2auto.ncf: + @echo $(DL)# NCF to start Apache 2.x in own address space$(DL)> $@ + @echo $(DL)# and let automatically restart in case it crashes$(DL)>> $@ + @echo $(DL)# Make sure that httpstk is not listening on 80$(DL)>> $@ + @echo $(DL)# httpcloseport 80 /silent$(DL)>> $@ + @echo $(DL)# search add SYS:/$(BASEDIR)$(DL)>> $@ + @echo $(DL)restart address space = $(BASEDIR) SYS:/$(BASEDIR)/apache2$(DL)>> $@ + @$(ECHONL)>> $@ + +$(INSTALLBASE)/ap2rest.ncf: + @echo $(DL)# NCF to restart Apache 2.x in own address space$(DL)> $@ + @echo $(DL)apache2 restart -p $(BASEDIR)$(DL)>> $@ + @echo $(DL)# If you have loaded Apache2.x in OS space use the line below.$(DL)>> $@ + @echo $(DL)# apache2 restart$(DL)>> $@ + @$(ECHONL)>> $@ + +$(INSTALLBASE)/ap2stop.ncf: + @echo $(DL)# NCF to stop Apache 2.x in own address space$(DL)> $@ + @echo $(DL)apache2 shutdown -p $(BASEDIR)$(DL)>> $@ + @echo $(DL)# If you have loaded Apache2.x in OS space use the line below.$(DL)>> $@ + @echo $(DL)# apache2 shutdown$(DL)>> $@ + @$(ECHONL)>> $@ + +$(INSTALLBASE)/ap2prod.ncf: + @echo $(DL)# NCF to create a product record for Apache 2.x in product database$(DL)> $@ + @echo $(DL)PRODSYNC DEL APACHE$(VERSION_MAJMIN)$(DL)>> $@ + @echo $(DL)PRODSYNC ADD APACHE$(VERSION_MAJMIN) ProductRecord "$(VERSION_STR)" "Apache $(VERSION_STR) Webserver"$(DL)>> $@ + @$(ECHONL)>> $@ diff --git a/build/NWGNUtail.inc b/build/NWGNUtail.inc index cc166013294..17a63b1a80f 100644 --- a/build/NWGNUtail.inc +++ b/build/NWGNUtail.inc @@ -7,7 +7,6 @@ # If we are going to create an nlm, make sure we have assigned variables to # use during the link. # -#echo NLM_NAME=$(NLM_NAME) ifndef NLM_NAME NLM_NAME = $(TARGET_nlm) endif @@ -28,32 +27,42 @@ 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 + +ifeq "$(NLM_VERSION)" "" +NLM_VERSION = $(VERSION) +endif + # # Create dependency lists based on the files available # -CCOPT_DEPENDS = \ - $(AP_WORK)\build\NWGNUhead.inc \ - $(AP_WORK)\build\NWGNUenvironment.inc \ - $(AP_WORK)\build\NWGNUtail.inc \ - NWGNUmakefile \ +STANDARD_DEPENDS = \ + $(APBUILD)/NWGNUhead.inc \ + $(APBUILD)/NWGNUenvironment.inc \ + $(APBUILD)/NWGNUtail.inc \ $(CUSTOM_INI) \ $(EOLIST) -CPPOPT_DEPENDS = \ - $(AP_WORK)\build\NWGNUhead.inc \ - $(AP_WORK)\build\NWGNUenvironment.inc \ - $(AP_WORK)\build\NWGNUtail.inc \ - NWGNUmakefile \ - $(CUSTOM_INI) \ - $(EOLIST) +CCOPT_DEPENDS = $(STANDARD_DEPENDS) $(NLM_NAME)_LINKOPT_DEPENDS = \ $(TARGET_lib) \ - $(AP_WORK)\build\NWGNUenvironment.inc \ - NWGNUmakefile \ - $(AP_WORK)\build\NWGNUtail.inc \ - $(CUSTOM_INI) \ + $(STANDARD_DEPENDS) \ $(VERSION_INC) \ $(EOLIST) @@ -61,36 +70,41 @@ ifeq "$(words $(strip $(TARGET_lib)))" "1" LIB_NAME = $(basename $(notdir $(TARGET_lib))) $(LIB_NAME)_LIBLST_DEPENDS = \ $(FILES_lib_objs) \ - $(AP_WORK)\build\NWGNUenvironment.inc \ - NWGNUmakefile \ - $(AP_WORK)\build\NWGNUtail.inc \ + $(STANDARD_DEPENDS) \ $(CUSTOM_INI) \ $(EOLIST) endif ifeq "$(wildcard NWGNU$(LIB_NAME))" "NWGNU$(LIB_NAME)" $(LIB_NAME)_LIBLST_DEPENDS += NWGNU$(LIB_NAME) +CCOPT_DEPENDS += NWGNU$(LIB_NAME) +else +CCOPT_DEPENDS += NWGNUmakefile endif ifeq "$(wildcard NWGNU$(NLM_NAME))" "NWGNU$(NLM_NAME)" $(NLM_NAME)_LINKOPT_DEPENDS += NWGNU$(NLM_NAME) -CCOPT_DEPENDS += NWGNU$(NLM_NAME) -CPPOPT_DEPENDS += NWGNU$(NLM_NAME) +CCOPT_DEPENDS += NWGNU$(NLM_NAME) +else +CCOPT_DEPENDS += NWGNUmakefile endif +CPPOPT_DEPENDS = $(CCOPT_DEPENDS) + # # Generic compiler rules # ifneq ($(MAKECMDGOALS),clean) -$(AP_WORK)\build\NWGNUversion.inc : $(AP_WORK)\build\nw_ver.awk $(AP_WORK)\include\ap_release.h - @echo Generating $(subst /,\,$@) +$(AP_WORK)/build/NWGNUversion.inc : $(AP_WORK)/build/nw_ver.awk $(AP_WORK)/include/ap_release.h +# @echo Generating $@ + @echo $(DL)GEN $@$(DL) $(AWK) -f $^ > $@ --include $(AP_WORK)\build\NWGNUversion.inc +-include $(APBUILD)/NWGNUversion.inc ifneq "$(strip $(VERSION_STR))" "" -VERSION_INC = $(AP_WORK)\build\NWGNUversion.inc +VERSION_INC = $(APBUILD)/NWGNUversion.inc else VERSION = 2,2,0 VERSION_STR = 2.2.0 @@ -101,56 +115,56 @@ endif ifeq "$(words $(strip $(TARGET_nlm)))" "1" -$(OBJDIR)/%.o: %.c $(OBJDIR)\$(NLM_NAME)_cc.opt - @echo Compiling $< - $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt +$(OBJDIR)/%.o: %.c $(OBJDIR)/$(NLM_NAME)_cc.opt + @echo $(DL)CC $<$(DL) + $(CC) -o $@ $< @$(word 2, $^) -$(OBJDIR)\$(NLM_NAME)_cc.opt: $(CCOPT_DEPENDS) - $(CHK) $@ $(DEL) $@ - @echo Generating $@ +$(OBJDIR)/$(NLM_NAME)_cc.opt: $(CCOPT_DEPENDS) + $(call DEL,$@) + @echo $(DL)GEN $@$(DL) ifneq "$(strip $(CFLAGS))" "" - @echo $(CFLAGS) >> $@ + @echo $(DL)$(CFLAGS)$(DL)>> $@ endif ifneq "$(strip $(XCFLAGS))" "" - @echo $(XCFLAGS) >> $@ + @echo $(DL)$(XCFLAGS)$(DL)>> $@ endif ifneq "$(strip $(XINCDIRS))" "" - @echo $(foreach xincdir,$(strip $(subst ;,$(SPACE),$(XINCDIRS))),-I$(xincdir)) >> $@ + @echo $(DL)$(foreach xincdir,$(strip $(subst ;,$(SPACE),$(XINCDIRS))),-I$(xincdir))$(DL)>> $@ endif ifneq "$(strip $(INCDIRS))" "" - @echo $(foreach incdir,$(strip $(subst ;,$(SPACE),$(INCDIRS))),-I$(incdir)) >> $@ + @echo $(DL)$(foreach incdir,$(strip $(subst ;,$(SPACE),$(INCDIRS))),-I$(incdir))$(DL)>> $@ endif ifneq "$(strip $(DEFINES))" "" - @echo $(DEFINES) >> $@ + @echo $(DL)$(DEFINES)$(DL)>> $@ endif ifneq "$(strip $(XDEFINES))" "" - @echo $(XDEFINES) >> $@ + @echo $(DL)$(XDEFINES)$(DL)>> $@ endif -$(OBJDIR)/%.o: %.cpp $(OBJDIR)\cpp.opt - @echo Compiling $< - $(CPP) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cpp.opt +$(OBJDIR)/%.o: %.cpp $(OBJDIR)/$(NLM_NAME)_cpp.opt + @echo $(DL)CC $<$(DL) + $(CC) -o $@ $< @$(word 2, $^) -$(OBJDIR)\cpp.opt: $(CPPOPT_DEPENDS) - $(CHK) $@ $(DEL) $@ - @echo Generating $@ +$(OBJDIR)/$(NLM_NAME)_cpp.opt: $(CPPOPT_DEPENDS) + $(call DEL,$@) + @echo $(DL)GEN $@$(DL) ifneq "$(strip $(CFLAGS))" "" - @echo $(CFLAGS) >> $@ + @echo $(DL)$(CFLAGS)$(DL)>> $@ endif ifneq "$(strip $(XCFLAGS))" "" - @echo $(XCFLAGS) >> $@ + @echo $(DL)$(XCFLAGS)$(DL)>> $@ endif ifneq "$(strip $(XINCDIRS))" "" - @echo $(foreach xincdir,$(strip $(subst ;,$(SPACE),$(XINCDIRS))),-I$(xincdir)) >> $@ + @echo $(DL)$(foreach xincdir,$(strip $(subst ;,$(SPACE),$(XINCDIRS))),-I$(xincdir))$(DL)>> $@ endif ifneq "$(strip $(INCDIRS))" "" - @echo $(foreach incdir,$(strip $(subst ;,$(SPACE),$(INCDIRS))),-I$(incdir)) >> $@ + @echo $(DL)$(foreach incdir,$(strip $(subst ;,$(SPACE),$(INCDIRS))),-I$(incdir))$(DL)>> $@ endif ifneq "$(strip $(DEFINES))" "" - @echo $(DEFINES) >> $@ + @echo $(DL)$(DEFINES)$(DL)>> $@ endif ifneq "$(strip $(XDEFINES))" "" - @echo $(XDEFINES) >> $@ + @echo $(DL)$(XDEFINES)$(DL)>> $@ endif endif # one target nlm @@ -163,22 +177,22 @@ endif # one target nlm ifeq "$(words $(strip $(TARGET_lib)))" "1" -$(TARGET_lib) : $(OBJDIR)\$(LIB_NAME)_lib.lst - @echo Generating $@ - $(CHK) $(OBJDIR)\$(@F) $(DEL) $(OBJDIR)\$(@F) - $(LIB) -o $(OBJDIR)\$(@F) @$? +$(TARGET_lib) : $(OBJDIR)/$(LIB_NAME)_lib.lst + $(call DEL,$@) + @echo $(DL)AR $@$(DL) + $(LIB) -o $@ @$< -$(OBJDIR)\$(LIB_NAME)_lib.lst: $($(LIB_NAME)_LIBLST_DEPENDS) - $(CHK) $@ $(DEL) $@ - @echo Generating $@ +$(OBJDIR)/$(LIB_NAME)_lib.lst: $($(LIB_NAME)_LIBLST_DEPENDS) + $(call DEL,$@) ifneq "$(strip $(FILES_lib_objs))" "" - @echo $(foreach objfile,$(FILES_lib_objs),$(subst /,\,$(objfile)) ) >> $@ + @echo $(DL)GEN $@$(DL) + @echo $(DL)$(FILES_lib_objs)$(DL)>> $@ endif else # We must have more than one target library so load the individual makefiles -$(OBJDIR)/%.lib: NWGNU% $(AP_WORK)\build\NWGNUhead.inc $(AP_WORK)\build\NWGNUtail.inc $(AP_WORK)\build\NWGNUenvironment.inc FORCE - @echo Calling $< +$(OBJDIR)/%.lib: NWGNU% $(STANDARD_DEPENDS) FORCE + @echo $(DL)Calling $<$(DL) $(MAKE) -f $< $(MAKECMDGOALS) RELEASE=$(RELEASE) endif @@ -187,120 +201,105 @@ endif # Rules to build nlms. # -vpath libcpre.o $(NOVELLLIBC)\imports - # If we only have one target NLM then build it ifeq "$(words $(strip $(TARGET_nlm)))" "1" -$(TARGET_nlm) : $(FILES_nlm_objs) $(FILES_nlm_libs) $(OBJDIR)\$(NLM_NAME)_link.opt - @echo Linking $@ - $(LINK) @$(OBJDIR)\$(NLM_NAME)_link.opt +$(TARGET_nlm) : $(FILES_nlm_objs) $(FILES_nlm_libs) $(OBJDIR)/$(NLM_NAME)_link.opt + @echo $(DL)LINK $@$(DL) + $(LINK) @$(OBJDIR)/$(NLM_NAME)_link.opt # This will force the link option file to be rebuilt if we change the # corresponding makefile -$(OBJDIR)\$(NLM_NAME)_link.opt : $($(NLM_NAME)_LINKOPT_DEPENDS) - $(CHK) $(OBJDIR)\$(@F) $(DEL) $(OBJDIR)\$(@F) - $(CHK) $(OBJDIR)\$(NLM_NAME)_link.def $(DEL) $(OBJDIR)\$(NLM_NAME)_link.def - @echo Generating $@ - @echo -warnings off >> $@ - @echo -zerobss >> $@ - @echo -o $(TARGET_nlm) >> $@ +$(OBJDIR)/$(NLM_NAME)_link.opt : $($(NLM_NAME)_LINKOPT_DEPENDS) + $(call DEL,$@) + $(call DEL,$(@:.opt=.def)) + @echo $(DL)GEN $@$(DL) + @echo $(DL)-warnings off$(DL)>> $@ + @echo $(DL)-zerobss$(DL)>> $@ + @echo $(DL)-o $(TARGET_nlm)$(DL)>> $@ 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 $(DL)-g$(DL)>> $@ + @echo $(DL)-sym internal$(DL)>> $@ + @echo $(DL)-sym codeview4$(DL)>> $@ + @echo $(DL)-osym $(OBJDIR)/$(NLM_NAME).sym$(DL)>> $@ else - @echo -sym internal >> $@ -endif - @echo -l $(NWOS) >> $@ - @echo -l $(AP)/$(OBJDIR) >> $@ - @echo -l $(APR)/$(OBJDIR) >> $@ - @echo -l $(APRUTIL)/$(OBJDIR) >> $@ - @echo -l $(PCRE)/$(OBJDIR) >> $@ - @echo -l $(HTTPD)/$(OBJDIR) >> $@ - @echo -l $(SERVER)/$(OBJDIR) >> $@ - @echo -l $(STDMOD)/$(OBJDIR) >> $@ - @echo -l $(NWOS)/$(OBJDIR) >> $@ - @echo -l "$(METROWERKS)/Novell Support/Metrowerks Support/Libraries/Runtime" >> $@ - @echo -l "$(METROWERKS)/Novell Support/Metrowerks Support/Libraries/MSL C++" >> $@ + @echo $(DL)-sym internal$(DL)>> $@ +endif + @echo $(DL)-l $(SRC)/$(OBJDIR)$(DL)>> $@ + @echo $(DL)-l $(HTTPD)/$(OBJDIR)$(DL)>> $@ + @echo $(DL)-l $(SERVER)/$(OBJDIR)$(DL)>> $@ + @echo $(DL)-l $(STDMOD)/$(OBJDIR)$(DL)>> $@ + @echo $(DL)-l $(NWOS)/$(OBJDIR)$(DL)>> $@ + @echo $(DL)-l $(NWOS)$(DL)>> $@ + @echo $(DL)-l $(APR)/$(OBJDIR)$(DL)>> $@ + @echo $(DL)-l $(APR)$(DL)>> $@ + @echo $(DL)-l $(APRUTIL)/$(OBJDIR)$(DL)>> $@ + @echo $(DL)-l $(PCRE)/$(OBJDIR)$(DL)>> $@ + @echo $(DL)-l "$(METROWERKS)/Novell Support/Metrowerks Support/Libraries/Runtime"$(DL)>> $@ + @echo $(DL)-l "$(METROWERKS)/Novell Support/Metrowerks Support/Libraries/MSL C++"$(DL)>> $@ ifneq "$(IPV6)" "" - @echo -l $(NOVELLLIBC)\include\winsock\IPV6 >> $@ + @echo $(DL)-l $(NOVELLLIBC)/include/winsock/IPV6$(DL)>> $@ endif - @echo -l $(NOVELLLIBC)/imports >> $@ + @echo $(DL)-l $(NOVELLLIBC)/imports$(DL)>> $@ ifneq "$(LDAPSDK)" "" - @echo -l $(LDAPSDK)/lib/nlm >> $@ + @echo $(DL)-l $(LDAPSDK)/imports$(DL)>> $@ endif - @echo -l $(APULDAP)/$(OBJDIR) >> $@ - @echo -l $(XML)/$(OBJDIR) >> $@ - @echo -nodefaults >> $@ - @echo -map $(OBJDIR)\$(NLM_NAME).map>> $@ + @echo $(DL)-l $(APULDAP)/$(OBJDIR)$(DL)>> $@ + @echo $(DL)-l $(XML)/$(OBJDIR)$(DL)>> $@ + @echo $(DL)-l $(SRC)/$(OBJDIR)$(DL)>> $@ + @echo $(DL)-nodefaults$(DL)>> $@ + @echo $(DL)-map $(OBJDIR)/$(NLM_NAME).map$(DL)>> $@ ifneq "$(strip $(XLFLAGS))" "" - @echo $(XLFLAGS) >> $@ + @echo $(DL)$(XLFLAGS)$(DL)>> $@ endif ifneq "$(strip $(FILES_nlm_objs))" "" - @echo $(foreach objfile,$(strip $(FILES_nlm_objs)),$(subst /,\,$(objfile))) >> $@ + @echo $(DL)$(foreach objfile,$(strip $(FILES_nlm_objs)),$(objfile))$(DL)>> $@ endif ifneq "$(FILES_nlm_libs)" "" - @echo $(foreach libfile, $(notdir $(strip $(FILES_nlm_libs))),-l$(subst /,\,$(libfile))) >> $@ + @echo $(DL)$(foreach libfile, $(notdir $(strip $(FILES_nlm_libs))),-l$(libfile))$(DL)>> $@ endif - @echo -commandfile $(OBJDIR)\$(NLM_NAME)_link.def >> $@ - @echo # Do not edit this file - it is created by make! > $(OBJDIR)\$(NLM_NAME)_link.def - @echo # All your changes will be lost!! >> $(OBJDIR)\$(NLM_NAME)_link.def + @echo $(DL)-commandfile $(@:.opt=.def)$(DL)>> $@ + @echo $(DL)# Do not edit this file - it is created by make!$(DL)> $(@:.opt=.def) + @echo $(DL)# All your changes will be lost!!$(DL)>> $(@:.opt=.def) ifneq "$(FILE_nlm_msg)" "" - @echo Messages $(FILE_nlm_msg) >> $(OBJDIR)\$(NLM_NAME)_link.def + @echo $(DL)Messages $(FILE_nlm_msg)$(DL)>> $(@:.opt=.def) endif ifneq "$(FILE_nlm_hlp)" "" - @echo Help $(FILE_nlm_hlp) >> $(OBJDIR)\$(NLM_NAME)_link.def + @echo $(DL)Help $(FILE_nlm_hlp)$(DL)>> $(@:.opt=.def) endif ifeq "$(FILE_nlm_copyright)" "" - @echo copyright "$(NLM_COPYRIGHT)" >> $(OBJDIR)\$(NLM_NAME)_link.def -endif - @echo description "$(NLM_DESCRIPTION)" >> $(OBJDIR)\$(NLM_NAME)_link.def - @echo threadname "$(NLM_THREAD_NAME)" >> $(OBJDIR)\$(NLM_NAME)_link.def -ifneq "$(NLM_STACK_SIZE)" "" - @echo stacksize $(subst K,000,$(subst k,K,$(strip $(NLM_STACK_SIZE)))) >> $(OBJDIR)\$(NLM_NAME)_link.def -else - @echo stacksize 64000 >> $(OBJDIR)\$(NLM_NAME)_link.def -endif - @echo screenname "$(NLM_SCREEN_NAME)" >> $(OBJDIR)\$(NLM_NAME)_link.def -ifneq "$(NLM_VERSION)" "" - @echo version $(NLM_VERSION) >> $(OBJDIR)\$(NLM_NAME)_link.def -else - @echo version $(VERSION) >> $(OBJDIR)\$(NLM_NAME)_link.def -endif -ifneq "$(NLM_ENTRY_SYM)" "" - @echo start $(NLM_ENTRY_SYM) >> $(OBJDIR)\$(NLM_NAME)_link.def -endif -ifneq "$(NLM_EXIT_SYM)" "" - @echo exit $(NLM_EXIT_SYM) >> $(OBJDIR)\$(NLM_NAME)_link.def -endif + @echo $(DL)copyright "$(NLM_COPYRIGHT)"$(DL)>> $(@:.opt=.def) +endif + @echo $(DL)description "$(NLM_DESCRIPTION)"$(DL)>> $(@:.opt=.def) + @echo $(DL)threadname "$(NLM_THREAD_NAME)"$(DL)>> $(@:.opt=.def) + @echo $(DL)screenname "$(NLM_SCREEN_NAME)"$(DL)>> $(@:.opt=.def) + @echo $(DL)stacksize $(subst K,000,$(subst k,K,$(strip $(NLM_STACK_SIZE))))$(DL)>> $(@:.opt=.def) + @echo $(DL)version $(NLM_VERSION) $(DL)>> $(@:.opt=.def) + @echo $(DL)start $(NLM_ENTRY_SYM)$(DL)>> $(@:.opt=.def) + @echo $(DL)exit $(NLM_EXIT_SYM)$(DL)>> $(@:.opt=.def) ifneq "$(NLM_CHECK_SYM)" "" - @echo check $(NLM_CHECK_SYM) >> $(OBJDIR)\$(NLM_NAME)_link.def -endif -ifneq "$(NLM_FLAGS)" "" - @echo $(strip $(NLM_FLAGS)) >> $(OBJDIR)\$(NLM_NAME)_link.def + @echo $(DL)check $(NLM_CHECK_SYM)$(DL)>> $(@:.opt=.def) endif + @echo $(DL)$(strip $(NLM_FLAGS))$(DL)>> $(@:.opt=.def) ifneq "$(FILES_nlm_modules)" "" - @echo module $(foreach module,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_modules))),$(subst /,\,$(module))) >> $(OBJDIR)\$(NLM_NAME)_link.def + @echo $(DL)module $(foreach module,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_modules))),$(module))$(DL)>> $(@:.opt=.def) endif ifneq "$(FILES_nlm_Ximports)" "" - @echo import $(foreach import,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_Ximports))),$(subst /,\,$(import))) >> $(OBJDIR)\$(NLM_NAME)_link.def + @echo $(DL)import $(foreach import,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_Ximports))),$(import))$(DL)>> $(@:.opt=.def) endif ifneq "$(FILES_nlm_exports)" "" - @echo export $(foreach export,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_exports))),$(subst /,\,$(export))) >> $(OBJDIR)\$(NLM_NAME)_link.def + @echo $(DL)export $(foreach export,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_exports))),$(export))$(DL)>> $(@:.opt=.def) endif - # if APACHE_UNIPROC is defined, don't include XDCData ifndef APACHE_UNIPROC ifneq "$(string $(XDCDATA))" "" - @echo xdcdata $(XDCDATA) >> $(OBJDIR)\$(NLM_NAME)_link.def + @echo $(DL)xdcdata $(XDCDATA)$(DL)>> $(@:.opt=.def) else - @echo xdcdata $(NWOS)\apache.xdc >> $(OBJDIR)\$(NLM_NAME)_link.def + @echo $(DL)xdcdata apache.xdc$(DL)>> $(@:.opt=.def) endif endif @@ -311,10 +310,10 @@ else # more than one target so look for individual makefiles. ifndef NO_LICENSE_FILE -$(OBJDIR)/%.nlm: NWGNU% $(AP_WORK)\build\NWGNUhead.inc $(AP_WORK)\build\NWGNUtail.inc $(AP_WORK)\build\NWGNUenvironment.inc $(CUSTOM_INI) $(VERSION_INC) FORCE - @echo Calling $< +$(OBJDIR)/%.nlm: NWGNU% $($(NLM_NAME)_LINKOPT_DEPENDS) FORCE + @echo $(DL)Calling $<$(DL) $(MAKE) -f $< $(MAKECMDGOALS) RELEASE=$(RELEASE) - $(CMD) echo. + @$(ECHONL) else diff --git a/build/make_nw_export.awk b/build/make_nw_export.awk index ca6e6a07029..93812c904b0 100644 --- a/build/make_nw_export.awk +++ b/build/make_nw_export.awk @@ -13,35 +13,25 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# # Based on apr's make_export.awk, which is # based on Ryan Bloom's make_export.pl +# BEGIN { - printf(" ("EXPPREFIX")\n") +} + +function add_symbol(sym_name) { + sub(" ", "", sym_name) + exports[++idx] = sym_name } # List of functions that we don't support, yet?? #/ap_some_name/{next} -function add_symbol (sym_name) { - if (count) { - found++ - } - gsub (/ /, "", sym_name) - line = line sym_name ",\n" - - if (count == 0) { - printf(" %s", line) - line = "" - } -} - -/^[ \t]*AP([RU]|_CORE)?_DECLARE[^(]*[(][^)]*[)]([^ ]* )*[^(]+[(]/ { - sub("[ \t]*AP([RU]|_CORE)?_DECLARE[^(]*[(][^)]*[)][ \t]*", "") +/^[ \t]*(AP|DAV)([RU]|_CORE)?_DECLARE[^(]*[(][^)]*[)]([^ ]* )*[^(]+[(]/ { + sub("[ \t]*(AP|DAV)([RU]|_CORE)?_DECLARE[^(]*[(][^)]*[)][ \t]*", "") sub("[(].*", "") sub("([^ ]* (^([ \t]*[(])))+", "") - add_symbol($0) next } @@ -51,13 +41,25 @@ function add_symbol (sym_name) { symbol = args[2] sub("^[ \t]+", "", symbol) sub("[ \t]+$", "", symbol) - add_symbol("ap_hook_" symbol) add_symbol("ap_hook_get_" symbol) add_symbol("ap_run_" symbol) next } +/^[ \t]*AP[RU]?_DECLARE_EXTERNAL_HOOK[^(]*[(][^)]*/ { + split($0, args, ",") + prefix = args[1] + sub("^.*[(]", "", prefix) + symbol = args[4] + sub("^[ \t]+", "", symbol) + sub("[ \t]+$", "", symbol) + add_symbol(prefix "_hook_" symbol) + add_symbol(prefix "_hook_get_" symbol) + add_symbol(prefix "_run_" symbol) + next +} + /^[ \t]*APR_POOL_DECLARE_ACCESSOR[^(]*[(][^)]*[)]/ { sub("[ \t]*APR_POOL_DECLARE_ACCESSOR[^(]*[(]", "", $0) sub("[)].*$", "", $0) @@ -79,13 +81,37 @@ function add_symbol (sym_name) { next } -/^[ \t]*(extern[ \t]+)?AP[RU]?_DECLARE_DATA .*;$/ { - varname = $NF; - gsub( /[*;]/, "", varname); - gsub( /\[.*\]/, "", varname); - add_symbol(varname); +/^[ \t]*(extern[ \t]+)?AP[RU]?_DECLARE_DATA .*;/ { + gsub(/[*;\n\r]/, "", $NF) + gsub(/\[.*\]/, "", $NF) + add_symbol($NF) +} + + +END { + printf("Added %d symbols to export list.\n", idx) > "/dev/stderr" + # sort symbols with shell sort + increment = int(idx / 2) + while (increment > 0) { + for (i = increment+1; i <= idx; i++) { + j = i + temp = exports[i] + while ((j >= increment+1) && (exports[j-increment] > temp)) { + exports[j] = exports[j-increment] + j -= increment + } + exports[j] = temp + } + if (increment == 2) + increment = 1 + else + increment = int(increment*5/11) + } + # print the array + printf(" (%s)\n", EXPPREFIX) + while (x < idx - 1) { + printf(" %s,\n", exports[++x]) + } + printf(" %s\n", exports[++x]) } -#END { -# printf(" %s", line) -#} diff --git a/modules/NWGNUmakefile b/modules/NWGNUmakefile index 76d018d2cfa..5f7882a668f 100644 --- a/modules/NWGNUmakefile +++ b/modules/NWGNUmakefile @@ -14,9 +14,9 @@ endif SUBDIRS = \ aaa \ cache \ - dav\main \ - dav\fs \ - dav\lock \ + dav/main \ + dav/fs \ + dav/lock \ echo \ generators \ loggers \ @@ -65,7 +65,7 @@ endif # paths to tools # -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc # # build this level's files diff --git a/modules/aaa/NWGNUauthbasc b/modules/aaa/NWGNUauthbasc index f1f1cbae9b1..60507845bf1 100644 --- a/modules/aaa/NWGNUauthbasc +++ b/modules/aaa/NWGNUauthbasc @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -107,7 +107,7 @@ NLM_THREAD_NAME = AuthBasic Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -120,12 +120,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 @@ -135,7 +135,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 @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -201,8 +201,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -230,7 +230,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -243,6 +243,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/aaa/NWGNUauthdigt b/modules/aaa/NWGNUauthdigt index bb6b01cad00..32e243dcdd2 100644 --- a/modules/aaa/NWGNUauthdigt +++ b/modules/aaa/NWGNUauthdigt @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -107,7 +107,7 @@ NLM_THREAD_NAME = Digest Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -120,12 +120,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 @@ -135,7 +135,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 @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -201,8 +201,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -230,7 +230,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -243,6 +243,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/aaa/NWGNUauthnalias b/modules/aaa/NWGNUauthnalias index 5432563fd9e..859e34fb735 100644 --- a/modules/aaa/NWGNUauthnalias +++ b/modules/aaa/NWGNUauthnalias @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -107,7 +107,7 @@ NLM_THREAD_NAME = AuthnAlias Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -120,12 +120,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 @@ -135,7 +135,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 @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -201,8 +201,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -230,7 +230,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -243,6 +243,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/aaa/NWGNUauthnano b/modules/aaa/NWGNUauthnano index 446eaae9fd1..e7921c308c3 100644 --- a/modules/aaa/NWGNUauthnano +++ b/modules/aaa/NWGNUauthnano @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -107,7 +107,7 @@ NLM_THREAD_NAME = AuthAnon Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -120,12 +120,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 @@ -135,7 +135,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 @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -201,8 +201,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -230,7 +230,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -243,6 +243,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/aaa/NWGNUauthndbd b/modules/aaa/NWGNUauthndbd index 0128fe2b141..efbbd27767a 100644 --- a/modules/aaa/NWGNUauthndbd +++ b/modules/aaa/NWGNUauthndbd @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -108,7 +108,7 @@ NLM_THREAD_NAME = AuthnDBD Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -121,12 +121,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 @@ -136,7 +136,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 @@ -171,7 +171,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -202,8 +202,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -231,7 +231,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -244,6 +244,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/aaa/NWGNUauthndbm b/modules/aaa/NWGNUauthndbm index a429c126e87..31f43d601bd 100644 --- a/modules/aaa/NWGNUauthndbm +++ b/modules/aaa/NWGNUauthndbm @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -107,7 +107,7 @@ NLM_THREAD_NAME = AuthnDBM Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -120,12 +120,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 @@ -135,7 +135,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 @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -201,8 +201,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -230,7 +230,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -243,6 +243,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/aaa/NWGNUauthndef b/modules/aaa/NWGNUauthndef index 753d0149365..ec272ab6e50 100644 --- a/modules/aaa/NWGNUauthndef +++ b/modules/aaa/NWGNUauthndef @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -107,7 +107,7 @@ NLM_THREAD_NAME = Authndef Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -120,12 +120,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 @@ -135,7 +135,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 @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -201,8 +201,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -230,7 +230,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -243,6 +243,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/aaa/NWGNUauthnfil b/modules/aaa/NWGNUauthnfil index 54d2b37facf..5017c919d3d 100644 --- a/modules/aaa/NWGNUauthnfil +++ b/modules/aaa/NWGNUauthnfil @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -107,7 +107,7 @@ NLM_THREAD_NAME = AuthnFile Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -120,12 +120,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 @@ -135,7 +135,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 @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -201,8 +201,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -230,7 +230,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -243,6 +243,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/aaa/NWGNUauthnzldap b/modules/aaa/NWGNUauthnzldap index ef4527e7c04..b260b73a9f3 100644 --- a/modules/aaa/NWGNUauthnzldap +++ b/modules/aaa/NWGNUauthnzldap @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -115,7 +115,7 @@ NLM_THREAD_NAME = AuthnzLDAP Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -128,12 +128,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 @@ -143,7 +143,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 @@ -178,7 +178,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -216,10 +216,10 @@ FILES_nlm_Ximports = \ util_ldap_cache_getuserdn \ util_ldap_cache_compare \ util_ldap_cache_comparedn \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ - @$(LDAPSDK)/imports/lldapsdk.imp \ + @lldapsdk.imp \ $(EOLIST) # @@ -246,7 +246,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -259,6 +259,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/aaa/NWGNUauthzdbm b/modules/aaa/NWGNUauthzdbm index 58db1d23e72..32bfff64bb7 100644 --- a/modules/aaa/NWGNUauthzdbm +++ b/modules/aaa/NWGNUauthzdbm @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -107,7 +107,7 @@ NLM_THREAD_NAME = AuthzDBM Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -120,12 +120,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 @@ -135,7 +135,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 @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -201,8 +201,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -230,7 +230,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -243,6 +243,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/aaa/NWGNUauthzdef b/modules/aaa/NWGNUauthzdef index 8cafe81d098..58b50cf68fb 100644 --- a/modules/aaa/NWGNUauthzdef +++ b/modules/aaa/NWGNUauthzdef @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -107,7 +107,7 @@ NLM_THREAD_NAME = Authzdef Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -120,12 +120,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 @@ -135,7 +135,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 @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -201,8 +201,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -230,7 +230,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -243,6 +243,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/aaa/NWGNUauthzgrp b/modules/aaa/NWGNUauthzgrp index 2db5fae6da6..24a96e5fdbe 100644 --- a/modules/aaa/NWGNUauthzgrp +++ b/modules/aaa/NWGNUauthzgrp @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -107,7 +107,7 @@ NLM_THREAD_NAME = AuthzGrp Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -120,12 +120,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 @@ -135,7 +135,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 @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -201,8 +201,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -230,7 +230,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -243,6 +243,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/aaa/NWGNUauthzusr b/modules/aaa/NWGNUauthzusr index 7e597e7ab9c..aa5ebd7d1f2 100644 --- a/modules/aaa/NWGNUauthzusr +++ b/modules/aaa/NWGNUauthzusr @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -107,7 +107,7 @@ NLM_THREAD_NAME = AuthzUser Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -120,12 +120,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 @@ -135,7 +135,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 @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -201,8 +201,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -230,7 +230,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -243,6 +243,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/aaa/NWGNUmakefile b/modules/aaa/NWGNUmakefile index 9ef2cf0449e..f53d72bb72e 100644 --- a/modules/aaa/NWGNUmakefile +++ b/modules/aaa/NWGNUmakefile @@ -10,7 +10,7 @@ SUBDIRS = \ # paths to tools # -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc # # build this level's files @@ -111,7 +111,7 @@ NLM_THREAD_NAME = # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -244,10 +244,10 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE - copy $(OBJDIR)\*.nlm $(INSTALL)\$(BASEDIR)\modules\*.* + $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/) # # Any specialized rules here @@ -258,6 +258,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/cache/NWGNUdsk_cach b/modules/cache/NWGNUdsk_cach index 9eb83be290f..2df9a3eee00 100644 --- a/modules/cache/NWGNUdsk_cach +++ b/modules/cache/NWGNUdsk_cach @@ -10,7 +10,7 @@ SUBDIRS = \ # paths to tools # -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc # # build this level's files @@ -115,7 +115,7 @@ NLM_THREAD_NAME = dsk_cach # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -128,12 +128,12 @@ NLM_STACK_SIZE = 65536 # # 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 @@ -143,7 +143,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 @@ -182,7 +182,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -215,7 +215,7 @@ FILE_nlm_copyright = # FILES_nlm_Ximports = \ @libc.imp \ - @$(APR)/aprlib.imp \ + @aprlib.imp \ @httpd.imp \ @mod_cache.imp \ $(EOLIST) @@ -245,7 +245,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -258,6 +258,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/cache/NWGNUmakefile b/modules/cache/NWGNUmakefile index 868db5485ea..ef097b248ac 100644 --- a/modules/cache/NWGNUmakefile +++ b/modules/cache/NWGNUmakefile @@ -10,7 +10,7 @@ SUBDIRS = \ # paths to tools # -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc # # build this level's files @@ -111,7 +111,7 @@ NLM_THREAD_NAME = # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -228,10 +228,10 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE - copy $(OBJDIR)\*.nlm $(INSTALL)\$(BASEDIR)\modules\*.* + $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/) # # Any specialized rules here @@ -242,6 +242,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/cache/NWGNUmem_cach b/modules/cache/NWGNUmem_cach index 3d7c6b32e00..20e49000d04 100644 --- a/modules/cache/NWGNUmem_cach +++ b/modules/cache/NWGNUmem_cach @@ -10,7 +10,7 @@ SUBDIRS = \ # paths to tools # -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc # # build this level's files @@ -116,7 +116,7 @@ NLM_THREAD_NAME = mem_cach # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -129,12 +129,12 @@ NLM_STACK_SIZE = 65536 # # 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 @@ -144,7 +144,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 @@ -186,7 +186,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -219,7 +219,7 @@ FILE_nlm_copyright = # FILES_nlm_Ximports = \ @libc.imp \ - @$(APR)/aprlib.imp \ + @aprlib.imp \ @httpd.imp \ @mod_cache.imp \ $(EOLIST) @@ -249,7 +249,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -262,6 +262,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/cache/NWGNUmod_cach b/modules/cache/NWGNUmod_cach index 138c6a795c6..589bc71bc35 100644 --- a/modules/cache/NWGNUmod_cach +++ b/modules/cache/NWGNUmod_cach @@ -10,7 +10,7 @@ SUBDIRS = \ # paths to tools # -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc # # build this level's files @@ -116,7 +116,7 @@ NLM_THREAD_NAME = mod_cach # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -129,12 +129,12 @@ NLM_STACK_SIZE = 65536 # # 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 @@ -144,7 +144,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 @@ -185,7 +185,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -217,7 +217,7 @@ FILE_nlm_copyright = # FILES_nlm_Ximports = \ @libc.imp \ - @$(APR)/aprlib.imp \ + @aprlib.imp \ @httpd.imp \ @netware.imp \ $(EOLIST) @@ -247,7 +247,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -260,6 +260,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/database/NWGNUmakefile b/modules/database/NWGNUmakefile index fcaf2433037..23013365527 100644 --- a/modules/database/NWGNUmakefile +++ b/modules/database/NWGNUmakefile @@ -10,7 +10,7 @@ SUBDIRS = \ # paths to tools # -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc # # build this level's files @@ -115,7 +115,7 @@ NLM_THREAD_NAME = DBD Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -128,12 +128,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 @@ -143,7 +143,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 @@ -178,7 +178,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -209,8 +209,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -243,10 +243,10 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE - copy $(OBJDIR)\*.nlm $(INSTALL)\$(BASEDIR)\modules\*.* + $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/) # # Any specialized rules here @@ -257,6 +257,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/dav/fs/NWGNUmakefile b/modules/dav/fs/NWGNUmakefile index 5ade06a437f..c5cf297b2f6 100644 --- a/modules/dav/fs/NWGNUmakefile +++ b/modules/dav/fs/NWGNUmakefile @@ -10,7 +10,7 @@ SUBDIRS = \ # paths to tools # -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc # # build this level's files @@ -117,7 +117,7 @@ NLM_THREAD_NAME = modDAVFS Thread # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -130,12 +130,12 @@ NLM_STACK_SIZE = 65536 # # 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 @@ -145,7 +145,7 @@ NLM_CHECK_SYM = # # If this is specified it will be used by the link '-flags' directive # -NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION +NLM_FLAGS = # # Declare all target files (you must add your files here) @@ -181,7 +181,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -214,7 +214,7 @@ FILE_nlm_copyright = # FILES_nlm_Ximports = \ @libc.imp \ - @$(APR)/aprlib.imp \ + @aprlib.imp \ @httpd.imp \ @../main/dav.imp \ $(EOLIST) @@ -249,7 +249,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE copy $(OBJDIR)\moddavfs.nlm $(INSTALL)\$(BASEDIR)\modules @@ -264,6 +264,6 @@ vpath %.c ../../arch/netware # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/dav/lock/NWGNUmakefile b/modules/dav/lock/NWGNUmakefile index 0d278ff8782..19337066808 100644 --- a/modules/dav/lock/NWGNUmakefile +++ b/modules/dav/lock/NWGNUmakefile @@ -10,7 +10,7 @@ SUBDIRS = \ # paths to tools # -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc # # build this level's files @@ -117,7 +117,7 @@ NLM_THREAD_NAME = modDAVLK Thread # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -130,12 +130,12 @@ NLM_STACK_SIZE = 65536 # # 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 @@ -145,7 +145,7 @@ NLM_CHECK_SYM = # # If this is specified it will be used by the link '-flags' directive # -NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION +NLM_FLAGS = # # Declare all target files (you must add your files here) @@ -178,7 +178,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -211,7 +211,7 @@ FILE_nlm_copyright = # FILES_nlm_Ximports = \ @libc.imp \ - @$(APR)/aprlib.imp \ + @aprlib.imp \ @httpd.imp \ @../main/dav.imp \ $(EOLIST) @@ -240,7 +240,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE copy $(OBJDIR)\moddavlk.nlm $(INSTALL)\$(BASEDIR)\modules @@ -253,6 +253,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/dav/main/NWGNUmakefile b/modules/dav/main/NWGNUmakefile index a002e3100fc..a66665d34cd 100644 --- a/modules/dav/main/NWGNUmakefile +++ b/modules/dav/main/NWGNUmakefile @@ -10,7 +10,7 @@ SUBDIRS = \ # paths to tools # -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc # # build this level's files @@ -115,7 +115,7 @@ NLM_THREAD_NAME = mod_DAV # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -128,12 +128,12 @@ NLM_STACK_SIZE = 65536 # # 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 @@ -143,7 +143,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 @@ -188,7 +188,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -220,7 +220,7 @@ FILE_nlm_copyright = # FILES_nlm_Ximports = \ @libc.imp \ - @$(APR)/aprlib.imp \ + @aprlib.imp \ @httpd.imp \ $(EOLIST) @@ -249,7 +249,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE copy $(OBJDIR)\mod_dav.nlm $(INSTALL)\$(BASEDIR)\modules\*.* @@ -263,6 +263,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/debug/NWGNUmakefile b/modules/debug/NWGNUmakefile index 8a1993d34a8..1ab2f2f8cde 100644 --- a/modules/debug/NWGNUmakefile +++ b/modules/debug/NWGNUmakefile @@ -10,7 +10,7 @@ SUBDIRS = \ # paths to tools # -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc # # build this level's files @@ -111,7 +111,7 @@ NLM_THREAD_NAME = # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -227,10 +227,10 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE - copy $(OBJDIR)\*.nlm $(INSTALL)\$(BASEDIR)\modules\*.* + $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/) # # Any specialized rules here @@ -241,6 +241,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/debug/NWGNUmodbucketeer b/modules/debug/NWGNUmodbucketeer index 0a37555a844..8fe0b7a5ef8 100644 --- a/modules/debug/NWGNUmodbucketeer +++ b/modules/debug/NWGNUmodbucketeer @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -107,7 +107,7 @@ NLM_THREAD_NAME = Bucketeer Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -120,12 +120,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 @@ -135,7 +135,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 @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -201,8 +201,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -230,7 +230,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -243,6 +243,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/debug/NWGNUmoddumpio b/modules/debug/NWGNUmoddumpio index 0be87ef5307..3652e9ce7cc 100644 --- a/modules/debug/NWGNUmoddumpio +++ b/modules/debug/NWGNUmoddumpio @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -107,7 +107,7 @@ NLM_THREAD_NAME = DumpIO Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -120,12 +120,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 @@ -135,7 +135,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 @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -201,8 +201,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -230,7 +230,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -243,6 +243,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/echo/NWGNUmakefile b/modules/echo/NWGNUmakefile index 623d8ed397a..3b05dc9d193 100644 --- a/modules/echo/NWGNUmakefile +++ b/modules/echo/NWGNUmakefile @@ -10,7 +10,7 @@ SUBDIRS = \ # paths to tools # -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc # # build this level's files @@ -115,7 +115,7 @@ NLM_THREAD_NAME = Echo Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -128,12 +128,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 @@ -143,7 +143,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 @@ -178,7 +178,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -209,8 +209,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -238,10 +238,10 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE - copy $(OBJDIR)\*.nlm $(INSTALL)\$(BASEDIR)\modules\*.* + $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/) # # Any specialized rules here @@ -252,6 +252,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/experimental/NWGNUcase_flt b/modules/experimental/NWGNUcase_flt index 18f55f3dc01..df9a86f4989 100644 --- a/modules/experimental/NWGNUcase_flt +++ b/modules/experimental/NWGNUcase_flt @@ -10,7 +10,7 @@ SUBDIRS = \ # paths to tools # -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc # # build this level's files @@ -115,7 +115,7 @@ NLM_THREAD_NAME = $(NLM_NAME) Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -128,12 +128,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 @@ -143,7 +143,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 @@ -178,7 +178,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -209,8 +209,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -238,7 +238,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -251,6 +251,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/experimental/NWGNUcase_flt_in b/modules/experimental/NWGNUcase_flt_in index fedecb769f2..7429a44a03d 100644 --- a/modules/experimental/NWGNUcase_flt_in +++ b/modules/experimental/NWGNUcase_flt_in @@ -10,7 +10,7 @@ SUBDIRS = \ # paths to tools # -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc # # build this level's files @@ -115,7 +115,7 @@ NLM_THREAD_NAME = $(NLM_NAME) Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -128,12 +128,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 @@ -143,7 +143,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 @@ -178,7 +178,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -209,8 +209,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -238,7 +238,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -251,6 +251,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/experimental/NWGNUexample b/modules/experimental/NWGNUexample index 913f7453775..4533342f00c 100644 --- a/modules/experimental/NWGNUexample +++ b/modules/experimental/NWGNUexample @@ -10,7 +10,7 @@ SUBDIRS = \ # paths to tools # -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc # # build this level's files @@ -115,7 +115,7 @@ NLM_THREAD_NAME = Example Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -128,12 +128,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 @@ -143,7 +143,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 @@ -178,7 +178,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -209,8 +209,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -238,7 +238,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -251,6 +251,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/experimental/NWGNUmakefile b/modules/experimental/NWGNUmakefile index 1189aa8f072..e16075e7569 100644 --- a/modules/experimental/NWGNUmakefile +++ b/modules/experimental/NWGNUmakefile @@ -10,7 +10,7 @@ SUBDIRS = \ # paths to tools # -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc # # build this level's files @@ -111,7 +111,7 @@ NLM_THREAD_NAME = # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -236,10 +236,10 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE - copy $(OBJDIR)\*.nlm $(INSTALL)\$(BASEDIR)\modules\*.* + $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/) # # Any specialized rules here @@ -250,6 +250,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/filters/NWGNUcharsetl b/modules/filters/NWGNUcharsetl index b4e4f5959ff..99326354d66 100644 --- a/modules/filters/NWGNUcharsetl +++ b/modules/filters/NWGNUcharsetl @@ -10,7 +10,7 @@ SUBDIRS = \ # paths to tools # -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc # # build this level's files @@ -116,7 +116,7 @@ NLM_THREAD_NAME = charsetl # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -129,12 +129,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 @@ -144,7 +144,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 +179,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -210,8 +210,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -239,7 +239,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -252,6 +252,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/filters/NWGNUdeflate b/modules/filters/NWGNUdeflate index 03138e3561a..579d1386b80 100644 --- a/modules/filters/NWGNUdeflate +++ b/modules/filters/NWGNUdeflate @@ -13,7 +13,7 @@ SUBDIRS = \ # paths to tools # -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc # # build this level's files @@ -118,7 +118,7 @@ NLM_THREAD_NAME = Deflate Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -131,12 +131,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 @@ -146,7 +146,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 @@ -197,7 +197,7 @@ endif # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -228,8 +228,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -257,10 +257,10 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE - copy $(OBJDIR)\*.nlm $(INSTALL)\$(BASEDIR)\modules\*.* + $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/) # # Any specialized rules here @@ -273,6 +273,6 @@ vpath %.c $(ZLIBSDK) # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/filters/NWGNUextfiltr b/modules/filters/NWGNUextfiltr index 6c9d5c15ea9..16ae72a1d3a 100644 --- a/modules/filters/NWGNUextfiltr +++ b/modules/filters/NWGNUextfiltr @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -107,7 +107,7 @@ NLM_THREAD_NAME = ExtFilter Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -120,12 +120,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 @@ -135,7 +135,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 @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -201,8 +201,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -230,7 +230,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -243,6 +243,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/filters/NWGNUmakefile b/modules/filters/NWGNUmakefile index e3a406647dd..2b21b230e26 100644 --- a/modules/filters/NWGNUmakefile +++ b/modules/filters/NWGNUmakefile @@ -10,7 +10,7 @@ SUBDIRS = \ # paths to tools # -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc # # build this level's files @@ -111,7 +111,7 @@ NLM_THREAD_NAME = # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -238,10 +238,10 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE - copy $(OBJDIR)\*.nlm $(INSTALL)\$(BASEDIR)\modules\*.* + $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/) # # Any specialized rules here @@ -252,6 +252,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/filters/NWGNUmod_filter b/modules/filters/NWGNUmod_filter index 9d46586fb33..3bc38385db2 100644 --- a/modules/filters/NWGNUmod_filter +++ b/modules/filters/NWGNUmod_filter @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -107,7 +107,7 @@ NLM_THREAD_NAME = Filter Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -120,12 +120,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 @@ -135,7 +135,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 @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -201,8 +201,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -230,7 +230,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -243,6 +243,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/filters/NWGNUreqtimeout b/modules/filters/NWGNUreqtimeout index f48540ba443..a99f82c4247 100644 --- a/modules/filters/NWGNUreqtimeout +++ b/modules/filters/NWGNUreqtimeout @@ -10,7 +10,7 @@ SUBDIRS = \ # paths to tools # -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc # # build this level's files @@ -115,7 +115,7 @@ NLM_THREAD_NAME = $(NLM_NAME) # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -128,12 +128,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 @@ -143,7 +143,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 @@ -178,7 +178,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -209,8 +209,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -238,7 +238,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -251,6 +251,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/filters/NWGNUsubstitute b/modules/filters/NWGNUsubstitute index 6c0d0db4226..e5775f285dc 100644 --- a/modules/filters/NWGNUsubstitute +++ b/modules/filters/NWGNUsubstitute @@ -10,7 +10,7 @@ SUBDIRS = \ # paths to tools # -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc # # build this level's files @@ -115,7 +115,7 @@ NLM_THREAD_NAME = Substitute Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -128,12 +128,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 @@ -143,7 +143,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 @@ -178,7 +178,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -209,8 +209,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -238,7 +238,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -251,6 +251,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/generators/NWGNUautoindex b/modules/generators/NWGNUautoindex index 69a59eda20d..86f0b1107a3 100644 --- a/modules/generators/NWGNUautoindex +++ b/modules/generators/NWGNUautoindex @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -108,7 +108,7 @@ NLM_THREAD_NAME = Autoindex Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -121,12 +121,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 @@ -136,7 +136,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 @@ -171,7 +171,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -202,8 +202,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -231,7 +231,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -244,6 +244,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/generators/NWGNUinfo b/modules/generators/NWGNUinfo index 737af629eda..9d60ac5b851 100644 --- a/modules/generators/NWGNUinfo +++ b/modules/generators/NWGNUinfo @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -107,7 +107,7 @@ NLM_THREAD_NAME = Info Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -120,12 +120,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 @@ -135,7 +135,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 @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -201,8 +201,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -230,7 +230,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -243,6 +243,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/generators/NWGNUmakefile b/modules/generators/NWGNUmakefile index a895d8c4714..1a6cb98a952 100644 --- a/modules/generators/NWGNUmakefile +++ b/modules/generators/NWGNUmakefile @@ -10,7 +10,7 @@ SUBDIRS = \ # paths to tools # -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc # # build this level's files @@ -111,7 +111,7 @@ NLM_THREAD_NAME = # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -230,10 +230,10 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE - copy $(OBJDIR)\*.nlm $(INSTALL)\$(BASEDIR)\modules\*.* + $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/) # # Any specialized rules here @@ -244,6 +244,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/generators/NWGNUmod_asis b/modules/generators/NWGNUmod_asis index 51778f15eec..d8ab0d1c61f 100644 --- a/modules/generators/NWGNUmod_asis +++ b/modules/generators/NWGNUmod_asis @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -108,7 +108,7 @@ NLM_THREAD_NAME = Mod_asis Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -121,12 +121,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 @@ -136,7 +136,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 @@ -171,7 +171,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -202,8 +202,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -231,7 +231,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -244,6 +244,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/generators/NWGNUmod_cgi b/modules/generators/NWGNUmod_cgi index 3463e636bd7..2c4330c7fc7 100644 --- a/modules/generators/NWGNUmod_cgi +++ b/modules/generators/NWGNUmod_cgi @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -109,7 +109,7 @@ NLM_THREAD_NAME = Mod_cgi Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -122,12 +122,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 @@ -137,7 +137,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 @@ -172,7 +172,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -203,8 +203,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -232,7 +232,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -245,6 +245,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/generators/NWGNUstatus b/modules/generators/NWGNUstatus index e7519ac9b41..630edb80c36 100644 --- a/modules/generators/NWGNUstatus +++ b/modules/generators/NWGNUstatus @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -107,7 +107,7 @@ NLM_THREAD_NAME = Status Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -120,12 +120,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 @@ -135,7 +135,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 @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -201,8 +201,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -230,7 +230,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -243,6 +243,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/ldap/NWGNUmakefile b/modules/ldap/NWGNUmakefile index e3adacdae12..aee46a3493f 100644 --- a/modules/ldap/NWGNUmakefile +++ b/modules/ldap/NWGNUmakefile @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -116,7 +116,7 @@ NLM_THREAD_NAME = UtilLDAP Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -129,12 +129,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 @@ -144,7 +144,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 @@ -181,7 +181,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -214,11 +214,11 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ - @$(LDAPSDK)/imports/lldapsdk.imp \ - @$(LDAPSDK)/imports/lldapssl.imp \ + @lldapsdk.imp \ + @lldapssl.imp \ $(EOLIST) # @@ -245,10 +245,10 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE - copy $(OBJDIR)\*.nlm $(INSTALL)\$(BASEDIR)\modules\*.* + $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/) # # Any specialized rules here @@ -259,6 +259,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/loggers/NWGNUforensic b/modules/loggers/NWGNUforensic index eda7f83e47e..ac0250cd8f6 100644 --- a/modules/loggers/NWGNUforensic +++ b/modules/loggers/NWGNUforensic @@ -10,7 +10,7 @@ SUBDIRS = \ # paths to tools # -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc # # build this level's files @@ -115,7 +115,7 @@ NLM_THREAD_NAME = Forensic Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -128,12 +128,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 @@ -143,7 +143,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 @@ -178,7 +178,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -209,8 +209,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -238,10 +238,10 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE - copy $(OBJDIR)\*.nlm $(INSTALL)\$(BASEDIR)\modules\*.* + $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/) # # Any specialized rules here @@ -252,6 +252,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/loggers/NWGNUmakefile b/modules/loggers/NWGNUmakefile index 219e13fe204..4b3984fbb78 100644 --- a/modules/loggers/NWGNUmakefile +++ b/modules/loggers/NWGNUmakefile @@ -10,7 +10,7 @@ SUBDIRS = \ # paths to tools # -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc # # build this level's files @@ -111,7 +111,7 @@ NLM_THREAD_NAME = # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -227,10 +227,10 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE - copy $(OBJDIR)\*.nlm $(INSTALL)\$(BASEDIR)\modules\*.* + $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/) # # Any specialized rules here @@ -241,6 +241,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/loggers/NWGNUmodlogio b/modules/loggers/NWGNUmodlogio index 4588c824a90..09d9c8336f2 100644 --- a/modules/loggers/NWGNUmodlogio +++ b/modules/loggers/NWGNUmodlogio @@ -10,7 +10,7 @@ SUBDIRS = \ # paths to tools # -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc # # build this level's files @@ -115,7 +115,7 @@ NLM_THREAD_NAME = Logio Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -128,12 +128,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 @@ -143,7 +143,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 @@ -178,7 +178,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -209,8 +209,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -238,10 +238,10 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE - copy $(OBJDIR)\*.nlm $(INSTALL)\$(BASEDIR)\modules\*.* + $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/) # # Any specialized rules here @@ -252,6 +252,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/mappers/NWGNUactions b/modules/mappers/NWGNUactions index 7e0e4f61d46..3909c34aae9 100644 --- a/modules/mappers/NWGNUactions +++ b/modules/mappers/NWGNUactions @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -107,7 +107,7 @@ NLM_THREAD_NAME = Actions Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -120,12 +120,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 @@ -135,7 +135,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 @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -201,8 +201,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -230,7 +230,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -243,6 +243,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/mappers/NWGNUimagemap b/modules/mappers/NWGNUimagemap index b5d4cebb20b..e91470f283e 100644 --- a/modules/mappers/NWGNUimagemap +++ b/modules/mappers/NWGNUimagemap @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -108,7 +108,7 @@ NLM_THREAD_NAME = Image Map Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -121,12 +121,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 @@ -136,7 +136,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 @@ -171,7 +171,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -202,8 +202,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -231,7 +231,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -244,6 +244,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/mappers/NWGNUmakefile b/modules/mappers/NWGNUmakefile index 35e0f82521c..76c1d2734a1 100644 --- a/modules/mappers/NWGNUmakefile +++ b/modules/mappers/NWGNUmakefile @@ -10,7 +10,7 @@ SUBDIRS = \ # paths to tools # -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc # # build this level's files @@ -111,7 +111,7 @@ NLM_THREAD_NAME = # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -231,10 +231,10 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE - copy $(OBJDIR)\*.nlm $(INSTALL)\$(BASEDIR)\modules\*.* + $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/) # # Any specialized rules here @@ -245,6 +245,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/mappers/NWGNUrewrite b/modules/mappers/NWGNUrewrite index abccf0091de..1a88481bf99 100644 --- a/modules/mappers/NWGNUrewrite +++ b/modules/mappers/NWGNUrewrite @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -108,7 +108,7 @@ NLM_THREAD_NAME = Rewrite Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -121,12 +121,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 @@ -136,7 +136,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 @@ -171,7 +171,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -202,8 +202,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -231,7 +231,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -244,6 +244,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/mappers/NWGNUspeling b/modules/mappers/NWGNUspeling index 6a045bdc4fa..0e05a6b3198 100644 --- a/modules/mappers/NWGNUspeling +++ b/modules/mappers/NWGNUspeling @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -107,7 +107,7 @@ NLM_THREAD_NAME = Speling Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -120,12 +120,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 @@ -135,7 +135,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 @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -201,8 +201,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -230,7 +230,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -243,6 +243,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/mappers/NWGNUuserdir b/modules/mappers/NWGNUuserdir index f8fdfc68d08..6e1dafc1fa9 100644 --- a/modules/mappers/NWGNUuserdir +++ b/modules/mappers/NWGNUuserdir @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -108,7 +108,7 @@ NLM_THREAD_NAME = UserDir Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -121,12 +121,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 @@ -136,7 +136,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 @@ -171,7 +171,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -202,8 +202,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -231,7 +231,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -244,6 +244,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/mappers/NWGNUvhost b/modules/mappers/NWGNUvhost index 54f2bc068fc..9a1dc2901f9 100644 --- a/modules/mappers/NWGNUvhost +++ b/modules/mappers/NWGNUvhost @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -107,7 +107,7 @@ NLM_THREAD_NAME = Vhost Alias Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -120,12 +120,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 @@ -135,7 +135,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 @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -201,8 +201,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -230,7 +230,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -243,6 +243,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/metadata/NWGNUcernmeta b/modules/metadata/NWGNUcernmeta index dc529fd474a..d3e2a81f1c0 100644 --- a/modules/metadata/NWGNUcernmeta +++ b/modules/metadata/NWGNUcernmeta @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -107,7 +107,7 @@ NLM_THREAD_NAME = CERN Meta Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -120,12 +120,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 @@ -135,7 +135,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 @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -201,8 +201,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -230,7 +230,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -243,6 +243,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/metadata/NWGNUexpires b/modules/metadata/NWGNUexpires index c3229d2b200..a2b523b0b30 100644 --- a/modules/metadata/NWGNUexpires +++ b/modules/metadata/NWGNUexpires @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -107,7 +107,7 @@ NLM_THREAD_NAME = Expires Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -120,12 +120,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 @@ -135,7 +135,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 @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -201,8 +201,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -230,7 +230,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -243,6 +243,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/metadata/NWGNUheaders b/modules/metadata/NWGNUheaders index 10155967147..aa08b36ddde 100644 --- a/modules/metadata/NWGNUheaders +++ b/modules/metadata/NWGNUheaders @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -108,7 +108,7 @@ NLM_THREAD_NAME = Headers Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -121,12 +121,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 @@ -136,7 +136,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 @@ -171,7 +171,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -202,8 +202,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -231,7 +231,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -244,6 +244,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/metadata/NWGNUmakefile b/modules/metadata/NWGNUmakefile index b9361aecf77..af837a03b14 100644 --- a/modules/metadata/NWGNUmakefile +++ b/modules/metadata/NWGNUmakefile @@ -10,7 +10,7 @@ SUBDIRS = \ # paths to tools # -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc # # build this level's files @@ -112,7 +112,7 @@ NLM_THREAD_NAME = # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -234,10 +234,10 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE - copy $(OBJDIR)\*.nlm $(INSTALL)\$(BASEDIR)\modules\*.* + $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/) # # Any specialized rules here @@ -248,6 +248,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/metadata/NWGNUmimemagi b/modules/metadata/NWGNUmimemagi index 04d92dfe7fb..25d42e3b908 100644 --- a/modules/metadata/NWGNUmimemagi +++ b/modules/metadata/NWGNUmimemagi @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -107,7 +107,7 @@ NLM_THREAD_NAME = minemagic Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -120,12 +120,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 @@ -135,7 +135,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 @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -201,8 +201,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -230,7 +230,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -243,6 +243,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/metadata/NWGNUmodident b/modules/metadata/NWGNUmodident index 42313e74058..98d8b368955 100644 --- a/modules/metadata/NWGNUmodident +++ b/modules/metadata/NWGNUmodident @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -107,7 +107,7 @@ NLM_THREAD_NAME = Mod_Ident Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -120,12 +120,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 @@ -135,7 +135,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 @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -201,8 +201,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -230,7 +230,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -243,6 +243,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/metadata/NWGNUmodversion b/modules/metadata/NWGNUmodversion index e2a4adfe204..02eab267ecb 100644 --- a/modules/metadata/NWGNUmodversion +++ b/modules/metadata/NWGNUmodversion @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -107,7 +107,7 @@ NLM_THREAD_NAME = Version Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -120,12 +120,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 @@ -135,7 +135,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 @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -201,8 +201,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -230,7 +230,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -243,6 +243,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/metadata/NWGNUuniqueid b/modules/metadata/NWGNUuniqueid index 2c31a903f6c..290b8903507 100644 --- a/modules/metadata/NWGNUuniqueid +++ b/modules/metadata/NWGNUuniqueid @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -107,7 +107,7 @@ NLM_THREAD_NAME = Unique ID Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -120,12 +120,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 @@ -135,7 +135,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 @@ -171,7 +171,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -202,8 +202,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -237,7 +237,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -252,6 +252,6 @@ vpath %.c ../arch/netware # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/metadata/NWGNUusertrk b/modules/metadata/NWGNUusertrk index 083d0b69634..d9452dd0d41 100644 --- a/modules/metadata/NWGNUusertrk +++ b/modules/metadata/NWGNUusertrk @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -107,7 +107,7 @@ NLM_THREAD_NAME = User Track Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -120,12 +120,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 @@ -135,7 +135,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 @@ -170,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -201,8 +201,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -230,7 +230,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -243,6 +243,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/proxy/NWGNUmakefile b/modules/proxy/NWGNUmakefile index 311282e21f0..3408ad0db39 100644 --- a/modules/proxy/NWGNUmakefile +++ b/modules/proxy/NWGNUmakefile @@ -10,7 +10,7 @@ SUBDIRS = \ # paths to tools # -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc # # build this level's files @@ -111,7 +111,7 @@ NLM_THREAD_NAME = # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -232,10 +232,10 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE - copy $(OBJDIR)\*.nlm $(INSTALL)\$(BASEDIR)\modules\*.* + $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/) # # Any specialized rules here @@ -246,6 +246,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/proxy/NWGNUproxy b/modules/proxy/NWGNUproxy index 98d792751bf..669baaf008a 100644 --- a/modules/proxy/NWGNUproxy +++ b/modules/proxy/NWGNUproxy @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -110,7 +110,7 @@ NLM_THREAD_NAME = Proxy Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -123,12 +123,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 @@ -138,7 +138,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 @@ -175,7 +175,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -206,8 +206,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @libc.imp \ $(EOLIST) @@ -241,7 +241,7 @@ nlms :: libs $(OBJDIR)/mod_proxy.imp $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -270,6 +270,6 @@ $(OBJDIR)/mod_proxy.imp: # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/proxy/NWGNUproxyajp b/modules/proxy/NWGNUproxyajp index 74a7cbfbe4e..0ee5f86615e 100644 --- a/modules/proxy/NWGNUproxyajp +++ b/modules/proxy/NWGNUproxyajp @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -108,7 +108,7 @@ NLM_THREAD_NAME = Proxy AJP Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -121,12 +121,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 @@ -136,7 +136,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 @@ -177,7 +177,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -209,8 +209,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @$(OBJDIR)/mod_proxy.imp \ @libc.imp \ $(EOLIST) @@ -245,7 +245,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -260,6 +260,6 @@ vpath %.c ../arch/netware # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/proxy/NWGNUproxybalancer b/modules/proxy/NWGNUproxybalancer index 147fc07a217..287722fd342 100644 --- a/modules/proxy/NWGNUproxybalancer +++ b/modules/proxy/NWGNUproxybalancer @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -108,7 +108,7 @@ NLM_THREAD_NAME = Prxy Blncr Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -121,12 +121,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 @@ -136,7 +136,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 @@ -173,7 +173,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -205,8 +205,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @$(OBJDIR)/mod_proxy.imp \ @libc.imp \ $(EOLIST) @@ -241,7 +241,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -256,6 +256,6 @@ vpath %.c ../arch/netware # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/proxy/NWGNUproxycon b/modules/proxy/NWGNUproxycon index 84353496e00..4d011bea144 100644 --- a/modules/proxy/NWGNUproxycon +++ b/modules/proxy/NWGNUproxycon @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -108,7 +108,7 @@ NLM_THREAD_NAME = Proxy Conn Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -121,12 +121,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 @@ -136,7 +136,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 @@ -172,7 +172,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -204,8 +204,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @$(OBJDIR)/mod_proxy.imp \ @libc.imp \ $(EOLIST) @@ -234,7 +234,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -247,6 +247,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/proxy/NWGNUproxyftp b/modules/proxy/NWGNUproxyftp index 4add9b0ac4d..bd8677c3c33 100644 --- a/modules/proxy/NWGNUproxyftp +++ b/modules/proxy/NWGNUproxyftp @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -108,7 +108,7 @@ NLM_THREAD_NAME = Proxy FTP Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -121,12 +121,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 @@ -136,7 +136,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 @@ -173,7 +173,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -205,8 +205,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @$(OBJDIR)/mod_proxy.imp \ @libc.imp \ $(EOLIST) @@ -241,7 +241,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -256,6 +256,6 @@ vpath %.c ../arch/netware # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/proxy/NWGNUproxyhtp b/modules/proxy/NWGNUproxyhtp index 94b3865497b..0bfebfe96d9 100644 --- a/modules/proxy/NWGNUproxyhtp +++ b/modules/proxy/NWGNUproxyhtp @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -108,7 +108,7 @@ NLM_THREAD_NAME = Proxy HTTP Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -121,12 +121,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 @@ -136,7 +136,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 @@ -173,7 +173,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -205,8 +205,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @$(OBJDIR)/mod_proxy.imp \ @libc.imp \ $(EOLIST) @@ -241,7 +241,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -256,6 +256,6 @@ vpath %.c ../arch/netware # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/proxy/NWGNUproxyscgi b/modules/proxy/NWGNUproxyscgi index 34f306ff23f..cbfc2765e67 100644 --- a/modules/proxy/NWGNUproxyscgi +++ b/modules/proxy/NWGNUproxyscgi @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -108,7 +108,7 @@ NLM_THREAD_NAME = Proxy SCGI Module # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -121,12 +121,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 @@ -136,7 +136,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 @@ -173,7 +173,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -205,8 +205,8 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ + @aprlib.imp \ + @httpd.imp \ @$(OBJDIR)/mod_proxy.imp \ @libc.imp \ $(EOLIST) @@ -241,7 +241,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -256,6 +256,6 @@ vpath %.c ../arch/netware # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/modules/ssl/NWGNUmakefile b/modules/ssl/NWGNUmakefile index 7a8821957a6..f674b0df1da 100644 --- a/modules/ssl/NWGNUmakefile +++ b/modules/ssl/NWGNUmakefile @@ -15,7 +15,7 @@ SUBDIRS = \ # paths to tools # -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc # # build this level's files @@ -129,7 +129,7 @@ NLM_THREAD_NAME = $(NLM_NAME) # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -142,12 +142,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 @@ -157,7 +157,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 @@ -195,7 +195,7 @@ FILES_nlm_objs := $(patsubst %.c,$(OBJDIR)/%.o,$(wildcard *.c)) # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(OSSLLIB)/crypto.lib \ $(OSSLLIB)/ssl.lib \ $(EOLIST) @@ -229,7 +229,7 @@ FILE_nlm_copyright = # FILES_nlm_Ximports = \ @libc.imp \ - @$(APR)/aprlib.imp \ + @aprlib.imp \ @httpd.imp \ GetProcessSwitchCount \ RunningProcess \ @@ -266,7 +266,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE copy $(OBJDIR)\mod_ssl.nlm $(INSTALL)\$(BASEDIR)\modules\*.* @@ -293,6 +293,6 @@ ssl_expr_scan.c : ssl_expr_scan.l # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/server/NWGNUmakefile b/server/NWGNUmakefile index 512adfdc8e6..16ce9734e53 100644 --- a/server/NWGNUmakefile +++ b/server/NWGNUmakefile @@ -11,7 +11,7 @@ SUBDIRS = \ # paths to tools # -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc # # build this level's files @@ -112,7 +112,7 @@ NLM_THREAD_NAME = genchars # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -124,12 +124,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 @@ -178,7 +178,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -247,5 +247,5 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/srclib/pcre/NWGNUmakefile b/srclib/pcre/NWGNUmakefile index dbf54437cd0..e744a744476 100644 --- a/srclib/pcre/NWGNUmakefile +++ b/srclib/pcre/NWGNUmakefile @@ -137,12 +137,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 @@ -192,7 +192,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # diff --git a/support/NWGNUab b/support/NWGNUab index 8d7b0370e22..ee2e0e808df 100644 --- a/support/NWGNUab +++ b/support/NWGNUab @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -116,7 +116,7 @@ NLM_SCREEN_NAME = DEFAULT # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -129,12 +129,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 @@ -144,7 +144,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 +179,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -210,7 +210,7 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ + @aprlib.imp \ @libc.imp \ $(EOLIST) @@ -237,7 +237,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -250,6 +250,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/support/NWGNUhtcacheclean b/support/NWGNUhtcacheclean index df66bf4b671..99199161829 100644 --- a/support/NWGNUhtcacheclean +++ b/support/NWGNUhtcacheclean @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -114,7 +114,7 @@ NLM_SCREEN_NAME = DEFAULT # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -127,12 +127,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 @@ -142,7 +142,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 @@ -177,7 +177,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -208,7 +208,7 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ + @aprlib.imp \ @libc.imp \ $(EOLIST) @@ -235,7 +235,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -248,6 +248,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/support/NWGNUhtdbm b/support/NWGNUhtdbm index 062693f9243..f448cc3c58d 100644 --- a/support/NWGNUhtdbm +++ b/support/NWGNUhtdbm @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -114,7 +114,7 @@ NLM_SCREEN_NAME = htdbm Password Management # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -127,12 +127,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 @@ -142,7 +142,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 @@ -177,7 +177,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -208,7 +208,7 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ + @aprlib.imp \ @libc.imp \ $(EOLIST) @@ -235,7 +235,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -248,6 +248,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/support/NWGNUhtdigest b/support/NWGNUhtdigest index 538e67937ad..5674d21dfe1 100644 --- a/support/NWGNUhtdigest +++ b/support/NWGNUhtdigest @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -114,7 +114,7 @@ NLM_SCREEN_NAME = Digest Password Management # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -127,12 +127,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 @@ -142,7 +142,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 @@ -177,7 +177,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -208,7 +208,7 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ + @aprlib.imp \ @libc.imp \ $(EOLIST) @@ -235,7 +235,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -248,6 +248,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/support/NWGNUhtpasswd b/support/NWGNUhtpasswd index d87adc3adae..990cd8e8492 100644 --- a/support/NWGNUhtpasswd +++ b/support/NWGNUhtpasswd @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -114,7 +114,7 @@ NLM_SCREEN_NAME = htpasswd Password Management # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -127,12 +127,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 @@ -142,7 +142,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 @@ -177,7 +177,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -208,7 +208,7 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ + @aprlib.imp \ @libc.imp \ $(EOLIST) @@ -235,7 +235,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -248,6 +248,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/support/NWGNUhttxt2dbm b/support/NWGNUhttxt2dbm index 97bccf97b8f..fc1d6232aa6 100644 --- a/support/NWGNUhttxt2dbm +++ b/support/NWGNUhttxt2dbm @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -114,7 +114,7 @@ NLM_SCREEN_NAME = httxt2dbm Conversion Utility # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -127,12 +127,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 @@ -142,7 +142,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 @@ -177,7 +177,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -208,7 +208,7 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ + @aprlib.imp \ @libc.imp \ $(EOLIST) @@ -235,7 +235,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -248,6 +248,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/support/NWGNUlogres b/support/NWGNUlogres index c2ad592943d..8597862a694 100644 --- a/support/NWGNUlogres +++ b/support/NWGNUlogres @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -115,7 +115,7 @@ NLM_SCREEN_NAME = Log Resolve # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -128,12 +128,12 @@ NLM_STACK_SIZE = 65536 # # 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 @@ -143,7 +143,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 @@ -178,7 +178,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -209,7 +209,7 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ + @aprlib.imp \ @libc.imp \ $(EOLIST) @@ -242,7 +242,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -255,6 +255,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/support/NWGNUmakefile b/support/NWGNUmakefile index 8116cbf033d..8c9d3d036e0 100644 --- a/support/NWGNUmakefile +++ b/support/NWGNUmakefile @@ -10,7 +10,7 @@ SUBDIRS = \ # paths to tools # -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc # # build this level's files @@ -110,7 +110,7 @@ NLM_THREAD_NAME = # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -232,7 +232,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE copy $(OBJDIR)\*.nlm $(INSTALL)\$(BASEDIR)\bin\*.* @@ -246,6 +246,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc diff --git a/support/NWGNUrotlogs b/support/NWGNUrotlogs index a74c2871280..37f3bd8624e 100644 --- a/support/NWGNUrotlogs +++ b/support/NWGNUrotlogs @@ -8,7 +8,7 @@ # ifndef EnvironmentDefined -include $(AP_WORK)\build\NWGNUhead.inc +include $(AP_WORK)/build/NWGNUhead.inc endif # @@ -113,7 +113,7 @@ NLM_SCREEN_NAME = DEFAULT # # If this is specified, it will override VERSION value in -# $(AP_WORK)\build\NWGNUenvironment.inc +# $(AP_WORK)/build/NWGNUenvironment.inc # NLM_VERSION = @@ -126,12 +126,12 @@ NLM_STACK_SIZE = 98304 # # 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 @@ -176,7 +176,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + $(PRELUDE) \ $(EOLIST) # @@ -207,7 +207,7 @@ FILE_nlm_copyright = # Any additional imports go here # FILES_nlm_Ximports = \ - @$(APR)/aprlib.imp \ + @aprlib.imp \ @libc.imp \ $(EOLIST) @@ -234,7 +234,7 @@ nlms :: libs $(TARGET_nlm) # # Updated this target to create necessary directories and copy files to the -# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) +# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE @@ -247,6 +247,6 @@ install :: nlms FORCE # in this makefile # -include $(AP_WORK)\build\NWGNUtail.inc +include $(APBUILD)/NWGNUtail.inc -- 2.47.2