From: Guenter Knauf Date: Fri, 23 Jul 2010 00:40:00 +0000 (+0000) Subject: Cleaned up NetWare makefiles: X-Git-Tag: 2.0.64~42 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9dcc0af84cb4c06d7c0046fbdd0d4512636782d;p=thirdparty%2Fapache%2Fhttpd.git Cleaned up NetWare makefiles: - removed obsolete -prefix compiler switch since already defined global for all files - removed obsolete include paths - changed include paths to use internal vars so hat apr/apr-util builds outside source tree - removed trailing tabs and spaces, other minor cosmetic changes git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@966915 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/NWGNUmakefile b/NWGNUmakefile index 8e92f45b1af..a30d89735ac 100644 --- a/NWGNUmakefile +++ b/NWGNUmakefile @@ -1,9 +1,40 @@ +# +# Define our required macro's if not already done. +# + +ifndef AP_WORK +export AP_WORK = $(CURDIR) +endif + +ifndef APR_WORK +ifeq "$(wildcard $(AP_WORK)/srclib/apr)" "$(AP_WORK)/srclib/apr" +export APR_WORK = $(AP_WORK)/srclib/apr +endif +endif +ifneq "$(wildcard $(APR_WORK)/include/apr_version.h)" "$(APR_WORK)/include/apr_version.h" +$(error APR_WORK does not point to a valid APR source tree) +endif + +ifndef APU_WORK +ifeq "$(wildcard $(AP_WORK)/srclib/apr-util)" "$(AP_WORK)/srclib/apr-util" +export APU_WORK = $(AP_WORK)/srclib/apr-util +endif +endif +ifndef APU_WORK +ifeq "$(wildcard $(APR_WORK)/include/apu_version.h)" "$(APR_WORK)/include/apu_version.h" +export APU_WORK = $(APR_WORK) +endif +endif +ifneq "$(wildcard $(APU_WORK)/include/apu_version.h)" "$(APU_WORK)/include/apu_version.h" +$(error APU_WORK does not point to a valid APU source tree) +endif + # # Declare the sub-directories to be built here # SUBDIRS = \ - srclib\apr \ + $(APR_WORK) \ build \ support \ modules \ @@ -28,9 +59,8 @@ include $(AP_WORK)\build\NWGNUhead.inc # INCDIRS # XINCDIRS += \ - $(AP_WORK)/srclib/apr/include \ - $(AP_WORK)/srclib/include/arch/NetWare \ - $(AP_WORK)/srclib/apr-util/include \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ $(AP_WORK)/modules/filters/ \ $(AP_WORK)/modules/generators/ \ @@ -38,9 +68,8 @@ XINCDIRS += \ $(AP_WORK)/modules/loggers/ \ $(AP_WORK)/modules/mappers/ \ $(AP_WORK)/modules/proxy/ \ - $(AP_WORK)/os/NetWare \ $(AP_WORK)/server/mpm/NetWare \ - $(AP_WORK)/srclib/pcre \ + $(PCRE) \ $(NWOS) \ $(EOLIST) diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc index 0bf002bb5a5..3510009b562 100644 --- a/build/NWGNUenvironment.inc +++ b/build/NWGNUenvironment.inc @@ -271,14 +271,14 @@ endif STDMOD = $(AP_WORK)/modules NWOS = $(AP_WORK)/os/netware SERVER = $(AP_WORK)/server -SRC = $(AP_WORK) -APR = $(AP_WORK)/srclib/apr -APRUTIL = $(AP_WORK)/srclib/apr-util +SRC = $(AP_WORK) +APR = $(APR_WORK) +APRUTIL = $(APU_WORK) SUPMOD = $(AP_WORK)/support PCRE = $(AP_WORK)/srclib/pcre -APRTEST = $(AP_WORK)/srclib/apr/test +APRTEST = $(APR_WORK)/test HTTPD = $(AP_WORK)/modules/http -XML = $(AP_WORK)/srclib/apr-util/xml +XML = $(APU_WORK)/xml # # Internal Libraries diff --git a/build/NWGNUmakefile b/build/NWGNUmakefile index 00941820db0..144c8216e7d 100644 --- a/build/NWGNUmakefile +++ b/build/NWGNUmakefile @@ -46,8 +46,8 @@ $(NLM_NAME)_cc.opt : NWGNUmakefile $(AP_WORK)\build\NWGNUenvironment.inc $(AP_WO @echo -I..\modules\aaa >> $@ @echo -I..\os\netware >> $@ @echo -I..\server\mpm\netware >> $@ - @echo -I..\srclib\apr\include >> $@ - @echo -I..\srclib\apr-util\include >> $@ + @echo -I$(APR)\include >> $@ + @echo -I$(APRUTIL)\include >> $@ @echo -ir $(NOVELLLIBC) >> $@ $(APR)/include/%.h: $(subst /,\,$(APR))\include\%.hnw diff --git a/modules/aaa/NWGNUauthanon b/modules/aaa/NWGNUauthanon index 1847e7d3454..6881d8a6b1d 100644 --- a/modules/aaa/NWGNUauthanon +++ b/modules/aaa/NWGNUauthanon @@ -16,19 +16,16 @@ endif # INCDIRS # XINCDIRS += \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/srclib/apr/include \ - $(AP_WORK)/srclib/apr-util/include \ - $(AP_WORK)/srclib/apr \ $(EOLIST) # # These flags will come after CFLAGS # XCFLAGS += \ - -prefix pre_nw.h \ $(EOLIST) # @@ -58,7 +55,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "noopt" @@ -72,7 +69,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "release" @@ -94,10 +91,10 @@ endif # This is used by the link 'name' directive to name the nlm. If left blank # TARGET_nlm (see below) will be used. # -NLM_NAME = authanon +NLM_NAME = authanon # -# This is used by the link '-desc ' directive. +# This is used by the link '-desc ' directive. # If left blank, NLM_NAME will be used. # NLM_DESCRIPTION = Authentication Anonymous Module @@ -109,10 +106,10 @@ NLM_DESCRIPTION = Authentication Anonymous Module NLM_THREAD_NAME = AuthAnon Module # -# If this is specified, it will override VERSION value in +# If this is specified, it will override VERSION value in # $(AP_WORK)\build\NWGNUenvironment.inc # -NLM_VERSION = +NLM_VERSION = # # If this is specified, it will override the default of 64K @@ -138,14 +135,14 @@ NLM_CHECK_SYM = # # If these are specified it will be used by the link '-flags' directive # -NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION +NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION # -# If this is specified it will be linked in with the XDCData option in the def +# If this is specified it will be linked in with the XDCData option in the def # file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled # by setting APACHE_UNIPROC in the environment # -XDCDATA = +XDCDATA = # # If there is an NLM target, put it here @@ -173,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + libcpre.o \ $(EOLIST) # @@ -189,7 +186,7 @@ FILES_nlm_modules = \ # If the nlm has a msg file, put it's path here # FILE_nlm_msg = - + # # If the nlm has a hlp file put it's path here # @@ -208,20 +205,20 @@ FILES_nlm_Ximports = \ @$(NWOS)/httpd.imp \ @libc.imp \ $(EOLIST) - -# + +# # Any symbols exported to here # FILES_nlm_exports = \ auth_anon_module \ $(EOLIST) - -# + +# # These are the OBJ files needed to create the LIB target above. # Paths must all use the '/' character # FILES_lib_objs = \ - $(EOLIST) + $(EOLIST) # # implement targets and dependancies (leave this section alone) @@ -232,7 +229,7 @@ libs :: $(OBJDIR) $(TARGET_lib) nlms :: libs $(TARGET_nlm) # -# Updated this target to create necessary directories and copy files to the +# Updated this target to create necessary directories and copy files to the # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE @@ -248,3 +245,4 @@ install :: nlms FORCE include $(AP_WORK)\build\NWGNUtail.inc + diff --git a/modules/aaa/NWGNUauthdbm b/modules/aaa/NWGNUauthdbm index a64e7ec732c..fe05c3d14cf 100644 --- a/modules/aaa/NWGNUauthdbm +++ b/modules/aaa/NWGNUauthdbm @@ -16,12 +16,10 @@ endif # INCDIRS # XINCDIRS += \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/srclib/apr/include \ - $(AP_WORK)/srclib/apr-util/include \ - $(AP_WORK)/srclib/apr \ $(EOLIST) # @@ -57,7 +55,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "noopt" @@ -71,7 +69,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "release" @@ -93,10 +91,10 @@ endif # This is used by the link 'name' directive to name the nlm. If left blank # TARGET_nlm (see below) will be used. # -NLM_NAME = authdbm +NLM_NAME = authdbm # -# This is used by the link '-desc ' directive. +# This is used by the link '-desc ' directive. # If left blank, NLM_NAME will be used. # NLM_DESCRIPTION = Database Authentication Module @@ -108,10 +106,10 @@ NLM_DESCRIPTION = Database Authentication Module NLM_THREAD_NAME = AuthDBM Module # -# If this is specified, it will override VERSION value in +# If this is specified, it will override VERSION value in # $(AP_WORK)\build\NWGNUenvironment.inc # -NLM_VERSION = +NLM_VERSION = # # If this is specified, it will override the default of 64K @@ -137,14 +135,14 @@ NLM_CHECK_SYM = # # If these are specified it will be used by the link '-flags' directive # -NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION +NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION # -# If this is specified it will be linked in with the XDCData option in the def +# If this is specified it will be linked in with the XDCData option in the def # file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled # by setting APACHE_UNIPROC in the environment # -XDCDATA = +XDCDATA = # # If there is an NLM target, put it here @@ -172,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + libcpre.o \ $(EOLIST) # @@ -188,7 +186,7 @@ FILES_nlm_modules = \ # If the nlm has a msg file, put it's path here # FILE_nlm_msg = - + # # If the nlm has a hlp file put it's path here # @@ -207,20 +205,20 @@ FILES_nlm_Ximports = \ @$(NWOS)/httpd.imp \ @libc.imp \ $(EOLIST) - -# + +# # Any symbols exported to here # FILES_nlm_exports = \ auth_dbm_module \ $(EOLIST) - -# + +# # These are the OBJ files needed to create the LIB target above. # Paths must all use the '/' character # FILES_lib_objs = \ - $(EOLIST) + $(EOLIST) # # implement targets and dependancies (leave this section alone) @@ -231,7 +229,7 @@ libs :: $(OBJDIR) $(TARGET_lib) nlms :: libs $(TARGET_nlm) # -# Updated this target to create necessary directories and copy files to the +# Updated this target to create necessary directories and copy files to the # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE @@ -247,3 +245,4 @@ install :: nlms FORCE include $(AP_WORK)\build\NWGNUtail.inc + diff --git a/modules/aaa/NWGNUdigest b/modules/aaa/NWGNUdigest index 76e988c7b7b..cf41db72e6e 100644 --- a/modules/aaa/NWGNUdigest +++ b/modules/aaa/NWGNUdigest @@ -16,12 +16,10 @@ endif # INCDIRS # XINCDIRS += \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/srclib/apr/include \ - $(AP_WORK)/srclib/apr-util/include \ - $(AP_WORK)/srclib/apr \ $(EOLIST) # @@ -57,7 +55,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "noopt" @@ -71,7 +69,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "release" @@ -93,10 +91,10 @@ endif # This is used by the link 'name' directive to name the nlm. If left blank # TARGET_nlm (see below) will be used. # -NLM_NAME = digest +NLM_NAME = digest # -# This is used by the link '-desc ' directive. +# This is used by the link '-desc ' directive. # If left blank, NLM_NAME will be used. # NLM_DESCRIPTION = Digest Authentication Module @@ -108,10 +106,10 @@ NLM_DESCRIPTION = Digest Authentication Module NLM_THREAD_NAME = Digest Module # -# If this is specified, it will override VERSION value in +# If this is specified, it will override VERSION value in # $(AP_WORK)\build\NWGNUenvironment.inc # -NLM_VERSION = +NLM_VERSION = # # If this is specified, it will override the default of 64K @@ -137,14 +135,14 @@ NLM_CHECK_SYM = # # If these are specified it will be used by the link '-flags' directive # -NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION +NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION # -# If this is specified it will be linked in with the XDCData option in the def +# If this is specified it will be linked in with the XDCData option in the def # file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled # by setting APACHE_UNIPROC in the environment # -XDCDATA = +XDCDATA = # # If there is an NLM target, put it here @@ -172,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + libcpre.o \ $(EOLIST) # @@ -188,7 +186,7 @@ FILES_nlm_modules = \ # If the nlm has a msg file, put it's path here # FILE_nlm_msg = - + # # If the nlm has a hlp file put it's path here # @@ -207,20 +205,20 @@ FILES_nlm_Ximports = \ @$(NWOS)/httpd.imp \ @libc.imp \ $(EOLIST) - -# + +# # Any symbols exported to here # FILES_nlm_exports = \ auth_digest_module \ $(EOLIST) - -# + +# # These are the OBJ files needed to create the LIB target above. # Paths must all use the '/' character # FILES_lib_objs = \ - $(EOLIST) + $(EOLIST) # # implement targets and dependancies (leave this section alone) @@ -231,7 +229,7 @@ libs :: $(OBJDIR) $(TARGET_lib) nlms :: libs $(TARGET_nlm) # -# Updated this target to create necessary directories and copy files to the +# Updated this target to create necessary directories and copy files to the # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE @@ -247,3 +245,4 @@ install :: nlms FORCE include $(AP_WORK)\build\NWGNUtail.inc + diff --git a/modules/dav/fs/NWGNUmakefile b/modules/dav/fs/NWGNUmakefile index f37cb18278e..1569be42685 100644 --- a/modules/dav/fs/NWGNUmakefile +++ b/modules/dav/fs/NWGNUmakefile @@ -3,7 +3,7 @@ # SUBDIRS = \ - $(EOLIST) + $(EOLIST) # # Get the 'head' of the build environment. This includes default targets and @@ -24,14 +24,11 @@ include $(AP_WORK)\build\NWGNUhead.inc # INCDIRS # XINCDIRS += \ - $(AP_WORK)/srclib/apr/include \ - $(AP_WORK)/srclib/include/arch/NetWare \ - $(AP_WORK)/srclib/apr-util/include \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ - $(AP_WORK)/os/NetWare \ - $(AP_WORK)/server/mpm/NetWare \ - $(AP_WORK)/srclib/pcre \ $(AP_WORK)/modules/dav/main \ + $(AP_WORK)/server/mpm/NetWare \ $(NWOS) \ $(EOLIST) @@ -68,7 +65,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "noopt" @@ -82,7 +79,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "release" @@ -104,10 +101,10 @@ endif # This is used by the link 'name' directive to name the nlm. If left blank # TARGET_nlm (see below) will be used. # -NLM_NAME = modDAVFS +NLM_NAME = modDAVFS # -# This is used by the link '-desc ' directive. +# This is used by the link '-desc ' directive. # If left blank, NLM_NAME will be used. # NLM_DESCRIPTION = Apache $(VERSION_STR) DAV FileSystem Sub-Module @@ -119,16 +116,16 @@ NLM_DESCRIPTION = Apache $(VERSION_STR) DAV FileSystem Sub-Module NLM_THREAD_NAME = modDAVFS Thread # -# If this is specified, it will override VERSION value in +# If this is specified, it will override VERSION value in # $(AP_WORK)\build\NWGNUenvironment.inc # -NLM_VERSION = +NLM_VERSION = # # If this is specified, it will override the default of 64K # NLM_STACK_SIZE = 65536 - + # # If this is specified it will be used by the link '-entry' directive @@ -148,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 = AUTOUNLOAD, PSEUDOPREEMPTION # # Declare all target files (you must add your files here) @@ -184,7 +181,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + libcpre.o \ $(EOLIST) # @@ -201,7 +198,7 @@ FILES_nlm_modules = \ # If the nlm has a msg file, put it's path here # FILE_nlm_msg = - + # # If the nlm has a hlp file put it's path here # @@ -222,20 +219,20 @@ FILES_nlm_Ximports = \ @ws2nlm.imp \ @../main/dav.imp \ $(EOLIST) - -# + +# # Any symbols exported to here # FILES_nlm_exports = \ dav_fs_module \ $(EOLIST) - -# + +# # These are the OBJ files needed to create the LIB target above. # Paths must all use the '/' character # FILES_lib_objs = \ - $(EOLIST) + $(EOLIST) # # implement targets and dependancies (leave this section alone) @@ -246,7 +243,7 @@ libs :: $(OBJDIR) $(TARGET_lib) nlms :: libs $(TARGET_nlm) # -# Updated this target to create necessary directories and copy files to the +# Updated this target to create necessary directories and copy files to the # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE @@ -267,4 +264,3 @@ $(OBJDIR)/%.o: ../../arch/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt include $(AP_WORK)\build\NWGNUtail.inc - diff --git a/modules/dav/main/NWGNUmakefile b/modules/dav/main/NWGNUmakefile index a692a2f9204..8546d6a38db 100644 --- a/modules/dav/main/NWGNUmakefile +++ b/modules/dav/main/NWGNUmakefile @@ -3,7 +3,7 @@ # SUBDIRS = \ - $(EOLIST) + $(EOLIST) # # Get the 'head' of the build environment. This includes default targets and @@ -23,13 +23,10 @@ include $(AP_WORK)\build\NWGNUhead.inc # INCDIRS # XINCDIRS += \ - $(AP_WORK)/srclib/apr/include \ - $(AP_WORK)/srclib/include/arch/NetWare \ - $(AP_WORK)/srclib/apr-util/include \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ - $(AP_WORK)/os/NetWare \ $(AP_WORK)/server/mpm/NetWare \ - $(AP_WORK)/srclib/pcre \ $(NWOS) \ $(EOLIST) @@ -66,7 +63,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "noopt" @@ -80,7 +77,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "release" @@ -102,10 +99,10 @@ endif # This is used by the link 'name' directive to name the nlm. If left blank # TARGET_nlm (see below) will be used. # -NLM_NAME = mod_DAV +NLM_NAME = mod_DAV # -# This is used by the link '-desc ' directive. +# This is used by the link '-desc ' directive. # If left blank, NLM_NAME will be used. # NLM_DESCRIPTION = Apache $(VERSION_STR) DAV module @@ -117,16 +114,16 @@ NLM_DESCRIPTION = Apache $(VERSION_STR) DAV module NLM_THREAD_NAME = mod_DAV # -# If this is specified, it will override VERSION value in +# If this is specified, it will override VERSION value in # $(AP_WORK)\build\NWGNUenvironment.inc # -NLM_VERSION = +NLM_VERSION = # # If this is specified, it will override the default of 64K # NLM_STACK_SIZE = 65536 - + # # If this is specified it will be used by the link '-entry' directive @@ -146,14 +143,14 @@ NLM_CHECK_SYM = # # If this is specified it will be used by the link '-flags' directive # -NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION - +NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION + # -# If this is specified it will be linked in with the XDCData option in the def +# If this is specified it will be linked in with the XDCData option in the def # file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled # by setting APACHE_UNIPROC in the environment # -XDCDATA = +XDCDATA = # # Declare all target files (you must add your files here) @@ -191,7 +188,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + libcpre.o \ $(EOLIST) # @@ -207,7 +204,7 @@ FILES_nlm_modules = \ # If the nlm has a msg file, put it's path here # FILE_nlm_msg = - + # # If the nlm has a hlp file put it's path here # @@ -226,21 +223,21 @@ FILES_nlm_Ximports = \ @$(APR)/aprlib.imp \ @httpd.imp \ $(EOLIST) - -# + +# # Any symbols exported to here # FILES_nlm_exports = \ dav_module \ @dav.imp \ $(EOLIST) - -# + +# # These are the OBJ files needed to create the LIB target above. # Paths must all use the '/' character # FILES_lib_objs = \ - $(EOLIST) + $(EOLIST) # # implement targets and dependancies (leave this section alone) @@ -251,12 +248,12 @@ libs :: $(OBJDIR) $(TARGET_lib) nlms :: libs $(TARGET_nlm) # -# Updated this target to create necessary directories and copy files to the +# Updated this target to create necessary directories and copy files to the # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE copy $(OBJDIR)\mod_dav.nlm $(INSTALL)\Apache2\modules\*.* - + # # Any specialized rules here # @@ -269,4 +266,3 @@ install :: nlms FORCE include $(AP_WORK)\build\NWGNUtail.inc - diff --git a/modules/echo/NWGNUmakefile b/modules/echo/NWGNUmakefile index 3fc4a12c10d..a2eecb32bce 100644 --- a/modules/echo/NWGNUmakefile +++ b/modules/echo/NWGNUmakefile @@ -3,7 +3,7 @@ # SUBDIRS = \ - $(EOLIST) + $(EOLIST) # # Get the 'head' of the build environment. This includes default targets and @@ -24,19 +24,16 @@ include $(AP_WORK)\build\NWGNUhead.inc # INCDIRS # XINCDIRS += \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/srclib/apr/include \ - $(AP_WORK)/srclib/apr-util/include \ - $(AP_WORK)/srclib/apr \ $(EOLIST) # # These flags will come after CFLAGS # XCFLAGS += \ - -prefix pre_nw.h \ $(EOLIST) # @@ -66,7 +63,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "noopt" @@ -80,7 +77,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "release" @@ -102,10 +99,10 @@ endif # This is used by the link 'name' directive to name the nlm. If left blank # TARGET_nlm (see below) will be used. # -NLM_NAME = echo +NLM_NAME = echo # -# This is used by the link '-desc ' directive. +# This is used by the link '-desc ' directive. # If left blank, NLM_NAME will be used. # NLM_DESCRIPTION = Apache $(VERSION_STR) Echo Module @@ -117,10 +114,10 @@ NLM_DESCRIPTION = Apache $(VERSION_STR) Echo Module NLM_THREAD_NAME = Echo Module # -# If this is specified, it will override VERSION value in +# If this is specified, it will override VERSION value in # $(AP_WORK)\build\NWGNUenvironment.inc # -NLM_VERSION = +NLM_VERSION = # # If this is specified, it will override the default of 64K @@ -146,14 +143,14 @@ NLM_CHECK_SYM = # # If these are specified it will be used by the link '-flags' directive # -NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION +NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION # -# If this is specified it will be linked in with the XDCData option in the def +# If this is specified it will be linked in with the XDCData option in the def # file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled # by setting APACHE_UNIPROC in the environment # -XDCDATA = +XDCDATA = # # If there is an NLM target, put it here @@ -181,7 +178,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + libcpre.o \ $(EOLIST) # @@ -197,7 +194,7 @@ FILES_nlm_modules = \ # If the nlm has a msg file, put it's path here # FILE_nlm_msg = - + # # If the nlm has a hlp file put it's path here # @@ -216,20 +213,20 @@ FILES_nlm_Ximports = \ @$(NWOS)/httpd.imp \ @libc.imp \ $(EOLIST) - -# + +# # Any symbols exported to here # FILES_nlm_exports = \ echo_module \ $(EOLIST) - -# + +# # These are the OBJ files needed to create the LIB target above. # Paths must all use the '/' character # FILES_lib_objs = \ - $(EOLIST) + $(EOLIST) # # implement targets and dependancies (leave this section alone) @@ -240,7 +237,7 @@ libs :: $(OBJDIR) $(TARGET_lib) nlms :: libs $(TARGET_nlm) # -# Updated this target to create necessary directories and copy files to the +# Updated this target to create necessary directories and copy files to the # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE @@ -258,4 +255,3 @@ install :: nlms FORCE include $(AP_WORK)\build\NWGNUtail.inc - diff --git a/modules/experimental/NWGNUauthldap b/modules/experimental/NWGNUauthldap index 6115ccbe2c7..4963a1dd6cf 100644 --- a/modules/experimental/NWGNUauthldap +++ b/modules/experimental/NWGNUauthldap @@ -16,11 +16,10 @@ endif # INCDIRS # XINCDIRS += \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ $(NWOS) \ - $(AP_WORK)/srclib/apr/include \ - $(AP_WORK)/srclib/apr-util/include \ - $(AP_WORK)/srclib/apr \ $(LDAPSDK)/inc \ $(EOLIST) @@ -28,7 +27,6 @@ XINCDIRS += \ # These flags will come after CFLAGS # XCFLAGS += \ - -prefix pre_nw.h \ $(EOLIST) # @@ -58,7 +56,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "noopt" @@ -72,7 +70,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "release" @@ -94,10 +92,10 @@ endif # This is used by the link 'name' directive to name the nlm. If left blank # TARGET_nlm (see below) will be used. # -NLM_NAME = authldap +NLM_NAME = authldap # -# This is used by the link '-desc ' directive. +# This is used by the link '-desc ' directive. # If left blank, NLM_NAME will be used. # NLM_DESCRIPTION = Apache $(VERSION_STR) LDAP Authentication Module @@ -109,10 +107,10 @@ NLM_DESCRIPTION = Apache $(VERSION_STR) LDAP Authentication Module NLM_THREAD_NAME = AuthLDAP Module # -# If this is specified, it will override VERSION value in +# If this is specified, it will override VERSION value in # $(AP_WORK)\build\NWGNUenvironment.inc # -NLM_VERSION = +NLM_VERSION = # # If this is specified, it will override the default of 64K @@ -138,14 +136,14 @@ NLM_CHECK_SYM = # # If these are specified it will be used by the link '-flags' directive # -NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION +NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION # -# If this is specified it will be linked in with the XDCData option in the def +# If this is specified it will be linked in with the XDCData option in the def # file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled # by setting APACHE_UNIPROC in the environment # -XDCDATA = +XDCDATA = # # If there is an NLM target, put it here @@ -173,7 +171,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + libcpre.o \ $(EOLIST) # @@ -192,7 +190,7 @@ FILES_nlm_modules = \ # If the nlm has a msg file, put it's path here # FILE_nlm_msg = - + # # If the nlm has a hlp file put it's path here # @@ -219,20 +217,20 @@ FILES_nlm_Ximports = \ @libc.imp \ @$(LDAPSDK)/imports/lldapsdk.imp \ $(EOLIST) - -# + +# # Any symbols exported to here # FILES_nlm_exports = \ auth_ldap_module \ $(EOLIST) - -# + +# # These are the OBJ files needed to create the LIB target above. # Paths must all use the '/' character # FILES_lib_objs = \ - $(EOLIST) + $(EOLIST) # # implement targets and dependancies (leave this section alone) @@ -243,7 +241,7 @@ libs :: $(OBJDIR) $(TARGET_lib) nlms :: libs $(TARGET_nlm) # -# Updated this target to create necessary directories and copy files to the +# Updated this target to create necessary directories and copy files to the # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE @@ -261,3 +259,4 @@ install :: nlms FORCE include $(AP_WORK)\build\NWGNUtail.inc + diff --git a/modules/experimental/NWGNUcharsetl b/modules/experimental/NWGNUcharsetl index e6b37ff25b9..b4e4f5959ff 100644 --- a/modules/experimental/NWGNUcharsetl +++ b/modules/experimental/NWGNUcharsetl @@ -24,12 +24,10 @@ include $(AP_WORK)\build\NWGNUhead.inc # INCDIRS # XINCDIRS += \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/srclib/apr/include \ - $(AP_WORK)/srclib/apr-util/include \ - $(AP_WORK)/srclib/apr \ $(EOLIST) # @@ -42,7 +40,7 @@ XCFLAGS += \ # These defines will come after DEFINES # XDEFINES += \ - -DAP_WANT_DIR_TRANSLATION \ + -DAP_WANT_DIR_TRANSLATION \ $(EOLIST) # @@ -102,7 +100,7 @@ endif # This is used by the link 'name' directive to name the nlm. If left blank # TARGET_nlm (see below) will be used. # -NLM_NAME = charsetl +NLM_NAME = charsetl # # This is used by the link '-desc ' directive. @@ -120,7 +118,7 @@ NLM_THREAD_NAME = charsetl # If this is specified, it will override VERSION value in # $(AP_WORK)\build\NWGNUenvironment.inc # -NLM_VERSION = +NLM_VERSION = # # If this is specified, it will override the default of 64K @@ -146,14 +144,14 @@ NLM_CHECK_SYM = # # If these are specified it will be used by the link '-flags' directive # -NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION +NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION # # If this is specified it will be linked in with the XDCData option in the def # file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled # by setting APACHE_UNIPROC in the environment # -XDCDATA = +XDCDATA = # # If there is an NLM target, put it here @@ -229,7 +227,7 @@ FILES_nlm_exports = \ # Paths must all use the '/' character # FILES_lib_objs = \ - $(EOLIST) + $(EOLIST) # # implement targets and dependancies (leave this section alone) @@ -257,4 +255,3 @@ install :: nlms FORCE include $(AP_WORK)\build\NWGNUtail.inc - diff --git a/modules/experimental/NWGNUdsk_cach b/modules/experimental/NWGNUdsk_cach index 6780d123905..879dd86ef74 100644 --- a/modules/experimental/NWGNUdsk_cach +++ b/modules/experimental/NWGNUdsk_cach @@ -3,7 +3,7 @@ # SUBDIRS = \ - $(EOLIST) + $(EOLIST) # # Get the 'head' of the build environment. This includes default targets and @@ -23,13 +23,9 @@ include $(AP_WORK)\build\NWGNUhead.inc # INCDIRS # XINCDIRS += \ - $(AP_WORK)/srclib/apr/include \ - $(AP_WORK)/srclib/include/arch/NetWare \ - $(AP_WORK)/srclib/apr-util/include \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ - $(AP_WORK)/os/NetWare \ - $(AP_WORK)/server/mpm/NetWare \ - $(AP_WORK)/srclib/pcre \ $(NWOS) \ $(EOLIST) @@ -66,7 +62,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "noopt" @@ -80,7 +76,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "release" @@ -102,10 +98,10 @@ endif # This is used by the link 'name' directive to name the nlm. If left blank # TARGET_nlm (see below) will be used. # -NLM_NAME = dsk_cach +NLM_NAME = dsk_cach # -# This is used by the link '-desc ' directive. +# This is used by the link '-desc ' directive. # If left blank, NLM_NAME will be used. # NLM_DESCRIPTION = Apache $(VERSION_STR) Memory Cache Sub-Module @@ -117,16 +113,16 @@ NLM_DESCRIPTION = Apache $(VERSION_STR) Memory Cache Sub-Module NLM_THREAD_NAME = dsk_cach # -# If this is specified, it will override VERSION value in +# If this is specified, it will override VERSION value in # $(AP_WORK)\build\NWGNUenvironment.inc # -NLM_VERSION = +NLM_VERSION = # # If this is specified, it will override the default of 64K # NLM_STACK_SIZE = 65536 - + # # If this is specified it will be used by the link '-entry' directive @@ -146,14 +142,14 @@ NLM_CHECK_SYM = # # If this is specified it will be used by the link '-flags' directive # -NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION - +NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION + # -# If this is specified it will be linked in with the XDCData option in the def +# If this is specified it will be linked in with the XDCData option in the def # file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled # by setting APACHE_UNIPROC in the environment # -XDCDATA = +XDCDATA = # # Declare all target files (you must add your files here) @@ -185,7 +181,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + libcpre.o \ $(EOLIST) # @@ -202,7 +198,7 @@ FILES_nlm_modules = \ # If the nlm has a msg file, put it's path here # FILE_nlm_msg = - + # # If the nlm has a hlp file put it's path here # @@ -222,21 +218,20 @@ FILES_nlm_Ximports = \ @httpd.imp \ @mod_cache.imp \ $(EOLIST) - -# + +# # Any symbols exported to here # FILES_nlm_exports = \ disk_cache_module \ $(EOLIST) - -# @cache.imp \ -# + +# # These are the OBJ files needed to create the LIB target above. # Paths must all use the '/' character # FILES_lib_objs = \ - $(EOLIST) + $(EOLIST) # # implement targets and dependancies (leave this section alone) @@ -247,11 +242,11 @@ libs :: $(OBJDIR) $(TARGET_lib) nlms :: libs $(TARGET_nlm) # -# Updated this target to create necessary directories and copy files to the +# Updated this target to create necessary directories and copy files to the # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE - + # # Any specialized rules here # @@ -264,4 +259,3 @@ install :: nlms FORCE include $(AP_WORK)\build\NWGNUtail.inc - diff --git a/modules/experimental/NWGNUexample b/modules/experimental/NWGNUexample index adf0507955f..01b7b85e4ef 100644 --- a/modules/experimental/NWGNUexample +++ b/modules/experimental/NWGNUexample @@ -24,19 +24,16 @@ include $(AP_WORK)\build\NWGNUhead.inc # INCDIRS # XINCDIRS += \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/srclib/apr/include \ - $(AP_WORK)/srclib/apr-util/include \ - $(AP_WORK)/srclib/apr \ $(EOLIST) # # These flags will come after CFLAGS # XCFLAGS += \ - -prefix pre_nw.h \ $(EOLIST) # @@ -80,7 +77,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "release" @@ -102,7 +99,7 @@ endif # This is used by the link 'name' directive to name the nlm. If left blank # TARGET_nlm (see below) will be used. # -NLM_NAME = example +NLM_NAME = example # # This is used by the link '-desc ' directive. @@ -120,7 +117,7 @@ NLM_THREAD_NAME = Example Module # If this is specified, it will override VERSION value in # $(AP_WORK)\build\NWGNUenvironment.inc # -NLM_VERSION = +NLM_VERSION = # # If this is specified, it will override the default of 64K @@ -146,14 +143,14 @@ NLM_CHECK_SYM = # # If these are specified it will be used by the link '-flags' directive # -NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION +NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION # # If this is specified it will be linked in with the XDCData option in the def # file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled # by setting APACHE_UNIPROC in the environment # -XDCDATA = +XDCDATA = # # If there is an NLM target, put it here @@ -181,7 +178,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + libcpre.o \ $(EOLIST) # @@ -229,7 +226,7 @@ FILES_nlm_exports = \ # Paths must all use the '/' character # FILES_lib_objs = \ - $(EOLIST) + $(EOLIST) # # implement targets and dependancies (leave this section alone) @@ -257,4 +254,3 @@ install :: nlms FORCE include $(AP_WORK)\build\NWGNUtail.inc - diff --git a/modules/experimental/NWGNUmem_cach b/modules/experimental/NWGNUmem_cach index 6d83d8ae69a..236d867afe0 100644 --- a/modules/experimental/NWGNUmem_cach +++ b/modules/experimental/NWGNUmem_cach @@ -3,7 +3,7 @@ # SUBDIRS = \ - $(EOLIST) + $(EOLIST) # # Get the 'head' of the build environment. This includes default targets and @@ -23,13 +23,9 @@ include $(AP_WORK)\build\NWGNUhead.inc # INCDIRS # XINCDIRS += \ - $(AP_WORK)/srclib/apr/include \ - $(AP_WORK)/srclib/include/arch/NetWare \ - $(AP_WORK)/srclib/apr-util/include \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ - $(AP_WORK)/os/NetWare \ - $(AP_WORK)/server/mpm/NetWare \ - $(AP_WORK)/srclib/pcre \ $(NWOS) \ $(EOLIST) @@ -67,7 +63,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "noopt" @@ -81,7 +77,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "release" @@ -103,10 +99,10 @@ endif # This is used by the link 'name' directive to name the nlm. If left blank # TARGET_nlm (see below) will be used. # -NLM_NAME = mem_cach +NLM_NAME = mem_cach # -# This is used by the link '-desc ' directive. +# This is used by the link '-desc ' directive. # If left blank, NLM_NAME will be used. # NLM_DESCRIPTION = Apache $(VERSION_STR) Memory Cache Sub-Module @@ -118,16 +114,16 @@ NLM_DESCRIPTION = Apache $(VERSION_STR) Memory Cache Sub-Module NLM_THREAD_NAME = mem_cach # -# If this is specified, it will override VERSION value in +# If this is specified, it will override VERSION value in # $(AP_WORK)\build\NWGNUenvironment.inc # -NLM_VERSION = +NLM_VERSION = # # If this is specified, it will override the default of 64K # NLM_STACK_SIZE = 65536 - + # # If this is specified it will be used by the link '-entry' directive @@ -147,14 +143,14 @@ NLM_CHECK_SYM = # # If this is specified it will be used by the link '-flags' directive # -NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION - +NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION + # -# If this is specified it will be linked in with the XDCData option in the def +# If this is specified it will be linked in with the XDCData option in the def # file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled # by setting APACHE_UNIPROC in the environment # -XDCDATA = +XDCDATA = # # Declare all target files (you must add your files here) @@ -189,7 +185,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + libcpre.o \ $(EOLIST) # @@ -206,7 +202,7 @@ FILES_nlm_modules = \ # If the nlm has a msg file, put it's path here # FILE_nlm_msg = - + # # If the nlm has a hlp file put it's path here # @@ -226,21 +222,20 @@ FILES_nlm_Ximports = \ @httpd.imp \ @mod_cache.imp \ $(EOLIST) - -# + +# # Any symbols exported to here # FILES_nlm_exports = \ mem_cache_module \ $(EOLIST) - -# @cache.imp \ -# + +# # These are the OBJ files needed to create the LIB target above. # Paths must all use the '/' character # FILES_lib_objs = \ - $(EOLIST) + $(EOLIST) # # implement targets and dependancies (leave this section alone) @@ -251,11 +246,11 @@ libs :: $(OBJDIR) $(TARGET_lib) nlms :: libs $(TARGET_nlm) # -# Updated this target to create necessary directories and copy files to the +# Updated this target to create necessary directories and copy files to the # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE - + # # Any specialized rules here # @@ -268,4 +263,3 @@ install :: nlms FORCE include $(AP_WORK)\build\NWGNUtail.inc - diff --git a/modules/experimental/NWGNUmod_cach b/modules/experimental/NWGNUmod_cach index 55e1a73323c..3665b764a4d 100644 --- a/modules/experimental/NWGNUmod_cach +++ b/modules/experimental/NWGNUmod_cach @@ -3,7 +3,7 @@ # SUBDIRS = \ - $(EOLIST) + $(EOLIST) # # Get the 'head' of the build environment. This includes default targets and @@ -23,13 +23,9 @@ include $(AP_WORK)\build\NWGNUhead.inc # INCDIRS # XINCDIRS += \ - $(AP_WORK)/srclib/apr/include \ - $(AP_WORK)/srclib/include/arch/NetWare \ - $(AP_WORK)/srclib/apr-util/include \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ - $(AP_WORK)/os/NetWare \ - $(AP_WORK)/server/mpm/NetWare \ - $(AP_WORK)/srclib/pcre \ $(NWOS) \ $(EOLIST) @@ -67,7 +63,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "noopt" @@ -81,7 +77,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "release" @@ -103,10 +99,10 @@ endif # This is used by the link 'name' directive to name the nlm. If left blank # TARGET_nlm (see below) will be used. # -NLM_NAME = mod_cach +NLM_NAME = mod_cach # -# This is used by the link '-desc ' directive. +# This is used by the link '-desc ' directive. # If left blank, NLM_NAME will be used. # NLM_DESCRIPTION = Apache $(VERSION_STR) Cache module @@ -118,16 +114,16 @@ NLM_DESCRIPTION = Apache $(VERSION_STR) Cache module NLM_THREAD_NAME = mod_cach # -# If this is specified, it will override VERSION value in +# If this is specified, it will override VERSION value in # $(AP_WORK)\build\NWGNUenvironment.inc # -NLM_VERSION = +NLM_VERSION = # # If this is specified, it will override the default of 64K # NLM_STACK_SIZE = 65536 - + # # If this is specified it will be used by the link '-entry' directive @@ -147,14 +143,14 @@ NLM_CHECK_SYM = # # If this is specified it will be used by the link '-flags' directive # -NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION - +NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION + # -# If this is specified it will be linked in with the XDCData option in the def +# If this is specified it will be linked in with the XDCData option in the def # file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled # by setting APACHE_UNIPROC in the environment # -XDCDATA = +XDCDATA = # # Declare all target files (you must add your files here) @@ -183,13 +179,12 @@ FILES_nlm_objs = \ $(OBJDIR)/mod_cache.o \ $(EOLIST) -# $(OBJDIR)/mod_mem_cache.o \ # # These are the LIB files needed to create the NLM target above. # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + libcpre.o \ $(EOLIST) # @@ -205,7 +200,7 @@ FILES_nlm_modules = \ # If the nlm has a msg file, put it's path here # FILE_nlm_msg = - + # # If the nlm has a hlp file put it's path here # @@ -225,21 +220,21 @@ FILES_nlm_Ximports = \ @httpd.imp \ @netware.imp \ $(EOLIST) - -# + +# # Any symbols exported to here # FILES_nlm_exports = \ @mod_cache.imp \ cache_module \ $(EOLIST) - -# + +# # These are the OBJ files needed to create the LIB target above. # Paths must all use the '/' character # FILES_lib_objs = \ - $(EOLIST) + $(EOLIST) # # implement targets and dependancies (leave this section alone) @@ -250,11 +245,11 @@ libs :: $(OBJDIR) $(TARGET_lib) nlms :: libs $(TARGET_nlm) # -# Updated this target to create necessary directories and copy files to the +# Updated this target to create necessary directories and copy files to the # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE - + # # Any specialized rules here # @@ -267,4 +262,3 @@ install :: nlms FORCE include $(AP_WORK)\build\NWGNUtail.inc - diff --git a/modules/experimental/NWGNUmoddumpio b/modules/experimental/NWGNUmoddumpio index 7db7075d1ee..53c74bb591a 100644 --- a/modules/experimental/NWGNUmoddumpio +++ b/modules/experimental/NWGNUmoddumpio @@ -16,19 +16,16 @@ endif # INCDIRS # XINCDIRS += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ $(APR)/include \ $(APRUTIL)/include \ - $(APR) \ + $(AP_WORK)/include \ + $(NWOS) \ $(EOLIST) # # These flags will come after CFLAGS # XCFLAGS += \ - -prefix pre_nw.h \ $(EOLIST) # @@ -58,7 +55,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "noopt" @@ -94,10 +91,10 @@ endif # This is used by the link 'name' directive to name the nlm. If left blank # TARGET_nlm (see below) will be used. # -NLM_NAME = moddumpio +NLM_NAME = moddumpio # -# This is used by the link '-desc ' directive. +# This is used by the link '-desc ' directive. # If left blank, NLM_NAME will be used. # NLM_DESCRIPTION = Apache $(VERSION_STR) Debugging IO Module @@ -109,10 +106,10 @@ NLM_DESCRIPTION = Apache $(VERSION_STR) Debugging IO Module NLM_THREAD_NAME = DumpIO Module # -# If this is specified, it will override VERSION value in +# If this is specified, it will override VERSION value in # $(AP_WORK)\build\NWGNUenvironment.inc # -NLM_VERSION = +NLM_VERSION = # # If this is specified, it will override the default of 64K @@ -138,14 +135,14 @@ NLM_CHECK_SYM = # # If these are specified it will be used by the link '-flags' directive # -NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION +NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION # -# If this is specified it will be linked in with the XDCData option in the def +# If this is specified it will be linked in with the XDCData option in the def # file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled # by setting APACHE_UNIPROC in the environment # -XDCDATA = +XDCDATA = # # If there is an NLM target, put it here @@ -173,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + libcpre.o \ $(EOLIST) # @@ -189,7 +186,7 @@ FILES_nlm_modules = \ # If the nlm has a msg file, put it's path here # FILE_nlm_msg = - + # # If the nlm has a hlp file put it's path here # @@ -208,20 +205,20 @@ FILES_nlm_Ximports = \ @$(NWOS)/httpd.imp \ @libc.imp \ $(EOLIST) - -# + +# # Any symbols exported to here # FILES_nlm_exports = \ dumpio_module \ $(EOLIST) - -# + +# # These are the OBJ files needed to create the LIB target above. # Paths must all use the '/' character # FILES_lib_objs = \ - $(EOLIST) + $(EOLIST) # # implement targets and dependancies (leave this section alone) @@ -232,7 +229,7 @@ libs :: $(OBJDIR) $(TARGET_lib) nlms :: libs $(TARGET_nlm) # -# Updated this target to create necessary directories and copy files to the +# Updated this target to create necessary directories and copy files to the # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE @@ -248,3 +245,4 @@ install :: nlms FORCE include $(AP_WORK)\build\NWGNUtail.inc + diff --git a/modules/experimental/NWGNUutilldap b/modules/experimental/NWGNUutilldap index 98be959d065..376325a2bf3 100644 --- a/modules/experimental/NWGNUutilldap +++ b/modules/experimental/NWGNUutilldap @@ -16,11 +16,10 @@ endif # INCDIRS # XINCDIRS += \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ $(NWOS) \ - $(AP_WORK)/srclib/apr/include \ - $(AP_WORK)/srclib/apr-util/include \ - $(AP_WORK)/srclib/apr \ $(LDAPSDK)/inc \ $(EOLIST) @@ -28,7 +27,6 @@ XINCDIRS += \ # These flags will come after CFLAGS # XCFLAGS += \ - -prefix pre_nw.h \ $(EOLIST) # @@ -58,7 +56,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "noopt" @@ -72,7 +70,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "release" @@ -94,10 +92,10 @@ endif # This is used by the link 'name' directive to name the nlm. If left blank # TARGET_nlm (see below) will be used. # -NLM_NAME = utilldap +NLM_NAME = utilldap # -# This is used by the link '-desc ' directive. +# This is used by the link '-desc ' directive. # If left blank, NLM_NAME will be used. # NLM_DESCRIPTION = Apache $(VERSION_STR) LDAP Authentication Module @@ -109,10 +107,10 @@ NLM_DESCRIPTION = Apache $(VERSION_STR) LDAP Authentication Module NLM_THREAD_NAME = UtilLDAP Module # -# If this is specified, it will override VERSION value in +# If this is specified, it will override VERSION value in # $(AP_WORK)\build\NWGNUenvironment.inc # -NLM_VERSION = +NLM_VERSION = # # If this is specified, it will override the default of 64K @@ -138,14 +136,14 @@ NLM_CHECK_SYM = # # If these are specified it will be used by the link '-flags' directive # -NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION +NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION # -# If this is specified it will be linked in with the XDCData option in the def +# If this is specified it will be linked in with the XDCData option in the def # file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled # by setting APACHE_UNIPROC in the environment # -XDCDATA = +XDCDATA = # # If there is an NLM target, put it here @@ -175,7 +173,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + libcpre.o \ $(EOLIST) # @@ -194,7 +192,7 @@ FILES_nlm_modules = \ # If the nlm has a msg file, put it's path here # FILE_nlm_msg = - + # # If the nlm has a hlp file put it's path here # @@ -215,8 +213,8 @@ FILES_nlm_Ximports = \ @$(LDAPSDK)/imports/lldapsdk.imp \ @$(LDAPSDK)/imports/lldapssl.imp \ $(EOLIST) - -# + +# # Any symbols exported to here # FILES_nlm_exports = \ @@ -231,13 +229,13 @@ FILES_nlm_exports = \ util_ldap_cache_comparedn \ util_ldap_ssl_supported \ $(EOLIST) - -# + +# # These are the OBJ files needed to create the LIB target above. # Paths must all use the '/' character # FILES_lib_objs = \ - $(EOLIST) + $(EOLIST) # # implement targets and dependancies (leave this section alone) @@ -248,7 +246,7 @@ libs :: $(OBJDIR) $(TARGET_lib) nlms :: libs $(TARGET_nlm) # -# Updated this target to create necessary directories and copy files to the +# Updated this target to create necessary directories and copy files to the # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE @@ -265,3 +263,4 @@ install :: nlms FORCE include $(AP_WORK)\build\NWGNUtail.inc + diff --git a/modules/filters/NWGNUdeflate b/modules/filters/NWGNUdeflate index 058169d1771..4d9cbfa32e0 100644 --- a/modules/filters/NWGNUdeflate +++ b/modules/filters/NWGNUdeflate @@ -27,12 +27,10 @@ include $(AP_WORK)\build\NWGNUhead.inc # INCDIRS # XINCDIRS += \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/srclib/apr/include \ - $(AP_WORK)/srclib/apr-util/include \ - $(AP_WORK)/srclib/apr \ $(EOLIST) # @@ -68,7 +66,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "noopt" @@ -82,7 +80,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "release" @@ -104,7 +102,7 @@ endif # This is used by the link 'name' directive to name the nlm. If left blank # TARGET_nlm (see below) will be used. # -NLM_NAME = deflate +NLM_NAME = deflate # # This is used by the link '-desc ' directive. @@ -122,7 +120,7 @@ NLM_THREAD_NAME = Deflate Module # If this is specified, it will override VERSION value in # $(AP_WORK)\build\NWGNUenvironment.inc # -NLM_VERSION = +NLM_VERSION = # # If this is specified, it will override the default of 64K @@ -148,14 +146,14 @@ NLM_CHECK_SYM = # # If these are specified it will be used by the link '-flags' directive # -NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION +NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION # # If this is specified it will be linked in with the XDCData option in the def # file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled # by setting APACHE_UNIPROC in the environment # -XDCDATA = +XDCDATA = # # If there is an NLM target, put it here @@ -199,7 +197,7 @@ endif # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + libcpre.o \ $(EOLIST) # @@ -247,7 +245,7 @@ FILES_nlm_exports = \ # Paths must all use the '/' character # FILES_lib_objs = \ - $(EOLIST) + $(EOLIST) # # implement targets and dependancies (leave this section alone) @@ -278,4 +276,3 @@ vpath %.c $(ZLIBSDK) include $(AP_WORK)\build\NWGNUtail.inc - diff --git a/modules/filters/NWGNUextfiltr b/modules/filters/NWGNUextfiltr index f17aea1e847..8aa5b2081b4 100644 --- a/modules/filters/NWGNUextfiltr +++ b/modules/filters/NWGNUextfiltr @@ -16,19 +16,16 @@ endif # INCDIRS # XINCDIRS += \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/srclib/apr/include \ - $(AP_WORK)/srclib/apr-util/include \ - $(AP_WORK)/srclib/apr \ $(EOLIST) # # These flags will come after CFLAGS # XCFLAGS += \ - -prefix pre_nw.h \ $(EOLIST) # @@ -58,7 +55,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "noopt" @@ -72,7 +69,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "release" @@ -94,10 +91,10 @@ endif # This is used by the link 'name' directive to name the nlm. If left blank # TARGET_nlm (see below) will be used. # -NLM_NAME = extfiltr +NLM_NAME = extfiltr # -# This is used by the link '-desc ' directive. +# This is used by the link '-desc ' directive. # If left blank, NLM_NAME will be used. # NLM_DESCRIPTION = Apache $(VERSION_STR) External Filter Module @@ -109,10 +106,10 @@ NLM_DESCRIPTION = Apache $(VERSION_STR) External Filter Module NLM_THREAD_NAME = ExtFilter Module # -# If this is specified, it will override VERSION value in +# If this is specified, it will override VERSION value in # $(AP_WORK)\build\NWGNUenvironment.inc # -NLM_VERSION = +NLM_VERSION = # # If this is specified, it will override the default of 64K @@ -138,14 +135,14 @@ NLM_CHECK_SYM = # # If these are specified it will be used by the link '-flags' directive # -NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION +NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION # -# If this is specified it will be linked in with the XDCData option in the def +# If this is specified it will be linked in with the XDCData option in the def # file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled # by setting APACHE_UNIPROC in the environment # -XDCDATA = +XDCDATA = # # If there is an NLM target, put it here @@ -173,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + libcpre.o \ $(EOLIST) # @@ -189,7 +186,7 @@ FILES_nlm_modules = \ # If the nlm has a msg file, put it's path here # FILE_nlm_msg = - + # # If the nlm has a hlp file put it's path here # @@ -208,20 +205,20 @@ FILES_nlm_Ximports = \ @$(NWOS)/httpd.imp \ @libc.imp \ $(EOLIST) - -# + +# # Any symbols exported to here # FILES_nlm_exports = \ ext_filter_module \ $(EOLIST) - -# + +# # These are the OBJ files needed to create the LIB target above. # Paths must all use the '/' character # FILES_lib_objs = \ - $(EOLIST) + $(EOLIST) # # implement targets and dependancies (leave this section alone) @@ -232,7 +229,7 @@ libs :: $(OBJDIR) $(TARGET_lib) nlms :: libs $(TARGET_nlm) # -# Updated this target to create necessary directories and copy files to the +# Updated this target to create necessary directories and copy files to the # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE @@ -248,3 +245,4 @@ install :: nlms FORCE include $(AP_WORK)\build\NWGNUtail.inc + diff --git a/modules/generators/NWGNUinfo b/modules/generators/NWGNUinfo index c24f9525a19..eb76803f2f0 100644 --- a/modules/generators/NWGNUinfo +++ b/modules/generators/NWGNUinfo @@ -16,19 +16,16 @@ endif # INCDIRS # XINCDIRS += \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/srclib/apr/include \ - $(AP_WORK)/srclib/apr-util/include \ - $(AP_WORK)/srclib/apr \ $(EOLIST) # # These flags will come after CFLAGS # XCFLAGS += \ - -prefix pre_nw.h \ $(EOLIST) # @@ -72,7 +69,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "release" @@ -94,10 +91,10 @@ endif # This is used by the link 'name' directive to name the nlm. If left blank # TARGET_nlm (see below) will be used. # -NLM_NAME = info +NLM_NAME = info # -# This is used by the link '-desc ' directive. +# This is used by the link '-desc ' directive. # If left blank, NLM_NAME will be used. # NLM_DESCRIPTION = Apache $(VERSION_STR) Info Module @@ -109,10 +106,10 @@ NLM_DESCRIPTION = Apache $(VERSION_STR) Info Module NLM_THREAD_NAME = Info Module # -# If this is specified, it will override VERSION value in +# If this is specified, it will override VERSION value in # $(AP_WORK)\build\NWGNUenvironment.inc # -NLM_VERSION = +NLM_VERSION = # # If this is specified, it will override the default of 64K @@ -138,14 +135,14 @@ NLM_CHECK_SYM = # # If these are specified it will be used by the link '-flags' directive # -NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION +NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION # -# If this is specified it will be linked in with the XDCData option in the def +# If this is specified it will be linked in with the XDCData option in the def # file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled # by setting APACHE_UNIPROC in the environment # -XDCDATA = +XDCDATA = # # If there is an NLM target, put it here @@ -173,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + libcpre.o \ $(EOLIST) # @@ -189,7 +186,7 @@ FILES_nlm_modules = \ # If the nlm has a msg file, put it's path here # FILE_nlm_msg = - + # # If the nlm has a hlp file put it's path here # @@ -208,20 +205,20 @@ FILES_nlm_Ximports = \ @$(NWOS)/httpd.imp \ @libc.imp \ $(EOLIST) - -# + +# # Any symbols exported to here # FILES_nlm_exports = \ info_module \ $(EOLIST) - -# + +# # These are the OBJ files needed to create the LIB target above. # Paths must all use the '/' character # FILES_lib_objs = \ - $(EOLIST) + $(EOLIST) # # implement targets and dependancies (leave this section alone) @@ -232,7 +229,7 @@ libs :: $(OBJDIR) $(TARGET_lib) nlms :: libs $(TARGET_nlm) # -# Updated this target to create necessary directories and copy files to the +# Updated this target to create necessary directories and copy files to the # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE @@ -248,3 +245,4 @@ install :: nlms FORCE include $(AP_WORK)\build\NWGNUtail.inc + diff --git a/modules/generators/NWGNUstatus b/modules/generators/NWGNUstatus index f636edffcd4..01cbef5af87 100644 --- a/modules/generators/NWGNUstatus +++ b/modules/generators/NWGNUstatus @@ -16,19 +16,16 @@ endif # INCDIRS # XINCDIRS += \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/srclib/apr/include \ - $(AP_WORK)/srclib/apr-util/include \ - $(AP_WORK)/srclib/apr \ $(EOLIST) # # These flags will come after CFLAGS # XCFLAGS += \ - -prefix pre_nw.h \ $(EOLIST) # @@ -58,7 +55,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "noopt" @@ -72,7 +69,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "release" @@ -94,10 +91,10 @@ endif # This is used by the link 'name' directive to name the nlm. If left blank # TARGET_nlm (see below) will be used. # -NLM_NAME = status +NLM_NAME = status # -# This is used by the link '-desc ' directive. +# This is used by the link '-desc ' directive. # If left blank, NLM_NAME will be used. # NLM_DESCRIPTION = Apache $(VERSION_STR) Status Module @@ -109,10 +106,10 @@ NLM_DESCRIPTION = Apache $(VERSION_STR) Status Module NLM_THREAD_NAME = Status Module # -# If this is specified, it will override VERSION value in +# If this is specified, it will override VERSION value in # $(AP_WORK)\build\NWGNUenvironment.inc # -NLM_VERSION = +NLM_VERSION = # # If this is specified, it will override the default of 64K @@ -138,14 +135,14 @@ NLM_CHECK_SYM = # # If these are specified it will be used by the link '-flags' directive # -NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION +NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION # -# If this is specified it will be linked in with the XDCData option in the def +# If this is specified it will be linked in with the XDCData option in the def # file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled # by setting APACHE_UNIPROC in the environment # -XDCDATA = +XDCDATA = # # If there is an NLM target, put it here @@ -173,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + libcpre.o \ $(EOLIST) # @@ -189,7 +186,7 @@ FILES_nlm_modules = \ # If the nlm has a msg file, put it's path here # FILE_nlm_msg = - + # # If the nlm has a hlp file put it's path here # @@ -208,20 +205,20 @@ FILES_nlm_Ximports = \ @$(NWOS)/httpd.imp \ @libc.imp \ $(EOLIST) - -# + +# # Any symbols exported to here # FILES_nlm_exports = \ status_module \ $(EOLIST) - -# + +# # These are the OBJ files needed to create the LIB target above. # Paths must all use the '/' character # FILES_lib_objs = \ - $(EOLIST) + $(EOLIST) # # implement targets and dependancies (leave this section alone) @@ -232,7 +229,7 @@ libs :: $(OBJDIR) $(TARGET_lib) nlms :: libs $(TARGET_nlm) # -# Updated this target to create necessary directories and copy files to the +# Updated this target to create necessary directories and copy files to the # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE @@ -248,3 +245,4 @@ install :: nlms FORCE include $(AP_WORK)\build\NWGNUtail.inc + diff --git a/modules/loggers/NWGNUforensic b/modules/loggers/NWGNUforensic index 561922eae51..e4978550041 100644 --- a/modules/loggers/NWGNUforensic +++ b/modules/loggers/NWGNUforensic @@ -3,7 +3,7 @@ # SUBDIRS = \ - $(EOLIST) + $(EOLIST) # # Get the 'head' of the build environment. This includes default targets and @@ -24,19 +24,16 @@ include $(AP_WORK)\build\NWGNUhead.inc # INCDIRS # XINCDIRS += \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/srclib/apr/include \ - $(AP_WORK)/srclib/apr-util/include \ - $(AP_WORK)/srclib/apr \ $(EOLIST) # # These flags will come after CFLAGS # XCFLAGS += \ - -prefix pre_nw.h \ $(EOLIST) # @@ -66,7 +63,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "noopt" @@ -80,7 +77,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "release" @@ -102,10 +99,10 @@ endif # This is used by the link 'name' directive to name the nlm. If left blank # TARGET_nlm (see below) will be used. # -NLM_NAME = forensic +NLM_NAME = forensic # -# This is used by the link '-desc ' directive. +# This is used by the link '-desc ' directive. # If left blank, NLM_NAME will be used. # NLM_DESCRIPTION = Apache $(VERSION_STR) Forensic Logging Module @@ -117,10 +114,10 @@ NLM_DESCRIPTION = Apache $(VERSION_STR) Forensic Logging Module NLM_THREAD_NAME = Forensic Module # -# If this is specified, it will override VERSION value in +# If this is specified, it will override VERSION value in # $(AP_WORK)\build\NWGNUenvironment.inc # -NLM_VERSION = +NLM_VERSION = # # If this is specified, it will override the default of 64K @@ -146,14 +143,14 @@ NLM_CHECK_SYM = # # If these are specified it will be used by the link '-flags' directive # -NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION +NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION # -# If this is specified it will be linked in with the XDCData option in the def +# If this is specified it will be linked in with the XDCData option in the def # file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled # by setting APACHE_UNIPROC in the environment # -XDCDATA = +XDCDATA = # # If there is an NLM target, put it here @@ -181,7 +178,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + libcpre.o \ $(EOLIST) # @@ -197,7 +194,7 @@ FILES_nlm_modules = \ # If the nlm has a msg file, put it's path here # FILE_nlm_msg = - + # # If the nlm has a hlp file put it's path here # @@ -216,20 +213,20 @@ FILES_nlm_Ximports = \ @$(NWOS)/httpd.imp \ @libc.imp \ $(EOLIST) - -# + +# # Any symbols exported to here # FILES_nlm_exports = \ log_forensic_module \ $(EOLIST) - -# + +# # These are the OBJ files needed to create the LIB target above. # Paths must all use the '/' character # FILES_lib_objs = \ - $(EOLIST) + $(EOLIST) # # implement targets and dependancies (leave this section alone) @@ -240,7 +237,7 @@ libs :: $(OBJDIR) $(TARGET_lib) nlms :: libs $(TARGET_nlm) # -# Updated this target to create necessary directories and copy files to the +# Updated this target to create necessary directories and copy files to the # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE @@ -258,4 +255,3 @@ install :: nlms FORCE include $(AP_WORK)\build\NWGNUtail.inc - diff --git a/modules/loggers/NWGNUmodlogio b/modules/loggers/NWGNUmodlogio index 21d68b9673c..58ed2a47dc5 100644 --- a/modules/loggers/NWGNUmodlogio +++ b/modules/loggers/NWGNUmodlogio @@ -3,7 +3,7 @@ # SUBDIRS = \ - $(EOLIST) + $(EOLIST) # # Get the 'head' of the build environment. This includes default targets and @@ -24,19 +24,16 @@ include $(AP_WORK)\build\NWGNUhead.inc # INCDIRS # XINCDIRS += \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/srclib/apr/include \ - $(AP_WORK)/srclib/apr-util/include \ - $(AP_WORK)/srclib/apr \ $(EOLIST) # # These flags will come after CFLAGS # XCFLAGS += \ - -prefix pre_nw.h \ $(EOLIST) # @@ -66,7 +63,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "noopt" @@ -80,7 +77,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "release" @@ -102,10 +99,10 @@ endif # This is used by the link 'name' directive to name the nlm. If left blank # TARGET_nlm (see below) will be used. # -NLM_NAME = logio +NLM_NAME = logio # -# This is used by the link '-desc ' directive. +# This is used by the link '-desc ' directive. # If left blank, NLM_NAME will be used. # NLM_DESCRIPTION = Apache $(VERSION_STR) IO Logging Module @@ -117,10 +114,10 @@ NLM_DESCRIPTION = Apache $(VERSION_STR) IO Logging Module NLM_THREAD_NAME = Logio Module # -# If this is specified, it will override VERSION value in +# If this is specified, it will override VERSION value in # $(AP_WORK)\build\NWGNUenvironment.inc # -NLM_VERSION = +NLM_VERSION = # # If this is specified, it will override the default of 64K @@ -146,14 +143,14 @@ NLM_CHECK_SYM = # # If these are specified it will be used by the link '-flags' directive # -NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION +NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION # -# If this is specified it will be linked in with the XDCData option in the def +# If this is specified it will be linked in with the XDCData option in the def # file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled # by setting APACHE_UNIPROC in the environment # -XDCDATA = +XDCDATA = # # If there is an NLM target, put it here @@ -181,7 +178,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + libcpre.o \ $(EOLIST) # @@ -197,7 +194,7 @@ FILES_nlm_modules = \ # If the nlm has a msg file, put it's path here # FILE_nlm_msg = - + # # If the nlm has a hlp file put it's path here # @@ -216,20 +213,20 @@ FILES_nlm_Ximports = \ @$(NWOS)/httpd.imp \ @libc.imp \ $(EOLIST) - -# + +# # Any symbols exported to here # FILES_nlm_exports = \ logio_module \ $(EOLIST) - -# + +# # These are the OBJ files needed to create the LIB target above. # Paths must all use the '/' character # FILES_lib_objs = \ - $(EOLIST) + $(EOLIST) # # implement targets and dependancies (leave this section alone) @@ -240,7 +237,7 @@ libs :: $(OBJDIR) $(TARGET_lib) nlms :: libs $(TARGET_nlm) # -# Updated this target to create necessary directories and copy files to the +# Updated this target to create necessary directories and copy files to the # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE @@ -258,4 +255,3 @@ install :: nlms FORCE include $(AP_WORK)\build\NWGNUtail.inc - diff --git a/modules/mappers/NWGNUrewrite b/modules/mappers/NWGNUrewrite index bc0a5ebf599..960fca7ce5f 100644 --- a/modules/mappers/NWGNUrewrite +++ b/modules/mappers/NWGNUrewrite @@ -16,12 +16,10 @@ endif # INCDIRS # XINCDIRS += \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/srclib/apr/include \ - $(AP_WORK)/srclib/apr-util/include \ - $(AP_WORK)/srclib/apr \ $(EOLIST) # @@ -57,7 +55,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "noopt" @@ -71,7 +69,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "release" @@ -93,10 +91,10 @@ endif # This is used by the link 'name' directive to name the nlm. If left blank # TARGET_nlm (see below) will be used. # -NLM_NAME = rewrite +NLM_NAME = rewrite # -# This is used by the link '-desc ' directive. +# This is used by the link '-desc ' directive. # If left blank, NLM_NAME will be used. # NLM_DESCRIPTION = Apache $(VERSION_STR) Rewrite Module @@ -108,10 +106,10 @@ NLM_DESCRIPTION = Apache $(VERSION_STR) Rewrite Module NLM_THREAD_NAME = Rewrite Module # -# If this is specified, it will override VERSION value in +# If this is specified, it will override VERSION value in # $(AP_WORK)\build\NWGNUenvironment.inc # -NLM_VERSION = +NLM_VERSION = # # If this is specified, it will override the default of 64K @@ -137,14 +135,14 @@ NLM_CHECK_SYM = # # If these are specified it will be used by the link '-flags' directive # -NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION +NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION # -# If this is specified it will be linked in with the XDCData option in the def +# If this is specified it will be linked in with the XDCData option in the def # file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled # by setting APACHE_UNIPROC in the environment # -XDCDATA = +XDCDATA = # # If there is an NLM target, put it here @@ -172,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + libcpre.o \ $(EOLIST) # @@ -188,7 +186,7 @@ FILES_nlm_modules = \ # If the nlm has a msg file, put it's path here # FILE_nlm_msg = - + # # If the nlm has a hlp file put it's path here # @@ -207,20 +205,20 @@ FILES_nlm_Ximports = \ @$(NWOS)/httpd.imp \ @libc.imp \ $(EOLIST) - -# + +# # Any symbols exported to here # FILES_nlm_exports = \ rewrite_module \ $(EOLIST) - -# + +# # These are the OBJ files needed to create the LIB target above. # Paths must all use the '/' character # FILES_lib_objs = \ - $(EOLIST) + $(EOLIST) # # implement targets and dependancies (leave this section alone) @@ -231,7 +229,7 @@ libs :: $(OBJDIR) $(TARGET_lib) nlms :: libs $(TARGET_nlm) # -# Updated this target to create necessary directories and copy files to the +# Updated this target to create necessary directories and copy files to the # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE @@ -247,3 +245,4 @@ install :: nlms FORCE include $(AP_WORK)\build\NWGNUtail.inc + diff --git a/modules/mappers/NWGNUspeling b/modules/mappers/NWGNUspeling index 097a446bfba..550def1a8f2 100644 --- a/modules/mappers/NWGNUspeling +++ b/modules/mappers/NWGNUspeling @@ -16,12 +16,10 @@ endif # INCDIRS # XINCDIRS += \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/srclib/apr/include \ - $(AP_WORK)/srclib/apr-util/include \ - $(AP_WORK)/srclib/apr \ $(EOLIST) # @@ -57,7 +55,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "noopt" @@ -71,7 +69,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "release" @@ -93,10 +91,10 @@ endif # This is used by the link 'name' directive to name the nlm. If left blank # TARGET_nlm (see below) will be used. # -NLM_NAME = speling +NLM_NAME = speling # -# This is used by the link '-desc ' directive. +# This is used by the link '-desc ' directive. # If left blank, NLM_NAME will be used. # NLM_DESCRIPTION = Apache $(VERSION_STR) Speling Module @@ -108,10 +106,10 @@ NLM_DESCRIPTION = Apache $(VERSION_STR) Speling Module NLM_THREAD_NAME = Speling Module # -# If this is specified, it will override VERSION value in +# If this is specified, it will override VERSION value in # $(AP_WORK)\build\NWGNUenvironment.inc # -NLM_VERSION = +NLM_VERSION = # # If this is specified, it will override the default of 64K @@ -137,14 +135,14 @@ NLM_CHECK_SYM = # # If these are specified it will be used by the link '-flags' directive # -NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION +NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION # -# If this is specified it will be linked in with the XDCData option in the def +# If this is specified it will be linked in with the XDCData option in the def # file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled # by setting APACHE_UNIPROC in the environment # -XDCDATA = +XDCDATA = # # If there is an NLM target, put it here @@ -172,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + libcpre.o \ $(EOLIST) # @@ -188,7 +186,7 @@ FILES_nlm_modules = \ # If the nlm has a msg file, put it's path here # FILE_nlm_msg = - + # # If the nlm has a hlp file put it's path here # @@ -207,20 +205,20 @@ FILES_nlm_Ximports = \ @$(NWOS)/httpd.imp \ @libc.imp \ $(EOLIST) - -# + +# # Any symbols exported to here # FILES_nlm_exports = \ speling_module \ $(EOLIST) - -# + +# # These are the OBJ files needed to create the LIB target above. # Paths must all use the '/' character # FILES_lib_objs = \ - $(EOLIST) + $(EOLIST) # # implement targets and dependancies (leave this section alone) @@ -231,7 +229,7 @@ libs :: $(OBJDIR) $(TARGET_lib) nlms :: libs $(TARGET_nlm) # -# Updated this target to create necessary directories and copy files to the +# Updated this target to create necessary directories and copy files to the # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE @@ -247,3 +245,4 @@ install :: nlms FORCE include $(AP_WORK)\build\NWGNUtail.inc + diff --git a/modules/mappers/NWGNUvhost b/modules/mappers/NWGNUvhost index 5c466e779db..8d68295ac5b 100644 --- a/modules/mappers/NWGNUvhost +++ b/modules/mappers/NWGNUvhost @@ -16,12 +16,10 @@ endif # INCDIRS # XINCDIRS += \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/srclib/apr/include \ - $(AP_WORK)/srclib/apr-util/include \ - $(AP_WORK)/srclib/apr \ $(EOLIST) # @@ -57,7 +55,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "noopt" @@ -71,7 +69,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "release" @@ -93,10 +91,10 @@ endif # This is used by the link 'name' directive to name the nlm. If left blank # TARGET_nlm (see below) will be used. # -NLM_NAME = vhost +NLM_NAME = vhost # -# This is used by the link '-desc ' directive. +# This is used by the link '-desc ' directive. # If left blank, NLM_NAME will be used. # NLM_DESCRIPTION = Apache $(VERSION_STR) Vhost Alias Module @@ -108,10 +106,10 @@ NLM_DESCRIPTION = Apache $(VERSION_STR) Vhost Alias Module NLM_THREAD_NAME = Vhost Alias Module # -# If this is specified, it will override VERSION value in +# If this is specified, it will override VERSION value in # $(AP_WORK)\build\NWGNUenvironment.inc # -NLM_VERSION = +NLM_VERSION = # # If this is specified, it will override the default of 64K @@ -137,14 +135,14 @@ NLM_CHECK_SYM = # # If these are specified it will be used by the link '-flags' directive # -NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION +NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION # -# If this is specified it will be linked in with the XDCData option in the def +# If this is specified it will be linked in with the XDCData option in the def # file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled # by setting APACHE_UNIPROC in the environment # -XDCDATA = +XDCDATA = # # If there is an NLM target, put it here @@ -188,7 +186,7 @@ FILES_nlm_modules = \ # If the nlm has a msg file, put it's path here # FILE_nlm_msg = - + # # If the nlm has a hlp file put it's path here # @@ -207,20 +205,20 @@ FILES_nlm_Ximports = \ @$(NWOS)/httpd.imp \ @libc.imp \ $(EOLIST) - -# + +# # Any symbols exported to here # FILES_nlm_exports = \ vhost_alias_module \ $(EOLIST) - -# + +# # These are the OBJ files needed to create the LIB target above. # Paths must all use the '/' character # FILES_lib_objs = \ - $(EOLIST) + $(EOLIST) # # implement targets and dependancies (leave this section alone) @@ -231,7 +229,7 @@ libs :: $(OBJDIR) $(TARGET_lib) nlms :: libs $(TARGET_nlm) # -# Updated this target to create necessary directories and copy files to the +# Updated this target to create necessary directories and copy files to the # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE @@ -247,3 +245,4 @@ install :: nlms FORCE include $(AP_WORK)\build\NWGNUtail.inc + diff --git a/modules/metadata/NWGNUcernmeta b/modules/metadata/NWGNUcernmeta index 14d6727e0d4..9a642677323 100644 --- a/modules/metadata/NWGNUcernmeta +++ b/modules/metadata/NWGNUcernmeta @@ -16,19 +16,16 @@ endif # INCDIRS # XINCDIRS += \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/srclib/apr/include \ - $(AP_WORK)/srclib/apr-util/include \ - $(AP_WORK)/srclib/apr \ $(EOLIST) # # These flags will come after CFLAGS # XCFLAGS += \ - -prefix pre_nw.h \ $(EOLIST) # @@ -58,7 +55,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "noopt" @@ -72,7 +69,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "release" @@ -94,10 +91,10 @@ endif # This is used by the link 'name' directive to name the nlm. If left blank # TARGET_nlm (see below) will be used. # -NLM_NAME = cernmeta +NLM_NAME = cernmeta # -# This is used by the link '-desc ' directive. +# This is used by the link '-desc ' directive. # If left blank, NLM_NAME will be used. # NLM_DESCRIPTION = Apache $(VERSION_STR) CERN Meta Module @@ -109,10 +106,10 @@ NLM_DESCRIPTION = Apache $(VERSION_STR) CERN Meta Module NLM_THREAD_NAME = CERN Meta Module # -# If this is specified, it will override VERSION value in +# If this is specified, it will override VERSION value in # $(AP_WORK)\build\NWGNUenvironment.inc # -NLM_VERSION = +NLM_VERSION = # # If this is specified, it will override the default of 64K @@ -138,14 +135,14 @@ NLM_CHECK_SYM = # # If these are specified it will be used by the link '-flags' directive # -NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION +NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION # -# If this is specified it will be linked in with the XDCData option in the def +# If this is specified it will be linked in with the XDCData option in the def # file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled # by setting APACHE_UNIPROC in the environment # -XDCDATA = +XDCDATA = # # If there is an NLM target, put it here @@ -173,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + libcpre.o \ $(EOLIST) # @@ -189,7 +186,7 @@ FILES_nlm_modules = \ # If the nlm has a msg file, put it's path here # FILE_nlm_msg = - + # # If the nlm has a hlp file put it's path here # @@ -208,20 +205,20 @@ FILES_nlm_Ximports = \ @$(NWOS)/httpd.imp \ @libc.imp \ $(EOLIST) - -# + +# # Any symbols exported to here # FILES_nlm_exports = \ cern_meta_module \ $(EOLIST) - -# + +# # These are the OBJ files needed to create the LIB target above. # Paths must all use the '/' character # FILES_lib_objs = \ - $(EOLIST) + $(EOLIST) # # implement targets and dependancies (leave this section alone) @@ -232,7 +229,7 @@ libs :: $(OBJDIR) $(TARGET_lib) nlms :: libs $(TARGET_nlm) # -# Updated this target to create necessary directories and copy files to the +# Updated this target to create necessary directories and copy files to the # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE @@ -248,3 +245,4 @@ install :: nlms FORCE include $(AP_WORK)\build\NWGNUtail.inc + diff --git a/modules/metadata/NWGNUexpires b/modules/metadata/NWGNUexpires index bb59bef3fa6..eacc10eb7c0 100644 --- a/modules/metadata/NWGNUexpires +++ b/modules/metadata/NWGNUexpires @@ -16,19 +16,16 @@ endif # INCDIRS # XINCDIRS += \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/srclib/apr/include \ - $(AP_WORK)/srclib/apr-util/include \ - $(AP_WORK)/srclib/apr \ $(EOLIST) # # These flags will come after CFLAGS # XCFLAGS += \ - -prefix pre_nw.h \ $(EOLIST) # @@ -58,7 +55,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "noopt" @@ -72,7 +69,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "release" @@ -94,10 +91,10 @@ endif # This is used by the link 'name' directive to name the nlm. If left blank # TARGET_nlm (see below) will be used. # -NLM_NAME = expires +NLM_NAME = expires # -# This is used by the link '-desc ' directive. +# This is used by the link '-desc ' directive. # If left blank, NLM_NAME will be used. # NLM_DESCRIPTION = Apache $(VERSION_STR) Expires Module @@ -109,10 +106,10 @@ NLM_DESCRIPTION = Apache $(VERSION_STR) Expires Module NLM_THREAD_NAME = Expires Module # -# If this is specified, it will override VERSION value in +# If this is specified, it will override VERSION value in # $(AP_WORK)\build\NWGNUenvironment.inc # -NLM_VERSION = +NLM_VERSION = # # If this is specified, it will override the default of 64K @@ -138,14 +135,14 @@ NLM_CHECK_SYM = # # If these are specified it will be used by the link '-flags' directive # -NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION +NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION # -# If this is specified it will be linked in with the XDCData option in the def +# If this is specified it will be linked in with the XDCData option in the def # file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled # by setting APACHE_UNIPROC in the environment # -XDCDATA = +XDCDATA = # # If there is an NLM target, put it here @@ -173,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + libcpre.o \ $(EOLIST) # @@ -189,7 +186,7 @@ FILES_nlm_modules = \ # If the nlm has a msg file, put it's path here # FILE_nlm_msg = - + # # If the nlm has a hlp file put it's path here # @@ -208,20 +205,20 @@ FILES_nlm_Ximports = \ @$(NWOS)/httpd.imp \ @libc.imp \ $(EOLIST) - -# + +# # Any symbols exported to here # FILES_nlm_exports = \ expires_module \ $(EOLIST) - -# + +# # These are the OBJ files needed to create the LIB target above. # Paths must all use the '/' character # FILES_lib_objs = \ - $(EOLIST) + $(EOLIST) # # implement targets and dependancies (leave this section alone) @@ -232,7 +229,7 @@ libs :: $(OBJDIR) $(TARGET_lib) nlms :: libs $(TARGET_nlm) # -# Updated this target to create necessary directories and copy files to the +# Updated this target to create necessary directories and copy files to the # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE @@ -248,3 +245,4 @@ install :: nlms FORCE include $(AP_WORK)\build\NWGNUtail.inc + diff --git a/modules/metadata/NWGNUheaders b/modules/metadata/NWGNUheaders index fcfe1147336..def6d703d24 100644 --- a/modules/metadata/NWGNUheaders +++ b/modules/metadata/NWGNUheaders @@ -16,19 +16,16 @@ endif # INCDIRS # XINCDIRS += \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/srclib/apr/include \ - $(AP_WORK)/srclib/apr-util/include \ - $(AP_WORK)/srclib/apr \ $(EOLIST) # # These flags will come after CFLAGS # XCFLAGS += \ - -prefix pre_nw.h \ $(EOLIST) # @@ -58,7 +55,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "noopt" @@ -72,7 +69,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "release" @@ -94,10 +91,10 @@ endif # This is used by the link 'name' directive to name the nlm. If left blank # TARGET_nlm (see below) will be used. # -NLM_NAME = headers +NLM_NAME = headers # -# This is used by the link '-desc ' directive. +# This is used by the link '-desc ' directive. # If left blank, NLM_NAME will be used. # NLM_DESCRIPTION = Apache $(VERSION_STR) Headers Module @@ -109,10 +106,10 @@ NLM_DESCRIPTION = Apache $(VERSION_STR) Headers Module NLM_THREAD_NAME = Headers Module # -# If this is specified, it will override VERSION value in +# If this is specified, it will override VERSION value in # $(AP_WORK)\build\NWGNUenvironment.inc # -NLM_VERSION = +NLM_VERSION = # # If this is specified, it will override the default of 64K @@ -138,14 +135,14 @@ NLM_CHECK_SYM = # # If these are specified it will be used by the link '-flags' directive # -NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION +NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION # -# If this is specified it will be linked in with the XDCData option in the def +# If this is specified it will be linked in with the XDCData option in the def # file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled # by setting APACHE_UNIPROC in the environment # -XDCDATA = +XDCDATA = # # If there is an NLM target, put it here @@ -173,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + libcpre.o \ $(EOLIST) # @@ -189,7 +186,7 @@ FILES_nlm_modules = \ # If the nlm has a msg file, put it's path here # FILE_nlm_msg = - + # # If the nlm has a hlp file put it's path here # @@ -208,20 +205,20 @@ FILES_nlm_Ximports = \ @$(NWOS)/httpd.imp \ @libc.imp \ $(EOLIST) - -# + +# # Any symbols exported to here # FILES_nlm_exports = \ headers_module \ $(EOLIST) - -# + +# # These are the OBJ files needed to create the LIB target above. # Paths must all use the '/' character # FILES_lib_objs = \ - $(EOLIST) + $(EOLIST) # # implement targets and dependancies (leave this section alone) @@ -232,7 +229,7 @@ libs :: $(OBJDIR) $(TARGET_lib) nlms :: libs $(TARGET_nlm) # -# Updated this target to create necessary directories and copy files to the +# Updated this target to create necessary directories and copy files to the # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE @@ -248,3 +245,4 @@ install :: nlms FORCE include $(AP_WORK)\build\NWGNUtail.inc + diff --git a/modules/metadata/NWGNUmimemagi b/modules/metadata/NWGNUmimemagi index a2ea5a24d92..c2aa84daa7c 100644 --- a/modules/metadata/NWGNUmimemagi +++ b/modules/metadata/NWGNUmimemagi @@ -16,19 +16,16 @@ endif # INCDIRS # XINCDIRS += \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/srclib/apr/include \ - $(AP_WORK)/srclib/apr-util/include \ - $(AP_WORK)/srclib/apr \ $(EOLIST) # # These flags will come after CFLAGS # XCFLAGS += \ - -prefix pre_nw.h \ $(EOLIST) # @@ -58,7 +55,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "noopt" @@ -72,7 +69,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "release" @@ -94,10 +91,10 @@ endif # This is used by the link 'name' directive to name the nlm. If left blank # TARGET_nlm (see below) will be used. # -NLM_NAME = mimemagi +NLM_NAME = mimemagi # -# This is used by the link '-desc ' directive. +# This is used by the link '-desc ' directive. # If left blank, NLM_NAME will be used. # NLM_DESCRIPTION = Apache $(VERSION_STR) Mime Magic Module @@ -109,10 +106,10 @@ NLM_DESCRIPTION = Apache $(VERSION_STR) Mime Magic Module NLM_THREAD_NAME = CERN Meta Module # -# If this is specified, it will override VERSION value in +# If this is specified, it will override VERSION value in # $(AP_WORK)\build\NWGNUenvironment.inc # -NLM_VERSION = +NLM_VERSION = # # If this is specified, it will override the default of 64K @@ -138,14 +135,14 @@ NLM_CHECK_SYM = # # If these are specified it will be used by the link '-flags' directive # -NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION +NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION # -# If this is specified it will be linked in with the XDCData option in the def +# If this is specified it will be linked in with the XDCData option in the def # file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled # by setting APACHE_UNIPROC in the environment # -XDCDATA = +XDCDATA = # # If there is an NLM target, put it here @@ -173,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + libcpre.o \ $(EOLIST) # @@ -189,7 +186,7 @@ FILES_nlm_modules = \ # If the nlm has a msg file, put it's path here # FILE_nlm_msg = - + # # If the nlm has a hlp file put it's path here # @@ -208,20 +205,20 @@ FILES_nlm_Ximports = \ @$(NWOS)/httpd.imp \ @libc.imp \ $(EOLIST) - -# + +# # Any symbols exported to here # FILES_nlm_exports = \ mime_magic_module \ $(EOLIST) - -# + +# # These are the OBJ files needed to create the LIB target above. # Paths must all use the '/' character # FILES_lib_objs = \ - $(EOLIST) + $(EOLIST) # # implement targets and dependancies (leave this section alone) @@ -232,7 +229,7 @@ libs :: $(OBJDIR) $(TARGET_lib) nlms :: libs $(TARGET_nlm) # -# Updated this target to create necessary directories and copy files to the +# Updated this target to create necessary directories and copy files to the # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE @@ -248,3 +245,4 @@ install :: nlms FORCE include $(AP_WORK)\build\NWGNUtail.inc + diff --git a/modules/metadata/NWGNUmodversion b/modules/metadata/NWGNUmodversion index 47b24699c99..fdece687ebb 100644 --- a/modules/metadata/NWGNUmodversion +++ b/modules/metadata/NWGNUmodversion @@ -16,19 +16,16 @@ endif # INCDIRS # XINCDIRS += \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/srclib/apr/include \ - $(AP_WORK)/srclib/apr-util/include \ - $(AP_WORK)/srclib/apr \ $(EOLIST) # # These flags will come after CFLAGS # XCFLAGS += \ - -prefix pre_nw.h \ $(EOLIST) # @@ -58,7 +55,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "noopt" @@ -72,7 +69,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "release" @@ -94,10 +91,10 @@ endif # This is used by the link 'name' directive to name the nlm. If left blank # TARGET_nlm (see below) will be used. # -NLM_NAME = modversion +NLM_NAME = modversion # -# This is used by the link '-desc ' directive. +# This is used by the link '-desc ' directive. # If left blank, NLM_NAME will be used. # NLM_DESCRIPTION = Apache $(VERSION_STR) Version Module @@ -109,10 +106,10 @@ NLM_DESCRIPTION = Apache $(VERSION_STR) Version Module NLM_THREAD_NAME = Version Module # -# If this is specified, it will override VERSION value in +# If this is specified, it will override VERSION value in # $(AP_WORK)\build\NWGNUenvironment.inc # -NLM_VERSION = +NLM_VERSION = # # If this is specified, it will override the default of 64K @@ -138,14 +135,14 @@ NLM_CHECK_SYM = # # If these are specified it will be used by the link '-flags' directive # -NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION +NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION # -# If this is specified it will be linked in with the XDCData option in the def +# If this is specified it will be linked in with the XDCData option in the def # file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled # by setting APACHE_UNIPROC in the environment # -XDCDATA = +XDCDATA = # # If there is an NLM target, put it here @@ -173,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + libcpre.o \ $(EOLIST) # @@ -189,7 +186,7 @@ FILES_nlm_modules = \ # If the nlm has a msg file, put it's path here # FILE_nlm_msg = - + # # If the nlm has a hlp file put it's path here # @@ -208,20 +205,20 @@ FILES_nlm_Ximports = \ @$(NWOS)/httpd.imp \ @libc.imp \ $(EOLIST) - -# + +# # Any symbols exported to here # FILES_nlm_exports = \ version_module \ $(EOLIST) - -# + +# # These are the OBJ files needed to create the LIB target above. # Paths must all use the '/' character # FILES_lib_objs = \ - $(EOLIST) + $(EOLIST) # # implement targets and dependancies (leave this section alone) @@ -232,7 +229,7 @@ libs :: $(OBJDIR) $(TARGET_lib) nlms :: libs $(TARGET_nlm) # -# Updated this target to create necessary directories and copy files to the +# Updated this target to create necessary directories and copy files to the # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE @@ -248,3 +245,4 @@ install :: nlms FORCE include $(AP_WORK)\build\NWGNUtail.inc + diff --git a/modules/metadata/NWGNUuniqueid b/modules/metadata/NWGNUuniqueid index 51ab90b78b5..02917f5bb6b 100644 --- a/modules/metadata/NWGNUuniqueid +++ b/modules/metadata/NWGNUuniqueid @@ -16,19 +16,16 @@ endif # INCDIRS # XINCDIRS += \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/srclib/apr/include \ - $(AP_WORK)/srclib/apr-util/include \ - $(AP_WORK)/srclib/apr \ $(EOLIST) # # These flags will come after CFLAGS # XCFLAGS += \ - -prefix pre_nw.h \ $(EOLIST) # @@ -58,7 +55,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "noopt" @@ -72,7 +69,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "release" @@ -94,10 +91,10 @@ endif # This is used by the link 'name' directive to name the nlm. If left blank # TARGET_nlm (see below) will be used. # -NLM_NAME = uniqueid +NLM_NAME = uniqueid # -# This is used by the link '-desc ' directive. +# This is used by the link '-desc ' directive. # If left blank, NLM_NAME will be used. # NLM_DESCRIPTION = Apache $(VERSION_STR) Unique ID Module @@ -109,10 +106,10 @@ NLM_DESCRIPTION = Apache $(VERSION_STR) Unique ID Module NLM_THREAD_NAME = Unique ID Module # -# If this is specified, it will override VERSION value in +# If this is specified, it will override VERSION value in # $(AP_WORK)\build\NWGNUenvironment.inc # -NLM_VERSION = +NLM_VERSION = # # If this is specified, it will override the default of 64K @@ -138,14 +135,14 @@ NLM_CHECK_SYM = # # If these are specified it will be used by the link '-flags' directive # -NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION +NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION # -# If this is specified it will be linked in with the XDCData option in the def +# If this is specified it will be linked in with the XDCData option in the def # file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled # by setting APACHE_UNIPROC in the environment # -XDCDATA = +XDCDATA = # # If there is an NLM target, put it here @@ -174,7 +171,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + libcpre.o \ $(EOLIST) # @@ -190,7 +187,7 @@ FILES_nlm_modules = \ # If the nlm has a msg file, put it's path here # FILE_nlm_msg = - + # # If the nlm has a hlp file put it's path here # @@ -210,20 +207,20 @@ FILES_nlm_Ximports = \ @libc.imp \ @ws2nlm.imp \ $(EOLIST) - -# + +# # Any symbols exported to here # FILES_nlm_exports = \ unique_id_module \ $(EOLIST) - -# + +# # These are the OBJ files needed to create the LIB target above. # Paths must all use the '/' character # FILES_lib_objs = \ - $(EOLIST) + $(EOLIST) # # implement targets and dependancies (leave this section alone) @@ -234,7 +231,7 @@ libs :: $(OBJDIR) $(TARGET_lib) nlms :: libs $(TARGET_nlm) # -# Updated this target to create necessary directories and copy files to the +# Updated this target to create necessary directories and copy files to the # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE @@ -254,3 +251,4 @@ $(OBJDIR)/%.o: ../arch/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt include $(AP_WORK)\build\NWGNUtail.inc + diff --git a/modules/metadata/NWGNUusertrk b/modules/metadata/NWGNUusertrk index 6059066fa43..49ee8f847d1 100644 --- a/modules/metadata/NWGNUusertrk +++ b/modules/metadata/NWGNUusertrk @@ -16,19 +16,16 @@ endif # INCDIRS # XINCDIRS += \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/srclib/apr/include \ - $(AP_WORK)/srclib/apr-util/include \ - $(AP_WORK)/srclib/apr \ $(EOLIST) # # These flags will come after CFLAGS # XCFLAGS += \ - -prefix pre_nw.h \ $(EOLIST) # @@ -58,7 +55,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "noopt" @@ -72,7 +69,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "release" @@ -94,10 +91,10 @@ endif # This is used by the link 'name' directive to name the nlm. If left blank # TARGET_nlm (see below) will be used. # -NLM_NAME = usertrk +NLM_NAME = usertrk # -# This is used by the link '-desc ' directive. +# This is used by the link '-desc ' directive. # If left blank, NLM_NAME will be used. # NLM_DESCRIPTION = Apache $(VERSION_STR) User Track Module @@ -109,10 +106,10 @@ NLM_DESCRIPTION = Apache $(VERSION_STR) User Track Module NLM_THREAD_NAME = User Track Module # -# If this is specified, it will override VERSION value in +# If this is specified, it will override VERSION value in # $(AP_WORK)\build\NWGNUenvironment.inc # -NLM_VERSION = +NLM_VERSION = # # If this is specified, it will override the default of 64K @@ -138,14 +135,14 @@ NLM_CHECK_SYM = # # If these are specified it will be used by the link '-flags' directive # -NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION +NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION # -# If this is specified it will be linked in with the XDCData option in the def +# If this is specified it will be linked in with the XDCData option in the def # file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled # by setting APACHE_UNIPROC in the environment # -XDCDATA = +XDCDATA = # # If there is an NLM target, put it here @@ -173,7 +170,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + libcpre.o \ $(EOLIST) # @@ -189,7 +186,7 @@ FILES_nlm_modules = \ # If the nlm has a msg file, put it's path here # FILE_nlm_msg = - + # # If the nlm has a hlp file put it's path here # @@ -208,20 +205,20 @@ FILES_nlm_Ximports = \ @$(NWOS)/httpd.imp \ @libc.imp \ $(EOLIST) - -# + +# # Any symbols exported to here # FILES_nlm_exports = \ usertrack_module \ $(EOLIST) - -# + +# # These are the OBJ files needed to create the LIB target above. # Paths must all use the '/' character # FILES_lib_objs = \ - $(EOLIST) + $(EOLIST) # # implement targets and dependancies (leave this section alone) @@ -232,7 +229,7 @@ libs :: $(OBJDIR) $(TARGET_lib) nlms :: libs $(TARGET_nlm) # -# Updated this target to create necessary directories and copy files to the +# Updated this target to create necessary directories and copy files to the # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE @@ -248,3 +245,4 @@ install :: nlms FORCE include $(AP_WORK)\build\NWGNUtail.inc + diff --git a/modules/proxy/NWGNUproxy b/modules/proxy/NWGNUproxy index 94dcc0354b3..d6abf6b3525 100644 --- a/modules/proxy/NWGNUproxy +++ b/modules/proxy/NWGNUproxy @@ -16,20 +16,17 @@ endif # INCDIRS # XINCDIRS += \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ - $(NWOS) \ $(AP_WORK)/modules/http \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/srclib/apr/include \ - $(AP_WORK)/srclib/apr-util/include \ - $(AP_WORK)/srclib/apr \ + $(NWOS) \ $(EOLIST) # # These flags will come after CFLAGS # XCFLAGS += \ - -prefix pre_nw.h \ $(EOLIST) # @@ -59,7 +56,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "noopt" @@ -73,7 +70,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "release" @@ -95,7 +92,7 @@ endif # This is used by the link 'name' directive to name the nlm. If left blank # TARGET_nlm (see below) will be used. # -NLM_NAME = proxy +NLM_NAME = proxy # # This is used by the link '-desc ' directive. @@ -113,7 +110,7 @@ NLM_THREAD_NAME = Proxy Module # If this is specified, it will override VERSION value in # $(AP_WORK)\build\NWGNUenvironment.inc # -NLM_VERSION = +NLM_VERSION = # # If this is specified, it will override the default of 64K @@ -139,14 +136,14 @@ NLM_CHECK_SYM = # # If these are specified it will be used by the link '-flags' directive # -NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION +NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION # # If this is specified it will be linked in with the XDCData option in the def # file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled # by setting APACHE_UNIPROC in the environment # -XDCDATA = +XDCDATA = # # If there is an NLM target, put it here @@ -176,7 +173,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + libcpre.o \ $(EOLIST) # @@ -224,13 +221,13 @@ FILES_nlm_exports = \ ap_proxy_ssl_disable \ proxy_run_fixups \ $(EOLIST) - + # # These are the OBJ files needed to create the LIB target above. # Paths must all use the '/' character # FILES_lib_objs = \ - $(EOLIST) + $(EOLIST) # # implement targets and dependancies (leave this section alone) @@ -261,3 +258,4 @@ $(OBJDIR)/%.o: ../arch/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt include $(AP_WORK)\build\NWGNUtail.inc + diff --git a/modules/proxy/NWGNUproxycon b/modules/proxy/NWGNUproxycon index 241ca3ffdc5..07c91f70507 100644 --- a/modules/proxy/NWGNUproxycon +++ b/modules/proxy/NWGNUproxycon @@ -16,20 +16,17 @@ endif # INCDIRS # XINCDIRS += \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ - $(NWOS) \ $(AP_WORK)/modules/http \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/srclib/apr/include \ - $(AP_WORK)/srclib/apr-util/include \ - $(AP_WORK)/srclib/apr \ + $(NWOS) \ $(EOLIST) # # These flags will come after CFLAGS # XCFLAGS += \ - -prefix pre_nw.h \ $(EOLIST) # @@ -59,7 +56,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "noopt" @@ -73,7 +70,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "release" @@ -95,10 +92,10 @@ endif # This is used by the link 'name' directive to name the nlm. If left blank # TARGET_nlm (see below) will be used. # -NLM_NAME = proxycon +NLM_NAME = proxycon # -# This is used by the link '-desc ' directive. +# This is used by the link '-desc ' directive. # If left blank, NLM_NAME will be used. # NLM_DESCRIPTION = Apache $(VERSION_STR) Proxy Connection Sub-Module @@ -110,10 +107,10 @@ NLM_DESCRIPTION = Apache $(VERSION_STR) Proxy Connection Sub-Module NLM_THREAD_NAME = Proxy Conn Module # -# If this is specified, it will override VERSION value in +# If this is specified, it will override VERSION value in # $(AP_WORK)\build\NWGNUenvironment.inc # -NLM_VERSION = +NLM_VERSION = # # If this is specified, it will override the default of 64K @@ -139,14 +136,14 @@ NLM_CHECK_SYM = # # If these are specified it will be used by the link '-flags' directive # -NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION +NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION # -# If this is specified it will be linked in with the XDCData option in the def +# If this is specified it will be linked in with the XDCData option in the def # file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled # by setting APACHE_UNIPROC in the environment # -XDCDATA = +XDCDATA = # # If there is an NLM target, put it here @@ -175,7 +172,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + libcpre.o \ $(EOLIST) # @@ -192,7 +189,7 @@ FILES_nlm_modules = \ # If the nlm has a msg file, put it's path here # FILE_nlm_msg = - + # # If the nlm has a hlp file put it's path here # @@ -214,20 +211,20 @@ FILES_nlm_Ximports = \ proxy_hook_scheme_handler \ proxy_hook_canon_handler \ $(EOLIST) - -# + +# # Any symbols exported to here # FILES_nlm_exports = \ proxy_connect_module \ $(EOLIST) - -# + +# # These are the OBJ files needed to create the LIB target above. # Paths must all use the '/' character # FILES_lib_objs = \ - $(EOLIST) + $(EOLIST) # # implement targets and dependancies (leave this section alone) @@ -238,7 +235,7 @@ libs :: $(OBJDIR) $(TARGET_lib) nlms :: libs $(TARGET_nlm) # -# Updated this target to create necessary directories and copy files to the +# Updated this target to create necessary directories and copy files to the # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE @@ -254,3 +251,4 @@ install :: nlms FORCE include $(AP_WORK)\build\NWGNUtail.inc + diff --git a/modules/proxy/NWGNUproxyftp b/modules/proxy/NWGNUproxyftp index 6c736069924..bd5d527c6d6 100644 --- a/modules/proxy/NWGNUproxyftp +++ b/modules/proxy/NWGNUproxyftp @@ -16,20 +16,17 @@ endif # INCDIRS # XINCDIRS += \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ - $(NWOS) \ $(AP_WORK)/modules/http \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/srclib/apr/include \ - $(AP_WORK)/srclib/apr-util/include \ - $(AP_WORK)/srclib/apr \ + $(NWOS) \ $(EOLIST) # # These flags will come after CFLAGS # XCFLAGS += \ - -prefix pre_nw.h \ $(EOLIST) # @@ -59,7 +56,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "noopt" @@ -73,7 +70,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "release" @@ -95,7 +92,7 @@ endif # This is used by the link 'name' directive to name the nlm. If left blank # TARGET_nlm (see below) will be used. # -NLM_NAME = proxyftp +NLM_NAME = proxyftp # # This is used by the link '-desc ' directive. @@ -113,7 +110,7 @@ NLM_THREAD_NAME = Proxy FTP Module # If this is specified, it will override VERSION value in # $(AP_WORK)\build\NWGNUenvironment.inc # -NLM_VERSION = +NLM_VERSION = # # If this is specified, it will override the default of 64K @@ -139,14 +136,14 @@ NLM_CHECK_SYM = # # If these are specified it will be used by the link '-flags' directive # -NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION +NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION # # If this is specified it will be linked in with the XDCData option in the def # file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled # by setting APACHE_UNIPROC in the environment # -XDCDATA = +XDCDATA = # # If there is an NLM target, put it here @@ -176,7 +173,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + libcpre.o \ $(EOLIST) # @@ -223,13 +220,13 @@ FILES_nlm_Ximports = \ FILES_nlm_exports = \ proxy_ftp_module \ $(EOLIST) - + # # These are the OBJ files needed to create the LIB target above. # Paths must all use the '/' character # FILES_lib_objs = \ - $(EOLIST) + $(EOLIST) # # implement targets and dependancies (leave this section alone) @@ -260,3 +257,4 @@ $(OBJDIR)/%.o: ../arch/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt include $(AP_WORK)\build\NWGNUtail.inc + diff --git a/modules/proxy/NWGNUproxyhtp b/modules/proxy/NWGNUproxyhtp index 66248d94ac8..5fda26932a8 100644 --- a/modules/proxy/NWGNUproxyhtp +++ b/modules/proxy/NWGNUproxyhtp @@ -16,20 +16,17 @@ endif # INCDIRS # XINCDIRS += \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ - $(NWOS) \ $(AP_WORK)/modules/http \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/srclib/apr/include \ - $(AP_WORK)/srclib/apr-util/include \ - $(AP_WORK)/srclib/apr \ + $(NWOS) \ $(EOLIST) # # These flags will come after CFLAGS # XCFLAGS += \ - -prefix pre_nw.h \ $(EOLIST) # @@ -59,7 +56,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "noopt" @@ -73,7 +70,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "release" @@ -95,10 +92,10 @@ endif # This is used by the link 'name' directive to name the nlm. If left blank # TARGET_nlm (see below) will be used. # -NLM_NAME = proxyhtp +NLM_NAME = proxyhtp # -# This is used by the link '-desc ' directive. +# This is used by the link '-desc ' directive. # If left blank, NLM_NAME will be used. # NLM_DESCRIPTION = Apache $(VERSION_STR) Proxy HTTP Sub-Module @@ -110,10 +107,10 @@ NLM_DESCRIPTION = Apache $(VERSION_STR) Proxy HTTP Sub-Module NLM_THREAD_NAME = Proxy HTTP Module # -# If this is specified, it will override VERSION value in +# If this is specified, it will override VERSION value in # $(AP_WORK)\build\NWGNUenvironment.inc # -NLM_VERSION = +NLM_VERSION = # # If this is specified, it will override the default of 64K @@ -139,14 +136,14 @@ NLM_CHECK_SYM = # # If these are specified it will be used by the link '-flags' directive # -NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION +NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION # -# If this is specified it will be linked in with the XDCData option in the def +# If this is specified it will be linked in with the XDCData option in the def # file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled # by setting APACHE_UNIPROC in the environment # -XDCDATA = +XDCDATA = # # If there is an NLM target, put it here @@ -176,7 +173,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + libcpre.o \ $(EOLIST) # @@ -193,7 +190,7 @@ FILES_nlm_modules = \ # If the nlm has a msg file, put it's path here # FILE_nlm_msg = - + # # If the nlm has a hlp file put it's path here # @@ -219,20 +216,20 @@ FILES_nlm_Ximports = \ ap_proxy_ssl_enable \ ap_proxy_ssl_disable \ $(EOLIST) - -# + +# # Any symbols exported to here # FILES_nlm_exports = \ proxy_http_module \ $(EOLIST) - -# + +# # These are the OBJ files needed to create the LIB target above. # Paths must all use the '/' character # FILES_lib_objs = \ - $(EOLIST) + $(EOLIST) # # implement targets and dependancies (leave this section alone) @@ -243,7 +240,7 @@ libs :: $(OBJDIR) $(TARGET_lib) nlms :: libs $(TARGET_nlm) # -# Updated this target to create necessary directories and copy files to the +# Updated this target to create necessary directories and copy files to the # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE @@ -263,3 +260,4 @@ $(OBJDIR)/%.o: ../arch/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt include $(AP_WORK)\build\NWGNUtail.inc + diff --git a/support/NWGNUab b/support/NWGNUab index d0ca39d1ba1..180a96c3ff3 100644 --- a/support/NWGNUab +++ b/support/NWGNUab @@ -16,12 +16,11 @@ endif # INCDIRS # XINCDIRS += \ - $(NWOS) \ + $(APR)/include \ + $(APRUTIL)/include \ + $(APR)/misc/netware \ $(AP_WORK)/include \ - $(AP_WORK)/srclib/apr/include \ - $(AP_WORK)/srclib/apr-util/include \ - $(AP_WORK)/srclib/apr/misc/netware \ - $(AP_WORK)/srclib/apr \ + $(NWOS) \ $(EOLIST) # @@ -179,7 +178,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + libcpre.o \ $(EOLIST) # @@ -252,3 +251,4 @@ install :: nlms FORCE include $(AP_WORK)\build\NWGNUtail.inc + diff --git a/support/NWGNUhtdbm b/support/NWGNUhtdbm index efb2475a9e1..38e60636eec 100644 --- a/support/NWGNUhtdbm +++ b/support/NWGNUhtdbm @@ -16,11 +16,10 @@ endif # INCDIRS # XINCDIRS += \ + $(APR)/include \ + $(APRUTIL)/include \ + $(APR)/misc/netware \ $(NWOS) \ - $(AP_WORK)/srclib/apr/include \ - $(AP_WORK)/srclib/apr-util/include \ - $(AP_WORK)/srclib/apr/misc/netware \ - $(AP_WORK)/srclib/apr \ $(EOLIST) # @@ -250,3 +249,4 @@ install :: nlms FORCE include $(AP_WORK)\build\NWGNUtail.inc + diff --git a/support/NWGNUhtdigest b/support/NWGNUhtdigest index ae702e0ee2c..48a555503ec 100644 --- a/support/NWGNUhtdigest +++ b/support/NWGNUhtdigest @@ -16,11 +16,10 @@ endif # INCDIRS # XINCDIRS += \ + $(APR)/include \ + $(APRUTIL)/include \ + $(APR)/misc/netware \ $(NWOS) \ - $(AP_WORK)/srclib/apr/include \ - $(AP_WORK)/srclib/apr-util/include \ - $(AP_WORK)/srclib/apr/misc/netware \ - $(AP_WORK)/srclib/apr \ $(EOLIST) # @@ -95,7 +94,7 @@ endif NLM_NAME = htdigest # -# This is used by the link '-desc ' directive. +# This is used by the link '-desc ' directive. # If left blank, NLM_NAME will be used. # NLM_DESCRIPTION = Apache $(VERSION_STR) HT Digest Utility for NetWare @@ -113,10 +112,10 @@ NLM_THREAD_NAME = htdigest NLM_SCREEN_NAME = Digest Password Management # -# If this is specified, it will override VERSION value in +# If this is specified, it will override VERSION value in # $(AP_WORK)\build\NWGNUenvironment.inc # -NLM_VERSION = +NLM_VERSION = # # If this is specified, it will override the default of 64K @@ -142,14 +141,14 @@ NLM_CHECK_SYM = # # If these are specified it will be used by the link '-flags' directive # -NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION +NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION # -# If this is specified it will be linked in with the XDCData option in the def +# If this is specified it will be linked in with the XDCData option in the def # file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled # by setting APACHE_UNIPROC in the environment # -XDCDATA = +XDCDATA = # # If there is an NLM target, put it here @@ -177,7 +176,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + libcpre.o \ $(EOLIST) # @@ -193,7 +192,7 @@ FILES_nlm_modules = \ # If the nlm has a msg file, put it's path here # FILE_nlm_msg = - + # # If the nlm has a hlp file put it's path here # @@ -211,14 +210,14 @@ FILES_nlm_Ximports = \ @$(APR)/aprlib.imp \ @libc.imp \ $(EOLIST) - -# + +# # Any symbols exported to here # FILES_nlm_exports = \ $(EOLIST) - -# + +# # These are the OBJ files needed to create the LIB target above. # Paths must all use the '/' character # @@ -234,7 +233,7 @@ libs :: $(OBJDIR) $(TARGET_lib) nlms :: libs $(TARGET_nlm) # -# Updated this target to create necessary directories and copy files to the +# Updated this target to create necessary directories and copy files to the # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE @@ -250,3 +249,4 @@ install :: nlms FORCE include $(AP_WORK)\build\NWGNUtail.inc + diff --git a/support/NWGNUhtpasswd b/support/NWGNUhtpasswd index 53c7e511d59..b866ec2b3fc 100644 --- a/support/NWGNUhtpasswd +++ b/support/NWGNUhtpasswd @@ -16,11 +16,10 @@ endif # INCDIRS # XINCDIRS += \ + $(APR)/include \ + $(APRUTIL)/include \ + $(APR)/misc/netware \ $(NWOS) \ - $(AP_WORK)/srclib/apr/include \ - $(AP_WORK)/srclib/apr-util/include \ - $(AP_WORK)/srclib/apr/misc/netware \ - $(AP_WORK)/srclib/apr \ $(EOLIST) # @@ -70,7 +69,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "release" @@ -92,10 +91,10 @@ endif # This is used by the link 'name' directive to name the nlm. If left blank # TARGET_nlm (see below) will be used. # -NLM_NAME = htpasswd +NLM_NAME = htpasswd # -# This is used by the link '-desc ' directive. +# This is used by the link '-desc ' directive. # If left blank, NLM_NAME will be used. # NLM_DESCRIPTION = Apache $(VERSION_STR) HT Password Utility for NetWare @@ -113,10 +112,10 @@ NLM_THREAD_NAME = htpasswd NLM_SCREEN_NAME = htpasswd Password Management # -# If this is specified, it will override VERSION value in +# If this is specified, it will override VERSION value in # $(AP_WORK)\build\NWGNUenvironment.inc # -NLM_VERSION = +NLM_VERSION = # # If this is specified, it will override the default of 64K @@ -142,14 +141,14 @@ NLM_CHECK_SYM = # # If these are specified it will be used by the link '-flags' directive # -NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION +NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION # -# If this is specified it will be linked in with the XDCData option in the def +# If this is specified it will be linked in with the XDCData option in the def # file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled # by setting APACHE_UNIPROC in the environment # -XDCDATA = +XDCDATA = # # If there is an NLM target, put it here @@ -177,7 +176,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + libcpre.o \ $(EOLIST) # @@ -193,7 +192,7 @@ FILES_nlm_modules = \ # If the nlm has a msg file, put it's path here # FILE_nlm_msg = - + # # If the nlm has a hlp file put it's path here # @@ -211,19 +210,19 @@ FILES_nlm_Ximports = \ @$(APR)/aprlib.imp \ @libc.imp \ $(EOLIST) - -# + +# # Any symbols exported to here # FILES_nlm_exports = \ $(EOLIST) - -# + +# # These are the OBJ files needed to create the LIB target above. # Paths must all use the '/' character # FILES_lib_objs = \ - $(EOLIST) + $(EOLIST) # # implement targets and dependancies (leave this section alone) @@ -234,7 +233,7 @@ libs :: $(OBJDIR) $(TARGET_lib) nlms :: libs $(TARGET_nlm) # -# Updated this target to create necessary directories and copy files to the +# Updated this target to create necessary directories and copy files to the # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE @@ -250,3 +249,4 @@ install :: nlms FORCE include $(AP_WORK)\build\NWGNUtail.inc + diff --git a/support/NWGNUlogres b/support/NWGNUlogres index 0c717f7137b..f82eee3262b 100644 --- a/support/NWGNUlogres +++ b/support/NWGNUlogres @@ -16,12 +16,11 @@ endif # INCDIRS # XINCDIRS += \ - $(NWOS) \ + $(APR)/include \ + $(APRUTIL)/include \ + $(APR)/misc/netware \ $(AP_WORK)/include \ - $(AP_WORK)/srclib/apr/include \ - $(AP_WORK)/srclib/apr-util/include \ - $(AP_WORK)/srclib/apr/misc/netware \ - $(AP_WORK)/srclib/apr \ + $(NWOS) \ $(EOLIST) # @@ -57,7 +56,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "noopt" @@ -71,7 +70,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "release" @@ -93,7 +92,7 @@ endif # This is used by the link 'name' directive to name the nlm. If left blank # TARGET_nlm (see below) will be used. # -NLM_NAME = logres +NLM_NAME = logres # # This is used by the link '-desc ' directive. @@ -117,7 +116,7 @@ NLM_SCREEN_NAME = Log Resolve # If this is specified, it will override VERSION value in # $(AP_WORK)\build\NWGNUenvironment.inc # -NLM_VERSION = +NLM_VERSION = # # If this is specified, it will override the default of 64K @@ -143,14 +142,14 @@ NLM_CHECK_SYM = # # If these are specified it will be used by the link '-flags' directive # -NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION +NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION # # If this is specified it will be linked in with the XDCData option in the def # file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled # by setting APACHE_UNIPROC in the environment # -XDCDATA = +XDCDATA = # # If there is an NLM target, put it here @@ -178,7 +177,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + libcpre.o \ $(EOLIST) # @@ -225,7 +224,7 @@ FILES_nlm_exports = \ # Paths must all use the '/' character # FILES_lib_objs = \ - $(EOLIST) + $(EOLIST) # # implement targets and dependancies (leave this section alone) @@ -252,3 +251,4 @@ install :: nlms FORCE include $(AP_WORK)\build\NWGNUtail.inc + diff --git a/support/NWGNUrotlogs b/support/NWGNUrotlogs index ab8d76b1f4e..cdd6461ecf6 100644 --- a/support/NWGNUrotlogs +++ b/support/NWGNUrotlogs @@ -16,10 +16,9 @@ endif # INCDIRS # XINCDIRS += \ + $(APR)/include \ + $(APR)/misc/netware \ $(NWOS) \ - $(AP_WORK)/srclib/apr/include \ - $(AP_WORK)/srclib/apr/misc/netware \ - $(AP_WORK)/srclib/apr \ $(EOLIST) # @@ -55,7 +54,7 @@ XDEFINES += \ $(EOLIST) XLFLAGS += \ - $(EOLIST) + $(EOLIST) endif ifeq "$(RELEASE)" "noopt" @@ -91,10 +90,10 @@ endif # This is used by the link 'name' directive to name the nlm. If left blank # TARGET_nlm (see below) will be used. # -NLM_NAME = rotlogs +NLM_NAME = rotlogs # -# This is used by the link '-desc ' directive. +# This is used by the link '-desc ' directive. # If left blank, NLM_NAME will be used. # NLM_DESCRIPTION = Apache $(VERSION_STR) Log Rotation Utility for NetWare @@ -112,10 +111,10 @@ NLM_THREAD_NAME = rotlogs NLM_SCREEN_NAME = DEFAULT # -# If this is specified, it will override VERSION value in +# If this is specified, it will override VERSION value in # $(AP_WORK)\build\NWGNUenvironment.inc # -NLM_VERSION = +NLM_VERSION = # # If this is specified, it will override the default of 64K @@ -141,14 +140,14 @@ NLM_CHECK_SYM = # # If these are specified it will be used by the link '-flags' directive # -NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION, MULTIPLE +NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION, MULTIPLE # -# If this is specified it will be linked in with the XDCData option in the def +# If this is specified it will be linked in with the XDCData option in the def # file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled # by setting APACHE_UNIPROC in the environment # -XDCDATA = +XDCDATA = # # If there is an NLM target, put it here @@ -176,7 +175,7 @@ FILES_nlm_objs = \ # These will be added as a library command in the link.opt file. # FILES_nlm_libs = \ - libcpre.o \ + libcpre.o \ $(EOLIST) # @@ -192,7 +191,7 @@ FILES_nlm_modules = \ # If the nlm has a msg file, put it's path here # FILE_nlm_msg = - + # # If the nlm has a hlp file put it's path here # @@ -210,19 +209,19 @@ FILES_nlm_Ximports = \ @$(APR)/aprlib.imp \ @libc.imp \ $(EOLIST) - -# + +# # Any symbols exported to here # FILES_nlm_exports = \ $(EOLIST) - -# + +# # These are the OBJ files needed to create the LIB target above. # Paths must all use the '/' character # FILES_lib_objs = \ - $(EOLIST) + $(EOLIST) # # implement targets and dependancies (leave this section alone) @@ -233,7 +232,7 @@ libs :: $(OBJDIR) $(TARGET_lib) nlms :: libs $(TARGET_nlm) # -# Updated this target to create necessary directories and copy files to the +# Updated this target to create necessary directories and copy files to the # correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples) # install :: nlms FORCE @@ -249,3 +248,4 @@ install :: nlms FORCE include $(AP_WORK)\build\NWGNUtail.inc +