removed obsolete -prefix; minor cosmetic changes.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@563191 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/NWGNUmakefile b/modules/NWGNUmakefile
index 1bcbf7db7723ca10a1cfba90345f35391b8c76d5..b7bc80b1a39f389c0563b03c9629cd0c7e378068 100644 (file)
--- a/modules/NWGNUmakefile
+++ b/modules/NWGNUmakefile
@@ -37,19 +37,19 @@ endif
 #If the mod_edir directory exists then build the mod_edir module
 ifeq "$(wildcard $(AP_WORK)\modules\mod_edir)" "$(AP_WORK)\modules\mod_edir"
 SUBDIRS += mod_edir \
-              $(EOLIST)
+       $(EOLIST)
 endif
 
 # Allow the experimental modules to be built if EXPERIMENTAL is defined
 ifdef EXPERIMENTAL
 SUBDIRS += experimental \
-              $(EOLIST)
+       $(EOLIST)
 endif
 
-# Allow the experimental modules to be built if EXPERIMENTAL is defined
+# Allow the debug modules to be built if DEBUG is defined
 ifdef DEBUG
 SUBDIRS += debug \
-              $(EOLIST)
+       $(EOLIST)
 endif
 
 
@@ -72,4 +72,5 @@ endif
 # installation area
 #
 install :: nlms FORCE
-       
+
+

diff --git a/modules/aaa/NWGNUauthbasc b/modules/aaa/NWGNUauthbasc
index bc7e1ec92c9c09dae197fee2e50b34d5a5abcd10..e445bf8519b783be99598d83ace3dbc0ada05b54 100644 (file)
--- a/modules/aaa/NWGNUauthbasc
+++ b/modules/aaa/NWGNUauthbasc
@@ -28,7 +28,6 @@ XINCDIRS      += \
 # These flags will come after CFLAGS
 #
 XCFLAGS                += \
-                       -prefix pre_nw.h \
                        $(EOLIST)
 
 #
@@ -58,7 +57,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -72,7 +71,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -94,7 +93,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               = authbasc
+NLM_NAME       = authbasc
 
 #
 # This is used by the link '-desc ' directive. 
@@ -112,7 +111,7 @@ NLM_THREAD_NAME     = AuthBasic 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
@@ -138,14 +137,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
@@ -173,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)
 
 #
@@ -215,13 +214,13 @@ FILES_nlm_Ximports = \
 FILES_nlm_exports = \
        auth_basic_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)
@@ -248,3 +247,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/aaa/NWGNUauthdigt b/modules/aaa/NWGNUauthdigt
index 3b594b29c3325daf189db3c0b5136c6822795d99..762c85335029e8dd4f2943cd49df07ca75c4f625 100644 (file)
--- a/modules/aaa/NWGNUauthdigt
+++ b/modules/aaa/NWGNUauthdigt
@@ -28,7 +28,6 @@ XINCDIRS      += \
 # These flags will come after CFLAGS
 #
 XCFLAGS                += \
-                       -prefix pre_nw.h \
                        $(EOLIST)
 
 #
@@ -58,7 +57,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -72,7 +71,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -94,7 +93,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               = authdigt
+NLM_NAME       = authdigt
 
 #
 # This is used by the link '-desc ' directive. 
@@ -112,7 +111,7 @@ NLM_THREAD_NAME     = Digest 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
@@ -138,14 +137,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
@@ -173,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)
 
 #
@@ -215,13 +214,13 @@ FILES_nlm_Ximports = \
 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)
@@ -248,3 +247,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/aaa/NWGNUauthnalias b/modules/aaa/NWGNUauthnalias
index 3c8449ab456a32dfdd6a137073188eb252102fdf..6dfbef6aa37cbb16e94b1fdd2915710c974f6cca 100644 (file)
--- a/modules/aaa/NWGNUauthnalias
+++ b/modules/aaa/NWGNUauthnalias
@@ -28,7 +28,6 @@ XINCDIRS      += \
 # These flags will come after CFLAGS
 #
 XCFLAGS                += \
-                       -prefix pre_nw.h \
                        $(EOLIST)
 
 #
@@ -58,7 +57,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -72,7 +71,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -94,7 +93,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               = authnalias
+NLM_NAME       = authnalias
 
 #
 # This is used by the link '-desc ' directive. 
@@ -112,7 +111,7 @@ NLM_THREAD_NAME     = AuthnAlias 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
@@ -138,14 +137,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
@@ -173,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)
 
 #
@@ -215,13 +214,13 @@ FILES_nlm_Ximports = \
 FILES_nlm_exports = \
        authn_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)
@@ -248,3 +247,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/aaa/NWGNUauthnano b/modules/aaa/NWGNUauthnano
index 5bdd1c2f822aa4c48df4b07bc256433b8dff0828..0879e4a565cf3687420b12f331a05de3e34a5e03 100644 (file)
--- a/modules/aaa/NWGNUauthnano
+++ b/modules/aaa/NWGNUauthnano
@@ -28,7 +28,6 @@ XINCDIRS      += \
 # These flags will come after CFLAGS
 #
 XCFLAGS                += \
-                       -prefix pre_nw.h \
                        $(EOLIST)
 
 #
@@ -58,7 +57,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -72,7 +71,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -94,7 +93,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               = authnano
+NLM_NAME       = authnano
 
 #
 # This is used by the link '-desc ' directive. 
@@ -112,7 +111,7 @@ NLM_THREAD_NAME     = AuthAnon 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
@@ -138,14 +137,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
@@ -173,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)
 
 #
@@ -215,13 +214,13 @@ FILES_nlm_Ximports = \
 FILES_nlm_exports = \
        authn_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)
@@ -248,3 +247,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/aaa/NWGNUauthndbd b/modules/aaa/NWGNUauthndbd
index 9d7c15bff664917a198ac72ca1ea366e91970ae9..10e3782bb2e3b72570670b4d962bad48c896d491 100644 (file)
--- a/modules/aaa/NWGNUauthndbd
+++ b/modules/aaa/NWGNUauthndbd
@@ -58,7 +58,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -72,7 +72,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -94,7 +94,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               = authndbd
+NLM_NAME       = authndbd
 
 #
 # This is used by the link '-desc ' directive. 
@@ -112,7 +112,7 @@ NLM_THREAD_NAME     = AuthnDBD 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
@@ -138,14 +138,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
@@ -173,7 +173,7 @@ FILES_nlm_objs = \
 # These will be added as a library command in the link.opt file.
 #
 FILES_nlm_libs = \
-       libcpre.o \
+       libcpre.o \
        $(EOLIST)
 
 #
@@ -215,13 +215,13 @@ FILES_nlm_Ximports = \
 FILES_nlm_exports = \
        authn_dbd_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)
@@ -248,3 +248,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/aaa/NWGNUauthndbm b/modules/aaa/NWGNUauthndbm
index 9ebfd871a998fbf43fc24321ff3fb669b883a190..6dbe67f03171092bda230ed9187a92f5618d3481 100644 (file)
--- a/modules/aaa/NWGNUauthndbm
+++ b/modules/aaa/NWGNUauthndbm
@@ -57,7 +57,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -71,7 +71,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -93,7 +93,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               = authndbm
+NLM_NAME       = authndbm
 
 #
 # This is used by the link '-desc ' directive. 
@@ -111,7 +111,7 @@ NLM_THREAD_NAME     = AuthnDBM 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
@@ -137,14 +137,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
@@ -172,7 +172,7 @@ FILES_nlm_objs = \
 # These will be added as a library command in the link.opt file.
 #
 FILES_nlm_libs = \
-       libcpre.o \
+       libcpre.o \
        $(EOLIST)
 
 #
@@ -214,13 +214,13 @@ FILES_nlm_Ximports = \
 FILES_nlm_exports = \
        authn_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)
@@ -247,3 +247,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/aaa/NWGNUauthndef b/modules/aaa/NWGNUauthndef
index e77d40dc337a62735da7192eb9bcfee098f40ac4..c6d2ce2f9088c9da6d35948ca32e7675129366a5 100644 (file)
--- a/modules/aaa/NWGNUauthndef
+++ b/modules/aaa/NWGNUauthndef
@@ -28,7 +28,6 @@ XINCDIRS      += \
 # These flags will come after CFLAGS
 #
 XCFLAGS                += \
-                       -prefix pre_nw.h \
                        $(EOLIST)
 
 #
@@ -58,7 +57,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -72,7 +71,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -94,7 +93,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               = authndef
+NLM_NAME       = authndef
 
 #
 # This is used by the link '-desc ' directive. 
@@ -112,7 +111,7 @@ NLM_THREAD_NAME     = Authndef 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
@@ -138,14 +137,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
@@ -173,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)
 
 #
@@ -215,13 +214,13 @@ FILES_nlm_Ximports = \
 FILES_nlm_exports = \
        authn_default_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)
@@ -248,3 +247,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/aaa/NWGNUauthnfil b/modules/aaa/NWGNUauthnfil
index 1cfbb4227337e7914126e7f14f63ae5a62e94640..5bcb536d3d9e53fa5329b1bb62de313c749c7d76 100644 (file)
--- a/modules/aaa/NWGNUauthnfil
+++ b/modules/aaa/NWGNUauthnfil
@@ -28,7 +28,6 @@ XINCDIRS      += \
 # These flags will come after CFLAGS
 #
 XCFLAGS                += \
-                       -prefix pre_nw.h \
                        $(EOLIST)
 
 #
@@ -58,7 +57,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -72,7 +71,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -94,7 +93,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               = authnfil
+NLM_NAME       = authnfil
 
 #
 # This is used by the link '-desc ' directive. 
@@ -112,7 +111,7 @@ NLM_THREAD_NAME     = AuthnFile 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
@@ -138,14 +137,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
@@ -173,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)
 
 #
@@ -215,13 +214,13 @@ FILES_nlm_Ximports = \
 FILES_nlm_exports = \
        authn_file_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)
@@ -248,3 +247,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/aaa/NWGNUauthnzldap b/modules/aaa/NWGNUauthnzldap
index b1e996df704fac3f57ff71286110257e8e9d8785..ffb475dbdf64c74090bfe576fb68b67ebab274cf 100644 (file)
--- a/modules/aaa/NWGNUauthnzldap
+++ b/modules/aaa/NWGNUauthnzldap
@@ -64,7 +64,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -78,7 +78,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -100,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               = authnzldap
+NLM_NAME       = authnzldap
 
 #
 # This is used by the link '-desc ' directive. 
@@ -118,7 +118,7 @@ NLM_THREAD_NAME     = AuthnzLDAP 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
@@ -144,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
@@ -179,7 +179,7 @@ FILES_nlm_objs = \
 # These will be added as a library command in the link.opt file.
 #
 FILES_nlm_libs = \
-       libcpre.o \
+       libcpre.o \
        $(EOLIST)
 
 #
@@ -229,13 +229,13 @@ FILES_nlm_Ximports = \
 FILES_nlm_exports = \
        authnz_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)
@@ -262,3 +262,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/aaa/NWGNUauthzdbm b/modules/aaa/NWGNUauthzdbm
index 1b7bd137603f0e7274331ed700c6cd2586864531..74a0d3dabd9549f11762e0ef309159301ea09c53 100644 (file)
--- a/modules/aaa/NWGNUauthzdbm
+++ b/modules/aaa/NWGNUauthzdbm
@@ -28,7 +28,6 @@ XINCDIRS      += \
 # These flags will come after CFLAGS
 #
 XCFLAGS                += \
-                       -prefix pre_nw.h \
                        $(EOLIST)
 
 #
@@ -58,7 +57,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -72,7 +71,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -94,7 +93,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               = authzdbm
+NLM_NAME       = authzdbm
 
 #
 # This is used by the link '-desc ' directive. 
@@ -112,7 +111,7 @@ NLM_THREAD_NAME     = AuthzDBM 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
@@ -138,14 +137,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
@@ -173,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)
 
 #
@@ -215,13 +214,13 @@ FILES_nlm_Ximports = \
 FILES_nlm_exports = \
        authz_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)
@@ -248,3 +247,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/aaa/NWGNUauthzdef b/modules/aaa/NWGNUauthzdef
index 348785b04dd12ad25f35b48225e73cb695fa0a05..8b5104eff67822734ace1dcf78fc3016bc4b72f2 100644 (file)
--- a/modules/aaa/NWGNUauthzdef
+++ b/modules/aaa/NWGNUauthzdef
@@ -28,7 +28,6 @@ XINCDIRS      += \
 # These flags will come after CFLAGS
 #
 XCFLAGS                += \
-                       -prefix pre_nw.h \
                        $(EOLIST)
 
 #
@@ -58,7 +57,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -72,7 +71,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -94,7 +93,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               = authzdef
+NLM_NAME       = authzdef
 
 #
 # This is used by the link '-desc ' directive. 
@@ -112,7 +111,7 @@ NLM_THREAD_NAME     = Authzdef 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
@@ -138,14 +137,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
@@ -173,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)
 
 #
@@ -215,13 +214,13 @@ FILES_nlm_Ximports = \
 FILES_nlm_exports = \
        authz_default_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)
@@ -248,3 +247,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/aaa/NWGNUauthzgrp b/modules/aaa/NWGNUauthzgrp
index a104c4fd76f05791d5688edc0c228bb98d6c545f..7ed5dff30d3912f957fe70769e2968e0d2917859 100644 (file)
--- a/modules/aaa/NWGNUauthzgrp
+++ b/modules/aaa/NWGNUauthzgrp
@@ -28,7 +28,6 @@ XINCDIRS      += \
 # These flags will come after CFLAGS
 #
 XCFLAGS                += \
-                       -prefix pre_nw.h \
                        $(EOLIST)
 
 #
@@ -58,7 +57,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -72,7 +71,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -94,7 +93,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               = authzgrp
+NLM_NAME       = authzgrp
 
 #
 # This is used by the link '-desc ' directive. 
@@ -112,7 +111,7 @@ NLM_THREAD_NAME     = AuthzGrp 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
@@ -138,14 +137,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
@@ -173,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)
 
 #
@@ -215,13 +214,13 @@ FILES_nlm_Ximports = \
 FILES_nlm_exports = \
        authz_groupfile_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)
@@ -248,3 +247,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/aaa/NWGNUauthzusr b/modules/aaa/NWGNUauthzusr
index eb9e2c93c3de1355275b5a7e87173978b1ef973c..a97c253ce4a5685c296b8f33cb7c3e5bc45c0523 100644 (file)
--- a/modules/aaa/NWGNUauthzusr
+++ b/modules/aaa/NWGNUauthzusr
@@ -28,7 +28,6 @@ XINCDIRS      += \
 # These flags will come after CFLAGS
 #
 XCFLAGS                += \
-                       -prefix pre_nw.h \
                        $(EOLIST)
 
 #
@@ -58,7 +57,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -72,7 +71,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -94,7 +93,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               = authzusr
+NLM_NAME       = authzusr
 
 #
 # This is used by the link '-desc ' directive. 
@@ -112,7 +111,7 @@ NLM_THREAD_NAME     = AuthzUser 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
@@ -138,14 +137,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
@@ -173,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)
 
 #
@@ -215,7 +214,7 @@ FILES_nlm_Ximports = \
 FILES_nlm_exports = \
        authz_user_module \
        $(EOLIST)
-       
+
 #   
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
@@ -248,3 +247,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/aaa/NWGNUmakefile b/modules/aaa/NWGNUmakefile
index 87f0b03fc57b85153aafe60da1e365c06cc473a1..9ef2cf0449e67626a3b7cf33f51a02fd5b52a642 100644 (file)
--- a/modules/aaa/NWGNUmakefile
+++ b/modules/aaa/NWGNUmakefile
@@ -59,7 +59,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -73,7 +73,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -95,7 +95,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               =
+NLM_NAME       =
 
 #
 # This is used by the link '-desc ' directive. 
@@ -113,7 +113,7 @@ NLM_THREAD_NAME     =
 # 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 +139,14 @@ NLM_CHECK_SYM     =
 #
 # If these are specified it will be used by the link '-flags' directive
 #
-NLM_FLAGS              =
+NLM_FLAGS      =
 
 #
 # 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
@@ -226,13 +226,13 @@ FILES_nlm_Ximports = \
 #
 FILES_nlm_exports = \
        $(EOLIST)
-       
+
 #   
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -259,4 +259,5 @@ install :: nlms FORCE
 #
 
 include $(AP_WORK)\build\NWGNUtail.inc
-       
+
+

diff --git a/modules/cache/NWGNUdsk_cach b/modules/cache/NWGNUdsk_cach
index 9dc385e77e197b589517ab36a462e7e750168abd..b91823dd8a58d8507c4f555296af8de497d77729 100644 (file)
--- a/modules/cache/NWGNUdsk_cach
+++ b/modules/cache/NWGNUdsk_cach
@@ -65,7 +65,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -79,7 +79,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -101,7 +101,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               = dsk_cach
+NLM_NAME       = dsk_cach
 
 #
 # This is used by the link '-desc ' directive. 
@@ -119,7 +119,7 @@ NLM_THREAD_NAME     = dsk_cach
 # 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
@@ -145,14 +145,14 @@ NLM_CHECK_SYM     =
 #
 # If this is specified it will be used by the link '-flags' directive
 #
-NLM_FLAGS              = AUTOUNLOAD, PSEUDOPREEMPTION
+NLM_FLAGS      = AUTOUNLOAD, PSEUDOPREEMPTION
  
 #
 # If this is specified it will be linked in with the XDCData option in the def 
 # file instead of the default of $(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)
@@ -184,7 +184,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)
 
 #
@@ -228,14 +228,14 @@ FILES_nlm_Ximports = \
 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)
@@ -263,4 +263,3 @@ install :: nlms FORCE
 include $(AP_WORK)\build\NWGNUtail.inc
 
 
-       

diff --git a/modules/cache/NWGNUmakefile b/modules/cache/NWGNUmakefile
index 390f94064309bb873e4973c32ef4547ba0198438..868db5485eac807a947b6b1ce0e6a339935fb574 100644 (file)
--- a/modules/cache/NWGNUmakefile
+++ b/modules/cache/NWGNUmakefile
@@ -59,7 +59,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -73,7 +73,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -95,7 +95,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               =
+NLM_NAME       =
 
 #
 # This is used by the link '-desc ' directive.
@@ -113,7 +113,7 @@ NLM_THREAD_NAME     =
 # 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 +139,14 @@ NLM_CHECK_SYM     =
 #
 # If these are specified it will be used by the link '-flags' directive
 #
-NLM_FLAGS              =
+NLM_FLAGS      =
 
 #
 # 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
@@ -156,7 +156,7 @@ TARGET_nlm = \
        $(OBJDIR)/mem_cach.nlm \
        $(OBJDIR)/dsk_cach.nlm \
        $(EOLIST)
-       
+
 #
 # If there is an LIB target, put it here
 #
@@ -216,7 +216,7 @@ FILES_nlm_exports = \
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -244,3 +244,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/cache/NWGNUmem_cach b/modules/cache/NWGNUmem_cach
index 782d8834cf9919e0622c0980aebaa0e201a1151b..bcf98e7f304dce22b55b6ac1de15e72bc581586d 100644 (file)
--- a/modules/cache/NWGNUmem_cach
+++ b/modules/cache/NWGNUmem_cach
@@ -66,7 +66,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -80,7 +80,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -102,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               = mem_cach
+NLM_NAME       = mem_cach
 
 #
 # This is used by the link '-desc ' directive. 
@@ -120,7 +120,7 @@ NLM_THREAD_NAME     = mem_cach
 # 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 +146,14 @@ NLM_CHECK_SYM     =
 #
 # If this is specified it will be used by the link '-flags' directive
 #
-NLM_FLAGS              = AUTOUNLOAD, PSEUDOPREEMPTION
+NLM_FLAGS      = AUTOUNLOAD, PSEUDOPREEMPTION
  
 #
 # If this is specified it will be linked in with the XDCData option in the def 
 # file instead of the default of $(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)
@@ -188,7 +188,7 @@ FILES_nlm_objs = \
 # These will be added as a library command in the link.opt file.
 #
 FILES_nlm_libs = \
-       libcpre.o \
+       libcpre.o \
        $(EOLIST)
 
 #
@@ -232,14 +232,14 @@ FILES_nlm_Ximports = \
 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)
@@ -267,4 +267,3 @@ install :: nlms FORCE
 include $(AP_WORK)\build\NWGNUtail.inc
 
 
-       

diff --git a/modules/cache/NWGNUmod_cach b/modules/cache/NWGNUmod_cach
index 125c4567940bbe24fa3e8948afd158ce3d74b166..ff0a9667174edb52f5c7ff491a4714b21d5a326a 100644 (file)
--- a/modules/cache/NWGNUmod_cach
+++ b/modules/cache/NWGNUmod_cach
@@ -66,7 +66,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -80,7 +80,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -102,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               = mod_cach
+NLM_NAME       = mod_cach
 
 #
 # This is used by the link '-desc ' directive. 
@@ -120,7 +120,7 @@ NLM_THREAD_NAME     = mod_cach
 # 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 +146,14 @@ NLM_CHECK_SYM     =
 #
 # If this is specified it will be used by the link '-flags' directive
 #
-NLM_FLAGS              = AUTOUNLOAD, PSEUDOPREEMPTION
+NLM_FLAGS      = AUTOUNLOAD, PSEUDOPREEMPTION
  
 #
 # If this is specified it will be linked in with the XDCData option in the def 
 # file instead of the default of $(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)
@@ -182,13 +182,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)
 
 #
@@ -232,13 +231,13 @@ 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)
@@ -266,4 +265,3 @@ install :: nlms FORCE
 include $(AP_WORK)\build\NWGNUtail.inc
 
 
-       

diff --git a/modules/database/NWGNUmakefile b/modules/database/NWGNUmakefile
index 90ed6ee20b713d44cb3d19c35b6e6f5d42569129..a418f1227462ae10c26a75b545ee237b28b42a25 100644 (file)
--- a/modules/database/NWGNUmakefile
+++ b/modules/database/NWGNUmakefile
@@ -36,7 +36,6 @@ XINCDIRS      += \
 # These flags will come after CFLAGS
 #
 XCFLAGS                += \
-                       -prefix pre_nw.h \
                        $(EOLIST)
 
 #
@@ -66,7 +65,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -80,7 +79,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -102,7 +101,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               = moddbd
+NLM_NAME       = moddbd
 
 #
 # This is used by the link '-desc ' directive. 
@@ -120,7 +119,7 @@ NLM_THREAD_NAME     = DBD 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 +145,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 +180,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)
 
 #
@@ -228,13 +227,13 @@ FILES_nlm_exports = \
        ap_dbd_cacquire \
        ap_dbd_prepare \
        $(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)
@@ -263,4 +262,3 @@ install :: nlms FORCE
 include $(AP_WORK)\build\NWGNUtail.inc
 
 
-       

diff --git a/modules/dav/fs/NWGNUmakefile b/modules/dav/fs/NWGNUmakefile
index fda45fd12498b424d9c617a63e22063ededa8886..e9c27aea92a24405f777b45e5e70705572f2a917 100644 (file)
--- a/modules/dav/fs/NWGNUmakefile
+++ b/modules/dav/fs/NWGNUmakefile
@@ -68,7 +68,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -82,7 +82,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -104,7 +104,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               = modDAVFS
+NLM_NAME       = modDAVFS
 
 #
 # This is used by the link '-desc ' directive. 
@@ -122,7 +122,7 @@ NLM_THREAD_NAME     = modDAVFS Thread
 # 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,7 +148,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 +184,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)
 
 #
@@ -234,13 +234,13 @@ endif
 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)
@@ -270,4 +270,3 @@ vpath %.c ../../arch/netware
 include $(AP_WORK)\build\NWGNUtail.inc
 
 
-       

diff --git a/modules/dav/lock/NWGNUmakefile b/modules/dav/lock/NWGNUmakefile
index aa631dc146a14211af19e3853632761324a8bc1c..66e22eae934dcc4d6f34a9c817682b6e6d6fbf54 100644 (file)
--- a/modules/dav/lock/NWGNUmakefile
+++ b/modules/dav/lock/NWGNUmakefile
@@ -67,7 +67,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -81,7 +81,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -103,7 +103,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               = modDAVLK
+NLM_NAME       = modDAVLK
 
 #
 # This is used by the link '-desc ' directive. 
@@ -121,7 +121,7 @@ NLM_THREAD_NAME     = modDAVLK Thread
 # 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
@@ -147,7 +147,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)
@@ -180,7 +180,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 +224,13 @@ FILES_nlm_Ximports = \
 FILES_nlm_exports = \
        dav_lock_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)
@@ -258,4 +258,3 @@ install :: nlms FORCE
 include $(AP_WORK)\build\NWGNUtail.inc
 
 
-       

diff --git a/modules/dav/main/NWGNUmakefile b/modules/dav/main/NWGNUmakefile
index 441a6651d565bf0009900be9c911dc1c64f1e3e8..c8626342f7953a2199e5bf265cec9e5ba560de16 100644 (file)
--- a/modules/dav/main/NWGNUmakefile
+++ b/modules/dav/main/NWGNUmakefile
@@ -65,7 +65,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -79,7 +79,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -101,7 +101,7 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = mod_DAV
+NLM_NAME       = mod_DAV
 
 #
 # This is used by the link '-desc ' directive. 
@@ -119,7 +119,7 @@ NLM_THREAD_NAME     = mod_DAV
 # 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
@@ -145,7 +145,7 @@ NLM_CHECK_SYM       =
 #
 # If this is specified it will be used by the link '-flags' directive
 #
-NLM_FLAGS              = AUTOUNLOAD, PSEUDOPREEMPTION
+NLM_FLAGS      = AUTOUNLOAD, PSEUDOPREEMPTION
  
 #
 # If this is specified it will be linked in with the XDCData option in the def 
@@ -190,7 +190,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)
 
 #
@@ -233,13 +233,13 @@ 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)
@@ -268,4 +268,3 @@ install :: nlms FORCE
 include $(AP_WORK)\build\NWGNUtail.inc
 
 
-       

diff --git a/modules/debug/NWGNUmakefile b/modules/debug/NWGNUmakefile
index b9023fba832d3e484824f7c243ab79460f01dd8f..8a1993d34a8f88c686bf720c0b0215b13b13408f 100644 (file)
--- a/modules/debug/NWGNUmakefile
+++ b/modules/debug/NWGNUmakefile
@@ -59,7 +59,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -73,7 +73,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -95,7 +95,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               =
+NLM_NAME       =
 
 #
 # This is used by the link '-desc ' directive. 
@@ -113,7 +113,7 @@ NLM_THREAD_NAME     =
 # 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 +139,14 @@ NLM_CHECK_SYM     =
 #
 # If these are specified it will be used by the link '-flags' directive
 #
-NLM_FLAGS              =
+NLM_FLAGS      =
 
 #
 # 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
@@ -155,7 +155,6 @@ TARGET_nlm = \
        $(OBJDIR)/moddumpio.nlm \
        $(OBJDIR)/modbucketeer.nlm \
        $(EOLIST)
-       
 
 #
 # If there is an LIB target, put it here
@@ -210,13 +209,13 @@ FILES_nlm_Ximports = \
 #
 FILES_nlm_exports = \
        $(EOLIST)
-       
+
 #   
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -243,4 +242,5 @@ install :: nlms FORCE
 #
 
 include $(AP_WORK)\build\NWGNUtail.inc
-       
+
+

diff --git a/modules/debug/NWGNUmodbucketeer b/modules/debug/NWGNUmodbucketeer
index 1c14170ad5eca8f964624f7d7a6904157d7c4769..739ba354ab3208f6cc4f6b753383a0bb93ee1e99 100644 (file)
--- a/modules/debug/NWGNUmodbucketeer
+++ b/modules/debug/NWGNUmodbucketeer
@@ -28,7 +28,6 @@ XINCDIRS      += \
 # These flags will come after CFLAGS
 #
 XCFLAGS                += \
-                       -prefix pre_nw.h \
                        $(EOLIST)
 
 #
@@ -58,7 +57,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -72,7 +71,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -94,7 +93,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               = modbucketeer
+NLM_NAME       = modbucketeer
 
 #
 # This is used by the link '-desc ' directive. 
@@ -112,7 +111,7 @@ NLM_THREAD_NAME     = Bucketeer 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
@@ -138,14 +137,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
@@ -173,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)
 
 #
@@ -215,13 +214,13 @@ FILES_nlm_Ximports = \
 FILES_nlm_exports = \
        bucketeer_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)
@@ -248,3 +247,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/debug/NWGNUmoddumpio b/modules/debug/NWGNUmoddumpio
index 7db7075d1ee01aa2acd2aa815ff01f420a7c8bc7..349db536980b89b61806d3e4dfb8651ad43c8280 100644 (file)
--- a/modules/debug/NWGNUmoddumpio
+++ b/modules/debug/NWGNUmoddumpio
@@ -28,7 +28,6 @@ XINCDIRS      += \
 # These flags will come after CFLAGS
 #
 XCFLAGS                += \
-                       -prefix pre_nw.h \
                        $(EOLIST)
 
 #
@@ -58,7 +57,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -72,7 +71,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -94,7 +93,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               = moddumpio
+NLM_NAME       = moddumpio
 
 #
 # This is used by the link '-desc ' directive. 
@@ -112,7 +111,7 @@ NLM_THREAD_NAME     = DumpIO 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
@@ -138,14 +137,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
@@ -173,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)
 
 #
@@ -215,13 +214,13 @@ FILES_nlm_Ximports = \
 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)
@@ -248,3 +247,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/echo/NWGNUmakefile b/modules/echo/NWGNUmakefile
index b6e2efb460613919671b0394a7b1912d4ebca6fc..d456bf197c1560b541c950f8116b3be9ba2ef5dd 100644 (file)
--- a/modules/echo/NWGNUmakefile
+++ b/modules/echo/NWGNUmakefile
@@ -36,7 +36,6 @@ XINCDIRS      += \
 # These flags will come after CFLAGS
 #
 XCFLAGS                += \
-                       -prefix pre_nw.h \
                        $(EOLIST)
 
 #
@@ -66,7 +65,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -80,7 +79,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -102,7 +101,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               = echo
+NLM_NAME       = echo
 
 #
 # This is used by the link '-desc ' directive. 
@@ -120,7 +119,7 @@ NLM_THREAD_NAME     = Echo 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 +145,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 +180,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 +222,13 @@ FILES_nlm_Ximports = \
 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)
@@ -258,4 +257,3 @@ install :: nlms FORCE
 include $(AP_WORK)\build\NWGNUtail.inc
 
 
-       

diff --git a/modules/experimental/NWGNUcase_flt b/modules/experimental/NWGNUcase_flt
index ba57463fd9adddd5a3a0691977a4e27b185f9a22..f696b86369f093003cde53bafca00c2b780832be 100644 (file)
--- a/modules/experimental/NWGNUcase_flt
+++ b/modules/experimental/NWGNUcase_flt
@@ -256,4 +256,3 @@ install :: nlms FORCE
 include $(AP_WORK)\build\NWGNUtail.inc
 
 
-

diff --git a/modules/experimental/NWGNUcase_flt_in b/modules/experimental/NWGNUcase_flt_in
index 5f9853a0b7f168283d2a31712ee8788d7568b95e..d9ec3113a68fa79dbd9d45412e8510226503352e 100644 (file)
--- a/modules/experimental/NWGNUcase_flt_in
+++ b/modules/experimental/NWGNUcase_flt_in
@@ -256,4 +256,3 @@ install :: nlms FORCE
 include $(AP_WORK)\build\NWGNUtail.inc
 
 
-

diff --git a/modules/experimental/NWGNUexample b/modules/experimental/NWGNUexample
index 13c97b1d66a2ec5bd83c1e2dd900fcdd5204c8f2..8979261698efe923e47171a632a649fbc97ba662 100644 (file)
--- a/modules/experimental/NWGNUexample
+++ b/modules/experimental/NWGNUexample
@@ -36,7 +36,6 @@ XINCDIRS      += \
 # These flags will come after CFLAGS
 #
 XCFLAGS                += \
-                       -prefix pre_nw.h \
                        $(EOLIST)
 
 #
@@ -66,7 +65,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -80,7 +79,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -102,7 +101,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 +119,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 +145,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 +180,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 +228,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 +256,3 @@ install :: nlms FORCE
 include $(AP_WORK)\build\NWGNUtail.inc
 
 
-

diff --git a/modules/experimental/NWGNUmakefile b/modules/experimental/NWGNUmakefile
index bf5300bc8bd77df181e70398388ed13eac59901c..1189aa8f0727ced7f99640ac831563fb63aa714f 100644 (file)
--- a/modules/experimental/NWGNUmakefile
+++ b/modules/experimental/NWGNUmakefile
@@ -59,7 +59,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -73,7 +73,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -95,7 +95,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               =
+NLM_NAME       =
 
 #
 # This is used by the link '-desc ' directive.
@@ -113,7 +113,7 @@ NLM_THREAD_NAME     =
 # 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 +139,14 @@ NLM_CHECK_SYM     =
 #
 # If these are specified it will be used by the link '-flags' directive
 #
-NLM_FLAGS              =
+NLM_FLAGS      =
 
 #
 # 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
@@ -164,7 +164,7 @@ TARGET_nlm = \
        $(OBJDIR)/case_flt.nlm \
        $(OBJDIR)/case_flt_in.nlm \
        $(EOLIST)
-       
+
 #
 # If there is an LIB target, put it here
 #
@@ -224,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 +252,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/filters/NWGNUcharsetl b/modules/filters/NWGNUcharsetl
index 7094e9447f03901341c209bc8c05b8388384d2a0..8e28c2855f5209f31769a6c36b889960bdeed5bf 100644 (file)
--- a/modules/filters/NWGNUcharsetl
+++ b/modules/filters/NWGNUcharsetl
@@ -42,7 +42,7 @@ XCFLAGS               += \
 # These defines will come after DEFINES
 #
 XDEFINES       += \
-       -DAP_WANT_DIR_TRANSLATION \
+                       -DAP_WANT_DIR_TRANSLATION \
                        $(EOLIST)
 
 #
@@ -102,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               = charsetl
+NLM_NAME       = charsetl
 
 #
 # This is used by the link '-desc ' directive.
@@ -120,7 +120,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 +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
@@ -229,7 +229,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 +257,3 @@ install :: nlms FORCE
 include $(AP_WORK)\build\NWGNUtail.inc
 
 
-

diff --git a/modules/filters/NWGNUdeflate b/modules/filters/NWGNUdeflate
index 2288bd629a3ef982ae0712fa8a5bc80975db8785..635746d676dd4f94b30e70c4c30fc43dee7894a7 100644 (file)
--- a/modules/filters/NWGNUdeflate
+++ b/modules/filters/NWGNUdeflate
@@ -104,7 +104,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.
@@ -278,4 +278,3 @@ vpath %.c $(ZLIBSDK)
 include $(AP_WORK)\build\NWGNUtail.inc
 
 
-

diff --git a/modules/filters/NWGNUextfiltr b/modules/filters/NWGNUextfiltr
index 1de291ca2b53cd81f9839f755718f32a77f0e83a..c517f698118af0a20e889d69b0c7414683697539 100644 (file)
--- a/modules/filters/NWGNUextfiltr
+++ b/modules/filters/NWGNUextfiltr
@@ -28,7 +28,6 @@ XINCDIRS      += \
 # These flags will come after CFLAGS
 #
 XCFLAGS                += \
-                       -prefix pre_nw.h \
                        $(EOLIST)
 
 #
@@ -58,7 +57,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -72,7 +71,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -94,7 +93,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               = extfiltr
+NLM_NAME       = extfiltr
 
 #
 # This is used by the link '-desc ' directive. 
@@ -112,7 +111,7 @@ NLM_THREAD_NAME     = ExtFilter 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
@@ -138,14 +137,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
@@ -173,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)
 
 #
@@ -215,13 +214,13 @@ FILES_nlm_Ximports = \
 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)
@@ -248,3 +247,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/filters/NWGNUmakefile b/modules/filters/NWGNUmakefile
index 18df9026a63ed0507337342fec1e6d91ace1894e..4433689ee568f94ce38729b9e371afb0458fae02 100644 (file)
--- a/modules/filters/NWGNUmakefile
+++ b/modules/filters/NWGNUmakefile
@@ -59,7 +59,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -73,7 +73,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -95,7 +95,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               =
+NLM_NAME       =
 
 #
 # This is used by the link '-desc ' directive.
@@ -113,7 +113,7 @@ NLM_THREAD_NAME     =
 # 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 +139,14 @@ NLM_CHECK_SYM     =
 #
 # If these are specified it will be used by the link '-flags' directive
 #
-NLM_FLAGS              =
+NLM_FLAGS      =
 
 #
 # 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
@@ -156,12 +156,12 @@ TARGET_nlm = \
        $(OBJDIR)/charsetl.nlm \
        $(OBJDIR)/mod_filter.nlm \
        $(EOLIST)
-       
+
 # If the zlib libraries source exists then build the mod_deflate module
 ifneq "$(ZLIBSDK)" ""
 ifeq "$(wildcard $(ZLIBSDK))" "$(ZLIBSDK)"
 TARGET_nlm += $(OBJDIR)/deflate.nlm \
-              $(EOLIST)
+       $(EOLIST)
 endif
 endif
 
@@ -224,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 +252,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/filters/NWGNUmod_filter b/modules/filters/NWGNUmod_filter
index ec671c59634cc6226db6fffaa02300cee97ba761..386960557ba6b634bf4d8edbf2adb02eae0cda4f 100644 (file)
--- a/modules/filters/NWGNUmod_filter
+++ b/modules/filters/NWGNUmod_filter
@@ -28,7 +28,6 @@ XINCDIRS      += \
 # These flags will come after CFLAGS
 #
 XCFLAGS                += \
-                       -prefix pre_nw.h \
                        $(EOLIST)
 
 #
@@ -58,7 +57,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -72,7 +71,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -94,7 +93,7 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = mod_filter
+NLM_NAME       = mod_filter
 
 #
 # This is used by the link '-desc ' directive. 
@@ -112,7 +111,7 @@ NLM_THREAD_NAME     = Filter 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
@@ -138,14 +137,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
@@ -173,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)
 
 #
@@ -215,13 +214,13 @@ FILES_nlm_Ximports = \
 FILES_nlm_exports = \
        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)
@@ -248,3 +247,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/generators/NWGNUautoindex b/modules/generators/NWGNUautoindex
index 54465861183ee11b11adf6ce635e3d603d73127d..cc9619a626f8db1c2a84797dab51b16fdc8b46f1 100644 (file)
--- a/modules/generators/NWGNUautoindex
+++ b/modules/generators/NWGNUautoindex
@@ -29,7 +29,6 @@ XINCDIRS      += \
 # These flags will come after CFLAGS
 #
 XCFLAGS                += \
-                       -prefix pre_nw.h \
                        $(EOLIST)
 
 #
@@ -59,7 +58,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -73,7 +72,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -95,7 +94,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               = autoindex
+NLM_NAME       = autoindex
 
 #
 # This is used by the link '-desc ' directive. 
@@ -113,7 +112,7 @@ NLM_THREAD_NAME     = Autoindex 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 +138,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
@@ -174,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)
 
 #
@@ -216,13 +215,13 @@ FILES_nlm_Ximports = \
 FILES_nlm_exports = \
        autoindex_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)
@@ -249,3 +248,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/generators/NWGNUinfo b/modules/generators/NWGNUinfo
index 8d1a8972f922e3ec530ab3500655a0ff54de3c5f..e718539f0892edf0dd68ebcd9fb1beb0d31663fe 100644 (file)
--- a/modules/generators/NWGNUinfo
+++ b/modules/generators/NWGNUinfo
@@ -28,7 +28,6 @@ XINCDIRS      += \
 # These flags will come after CFLAGS
 #
 XCFLAGS                += \
-                       -prefix pre_nw.h \
                        $(EOLIST)
 
 #
@@ -58,7 +57,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -72,7 +71,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -94,7 +93,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               = info
+NLM_NAME       = info
 
 #
 # This is used by the link '-desc ' directive. 
@@ -112,7 +111,7 @@ NLM_THREAD_NAME     = Info 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
@@ -138,14 +137,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
@@ -173,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)
 
 #
@@ -215,13 +214,13 @@ FILES_nlm_Ximports = \
 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)
@@ -248,3 +247,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/generators/NWGNUmakefile b/modules/generators/NWGNUmakefile
index 1dbf7aa296d72fa957039961aec80379050ff258..a895d8c4714fc89b350c42eb8cb60eea157ec9a1 100644 (file)
--- a/modules/generators/NWGNUmakefile
+++ b/modules/generators/NWGNUmakefile
@@ -59,7 +59,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -73,7 +73,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -95,7 +95,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               =
+NLM_NAME       =
 
 #
 # This is used by the link '-desc ' directive. 
@@ -113,7 +113,7 @@ NLM_THREAD_NAME     =
 # 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 +139,14 @@ NLM_CHECK_SYM     =
 #
 # If these are specified it will be used by the link '-flags' directive
 #
-NLM_FLAGS              =
+NLM_FLAGS      =
 
 #
 # 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
@@ -212,13 +212,13 @@ FILES_nlm_Ximports = \
 #
 FILES_nlm_exports = \
        $(EOLIST)
-       
+
 #   
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -247,4 +247,3 @@ install :: nlms FORCE
 include $(AP_WORK)\build\NWGNUtail.inc
 
 
-       

diff --git a/modules/generators/NWGNUmod_asis b/modules/generators/NWGNUmod_asis
index f4d22a992275747f15e695f81691509c45cc7720..62ce6eedb79135b090487aa7694f6d53d2390061 100644 (file)
--- a/modules/generators/NWGNUmod_asis
+++ b/modules/generators/NWGNUmod_asis
@@ -29,7 +29,6 @@ XINCDIRS      += \
 # These flags will come after CFLAGS
 #
 XCFLAGS                += \
-                       -prefix pre_nw.h \
                        $(EOLIST)
 
 #
@@ -59,7 +58,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -73,7 +72,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -95,7 +94,7 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = mod_asis
+NLM_NAME       = mod_asis
 
 #
 # This is used by the link '-desc ' directive. 
@@ -113,7 +112,7 @@ NLM_THREAD_NAME     = Mod_asis 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 +138,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
@@ -174,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)
 
 #
@@ -216,13 +215,13 @@ FILES_nlm_Ximports = \
 FILES_nlm_exports = \
        asis_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)
@@ -249,3 +248,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/generators/NWGNUmod_cgi b/modules/generators/NWGNUmod_cgi
index 179621216721ffcd234c6afb5808cc292df42007..70d62558aa7e063094a448e68bda2e2925ba5ea2 100644 (file)
--- a/modules/generators/NWGNUmod_cgi
+++ b/modules/generators/NWGNUmod_cgi
@@ -30,7 +30,6 @@ XINCDIRS      += \
 # These flags will come after CFLAGS
 #
 XCFLAGS                += \
-                       -prefix pre_nw.h \
                        $(EOLIST)
 
 #
@@ -60,7 +59,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -74,7 +73,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -96,7 +95,7 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = mod_cgi
+NLM_NAME       = mod_cgi
 
 #
 # This is used by the link '-desc ' directive. 
@@ -114,7 +113,7 @@ NLM_THREAD_NAME     = Mod_cgi 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
@@ -140,14 +139,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
@@ -175,7 +174,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)
 
 #
@@ -217,13 +216,13 @@ FILES_nlm_Ximports = \
 FILES_nlm_exports = \
        cgi_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,3 +249,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/generators/NWGNUstatus b/modules/generators/NWGNUstatus
index 6e9c1d823afa0c3c14d7621808be21d97033aeb0..e161e4387f04ecf1bc082bd034d2f0f910c1e22e 100644 (file)
--- a/modules/generators/NWGNUstatus
+++ b/modules/generators/NWGNUstatus
@@ -28,7 +28,6 @@ XINCDIRS      += \
 # These flags will come after CFLAGS
 #
 XCFLAGS                += \
-                       -prefix pre_nw.h \
                        $(EOLIST)
 
 #
@@ -58,7 +57,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -72,7 +71,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -94,7 +93,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               = status
+NLM_NAME       = status
 
 #
 # This is used by the link '-desc ' directive. 
@@ -112,7 +111,7 @@ NLM_THREAD_NAME     = Status 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
@@ -138,14 +137,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
@@ -173,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)
 
 #
@@ -215,13 +214,13 @@ FILES_nlm_Ximports = \
 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)
@@ -248,3 +247,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/ldap/NWGNUmakefile b/modules/ldap/NWGNUmakefile
index e8a69666344bddd77b71c6b1686d4041cc857d47..ad7956e661529e18be529ce0b58a90762e74d2b7 100644 (file)
--- a/modules/ldap/NWGNUmakefile
+++ b/modules/ldap/NWGNUmakefile
@@ -28,7 +28,6 @@ XINCDIRS      += \
 # These flags will come after CFLAGS
 #
 XCFLAGS                += \
-                       -prefix pre_nw.h \
                        $(EOLIST)
 
 #
@@ -66,7 +65,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -80,7 +79,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -102,7 +101,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               = utilldap
+NLM_NAME       = utilldap
 
 #
 # This is used by the link '-desc ' directive. 
@@ -120,7 +119,7 @@ NLM_THREAD_NAME     = UtilLDAP 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 +145,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
@@ -183,7 +182,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,13 +228,13 @@ FILES_nlm_Ximports = \
 FILES_nlm_exports = \
        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)
@@ -263,3 +262,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/loggers/NWGNUforensic b/modules/loggers/NWGNUforensic
index 6ebcd38f04c9e2a1b37cf155b97ab82c08344ae1..18851819f36b250b2c24a33941d795f545e3ef02 100644 (file)
--- a/modules/loggers/NWGNUforensic
+++ b/modules/loggers/NWGNUforensic
@@ -36,7 +36,6 @@ XINCDIRS      += \
 # These flags will come after CFLAGS
 #
 XCFLAGS                += \
-                       -prefix pre_nw.h \
                        $(EOLIST)
 
 #
@@ -66,7 +65,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -80,7 +79,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -102,7 +101,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               = forensic
+NLM_NAME       = forensic
 
 #
 # This is used by the link '-desc ' directive. 
@@ -120,7 +119,7 @@ NLM_THREAD_NAME     = Forensic 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 +145,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 +180,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 +222,13 @@ FILES_nlm_Ximports = \
 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)
@@ -258,4 +257,3 @@ install :: nlms FORCE
 include $(AP_WORK)\build\NWGNUtail.inc
 
 
-       

diff --git a/modules/loggers/NWGNUmakefile b/modules/loggers/NWGNUmakefile
index f0504acd86b385ccd054fd3f506a51993000923c..219e13fe204773e3090a47a7e5a76179b5f6d80c 100644 (file)
--- a/modules/loggers/NWGNUmakefile
+++ b/modules/loggers/NWGNUmakefile
@@ -59,7 +59,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -73,7 +73,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -95,7 +95,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               =
+NLM_NAME       =
 
 #
 # This is used by the link '-desc ' directive. 
@@ -113,7 +113,7 @@ NLM_THREAD_NAME     =
 # 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 +139,14 @@ NLM_CHECK_SYM     =
 #
 # If these are specified it will be used by the link '-flags' directive
 #
-NLM_FLAGS              =
+NLM_FLAGS      =
 
 #
 # 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
@@ -209,13 +209,13 @@ FILES_nlm_Ximports = \
 #
 FILES_nlm_exports = \
        $(EOLIST)
-       
+
 #   
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -244,4 +244,3 @@ install :: nlms FORCE
 include $(AP_WORK)\build\NWGNUtail.inc
 
 
-       

diff --git a/modules/loggers/NWGNUmodlogio b/modules/loggers/NWGNUmodlogio
index 83e0c2c18273a02e7169ff7753fef2d97cf39fd4..80ac8041568933378b7b0b542845d8c0174f17d0 100644 (file)
--- a/modules/loggers/NWGNUmodlogio
+++ b/modules/loggers/NWGNUmodlogio
@@ -36,7 +36,6 @@ XINCDIRS      += \
 # These flags will come after CFLAGS
 #
 XCFLAGS                += \
-                       -prefix pre_nw.h \
                        $(EOLIST)
 
 #
@@ -66,7 +65,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -80,7 +79,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -102,7 +101,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               = logio
+NLM_NAME       = logio
 
 #
 # This is used by the link '-desc ' directive. 
@@ -120,7 +119,7 @@ NLM_THREAD_NAME     = Logio 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 +145,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 +180,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 +222,13 @@ FILES_nlm_Ximports = \
 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)
@@ -258,4 +257,3 @@ install :: nlms FORCE
 include $(AP_WORK)\build\NWGNUtail.inc
 
 
-       

diff --git a/modules/mappers/NWGNUactions b/modules/mappers/NWGNUactions
index 479e4ff21c2076d7c6cc1aa74e8364d09e2fd6fe..6594ad62c64bd603ade174e49058f676bf6af650 100644 (file)
--- a/modules/mappers/NWGNUactions
+++ b/modules/mappers/NWGNUactions
@@ -57,7 +57,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -71,7 +71,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -93,7 +93,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               = actions
+NLM_NAME       = actions
 
 #
 # This is used by the link '-desc ' directive. 
@@ -111,7 +111,7 @@ NLM_THREAD_NAME     = Actions 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
@@ -137,14 +137,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
@@ -172,7 +172,7 @@ FILES_nlm_objs = \
 # These will be added as a library command in the link.opt file.
 #
 FILES_nlm_libs = \
-       libcpre.o \
+       libcpre.o \
        $(EOLIST)
 
 #
@@ -214,13 +214,13 @@ FILES_nlm_Ximports = \
 FILES_nlm_exports = \
        actions_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)
@@ -247,3 +247,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/mappers/NWGNUimagemap b/modules/mappers/NWGNUimagemap
index dbce0cb1801ddad46388e37a53c801b4f5363450..087b490ca99ac4107d350b496b71e8a4bee8422e 100644 (file)
--- a/modules/mappers/NWGNUimagemap
+++ b/modules/mappers/NWGNUimagemap
@@ -58,7 +58,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -72,7 +72,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -94,7 +94,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               = imagemap
+NLM_NAME       = imagemap
 
 #
 # This is used by the link '-desc ' directive. 
@@ -112,7 +112,7 @@ NLM_THREAD_NAME     = Image Map 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
@@ -138,14 +138,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
@@ -173,7 +173,7 @@ FILES_nlm_objs = \
 # These will be added as a library command in the link.opt file.
 #
 FILES_nlm_libs = \
-       libcpre.o \
+       libcpre.o \
        $(EOLIST)
 
 #
@@ -215,13 +215,13 @@ FILES_nlm_Ximports = \
 FILES_nlm_exports = \
        imagemap_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)
@@ -248,3 +248,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/mappers/NWGNUmakefile b/modules/mappers/NWGNUmakefile
index 8d284ab3692b385efb6e5e50c53b3f7b9765178a..35e0f82521c3b3606a77431e632395caf43bd006 100644 (file)
--- a/modules/mappers/NWGNUmakefile
+++ b/modules/mappers/NWGNUmakefile
@@ -59,7 +59,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -73,7 +73,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -95,7 +95,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               =
+NLM_NAME       =
 
 #
 # This is used by the link '-desc ' directive. 
@@ -113,7 +113,7 @@ NLM_THREAD_NAME     =
 # 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 +139,14 @@ NLM_CHECK_SYM     =
 #
 # If these are specified it will be used by the link '-flags' directive
 #
-NLM_FLAGS              =
+NLM_FLAGS      =
 
 #
 # 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
@@ -213,13 +213,13 @@ FILES_nlm_Ximports = \
 #
 FILES_nlm_exports = \
        $(EOLIST)
-       
+
 #   
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)

diff --git a/modules/mappers/NWGNUrewrite b/modules/mappers/NWGNUrewrite
index 153a2410b5ed3e700296eb1b7144090289cb40cc..e3c378f114051f3fa3dc4172644ff391d1406b17 100644 (file)
--- a/modules/mappers/NWGNUrewrite
+++ b/modules/mappers/NWGNUrewrite
@@ -58,7 +58,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -72,7 +72,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -94,7 +94,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               = rewrite
+NLM_NAME       = rewrite
 
 #
 # This is used by the link '-desc ' directive. 
@@ -112,7 +112,7 @@ NLM_THREAD_NAME     = Rewrite 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
@@ -138,14 +138,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
@@ -173,7 +173,7 @@ FILES_nlm_objs = \
 # These will be added as a library command in the link.opt file.
 #
 FILES_nlm_libs = \
-       libcpre.o \
+       libcpre.o \
        $(EOLIST)
 
 #
@@ -215,13 +215,13 @@ FILES_nlm_Ximports = \
 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)
@@ -248,3 +248,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/mappers/NWGNUspeling b/modules/mappers/NWGNUspeling
index 16c6677d6fde6ef99f64e6ecbd280410ee25deff..da1638ba6b22fefc783efcbadedc64b95a37cbe2 100644 (file)
--- a/modules/mappers/NWGNUspeling
+++ b/modules/mappers/NWGNUspeling
@@ -57,7 +57,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -71,7 +71,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -93,7 +93,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               = speling
+NLM_NAME       = speling
 
 #
 # This is used by the link '-desc ' directive. 
@@ -111,7 +111,7 @@ NLM_THREAD_NAME     = Speling 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
@@ -137,14 +137,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
@@ -172,7 +172,7 @@ FILES_nlm_objs = \
 # These will be added as a library command in the link.opt file.
 #
 FILES_nlm_libs = \
-       libcpre.o \
+       libcpre.o \
        $(EOLIST)
 
 #
@@ -214,13 +214,13 @@ FILES_nlm_Ximports = \
 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)
@@ -247,3 +247,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/mappers/NWGNUuserdir b/modules/mappers/NWGNUuserdir
index a8abfdd3981ae0d0268704fbd02c203cab57cb52..7f5ef0201658785775a2ffcd2c727a5e557d08bb 100644 (file)
--- a/modules/mappers/NWGNUuserdir
+++ b/modules/mappers/NWGNUuserdir
@@ -58,7 +58,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -72,7 +72,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -94,7 +94,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               = userdir
+NLM_NAME       = userdir
 
 #
 # This is used by the link '-desc ' directive. 
@@ -112,7 +112,7 @@ NLM_THREAD_NAME     = UserDir 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
@@ -138,14 +138,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
@@ -173,7 +173,7 @@ FILES_nlm_objs = \
 # These will be added as a library command in the link.opt file.
 #
 FILES_nlm_libs = \
-       libcpre.o \
+       libcpre.o \
        $(EOLIST)
 
 #
@@ -215,13 +215,13 @@ FILES_nlm_Ximports = \
 FILES_nlm_exports = \
        userdir_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)
@@ -248,3 +248,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/mappers/NWGNUvhost b/modules/mappers/NWGNUvhost
index 9f0bad4f647f6e2ca31458297752587ae2b0f612..a2f7eff2acab6b9f116d1de3c1e2af390ae998b3 100644 (file)
--- a/modules/mappers/NWGNUvhost
+++ b/modules/mappers/NWGNUvhost
@@ -57,7 +57,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -71,7 +71,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -93,7 +93,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               = vhost
+NLM_NAME       = vhost
 
 #
 # This is used by the link '-desc ' directive. 
@@ -111,7 +111,7 @@ NLM_THREAD_NAME     = Vhost Alias 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
@@ -137,14 +137,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
@@ -172,7 +172,7 @@ FILES_nlm_objs = \
 # These will be added as a library command in the link.opt file.
 #
 FILES_nlm_libs = \
-       libcpre.o \
+       libcpre.o \
        $(EOLIST)
 
 #
@@ -214,13 +214,13 @@ FILES_nlm_Ximports = \
 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)
@@ -247,3 +247,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/metadata/NWGNUcernmeta b/modules/metadata/NWGNUcernmeta
index ffcd42a239d3ec246c6a38238a1b449d12cbb1b5..f7d65cbfbe1f5d8f7888d0e4e7708c144f22716b 100644 (file)
--- a/modules/metadata/NWGNUcernmeta
+++ b/modules/metadata/NWGNUcernmeta
@@ -28,7 +28,6 @@ XINCDIRS      += \
 # These flags will come after CFLAGS
 #
 XCFLAGS                += \
-                       -prefix pre_nw.h \
                        $(EOLIST)
 
 #
@@ -58,7 +57,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -72,7 +71,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -94,7 +93,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               = cernmeta
+NLM_NAME       = cernmeta
 
 #
 # This is used by the link '-desc ' directive. 
@@ -112,7 +111,7 @@ NLM_THREAD_NAME     = CERN Meta 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
@@ -138,14 +137,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
@@ -173,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)
 
 #
@@ -215,13 +214,13 @@ FILES_nlm_Ximports = \
 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)
@@ -248,3 +247,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/metadata/NWGNUexpires b/modules/metadata/NWGNUexpires
index 5dff127faf30d2ba95d1ce499eb86cfef6a1961f..e6c9a715d2c4afb76c5c29da0bde9d3c4b95a6ca 100644 (file)
--- a/modules/metadata/NWGNUexpires
+++ b/modules/metadata/NWGNUexpires
@@ -28,7 +28,6 @@ XINCDIRS      += \
 # These flags will come after CFLAGS
 #
 XCFLAGS                += \
-                       -prefix pre_nw.h \
                        $(EOLIST)
 
 #
@@ -58,7 +57,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -72,7 +71,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -94,7 +93,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               = expires
+NLM_NAME       = expires
 
 #
 # This is used by the link '-desc ' directive. 
@@ -112,7 +111,7 @@ NLM_THREAD_NAME     = Expires 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
@@ -138,14 +137,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
@@ -173,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)
 
 #
@@ -215,13 +214,13 @@ FILES_nlm_Ximports = \
 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)
@@ -248,3 +247,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/metadata/NWGNUheaders b/modules/metadata/NWGNUheaders
index 5c788a2f1c59ef58e0f7f9ec380aa60c7c391d8d..d68f2967e06fab70bb96fdc70984bc636937200a 100644 (file)
--- a/modules/metadata/NWGNUheaders
+++ b/modules/metadata/NWGNUheaders
@@ -29,7 +29,6 @@ XINCDIRS      += \
 # These flags will come after CFLAGS
 #
 XCFLAGS                += \
-                       -prefix pre_nw.h \
                        $(EOLIST)
 
 #
@@ -59,7 +58,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -73,7 +72,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -95,7 +94,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               = headers
+NLM_NAME       = headers
 
 #
 # This is used by the link '-desc ' directive. 
@@ -113,7 +112,7 @@ NLM_THREAD_NAME     = Headers 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 +138,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
@@ -174,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)
 
 #
@@ -216,13 +215,13 @@ FILES_nlm_Ximports = \
 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)
@@ -249,3 +248,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/metadata/NWGNUmakefile b/modules/metadata/NWGNUmakefile
index 07e0dc4778baa6d45893d5d1a1badde5cae92af2..b9361aecf7775c4dce400cbe31e9d92ac575e2a2 100644 (file)
--- a/modules/metadata/NWGNUmakefile
+++ b/modules/metadata/NWGNUmakefile
@@ -60,7 +60,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -74,7 +74,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -96,7 +96,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               =
+NLM_NAME       =
 
 #
 # This is used by the link '-desc ' directive. 
@@ -114,7 +114,7 @@ NLM_THREAD_NAME     =
 # 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
@@ -140,14 +140,14 @@ NLM_CHECK_SYM     =
 #
 # If these are specified it will be used by the link '-flags' directive
 #
-NLM_FLAGS              =
+NLM_FLAGS      =
 
 #
 # 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
@@ -216,13 +216,13 @@ FILES_nlm_Ximports = \
 #
 FILES_nlm_exports = \
        $(EOLIST)
-       
+
 #   
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)

diff --git a/modules/metadata/NWGNUmimemagi b/modules/metadata/NWGNUmimemagi
index 3c5f11a430edf80afa2e3cc8039ca70fae2662bb..e7c6daadaa33f2455e8f1c962a5e3429e9d6c253 100644 (file)
--- a/modules/metadata/NWGNUmimemagi
+++ b/modules/metadata/NWGNUmimemagi
@@ -28,7 +28,6 @@ XINCDIRS      += \
 # These flags will come after CFLAGS
 #
 XCFLAGS                += \
-                       -prefix pre_nw.h \
                        $(EOLIST)
 
 #
@@ -58,7 +57,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -72,7 +71,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -94,7 +93,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               = mimemagi
+NLM_NAME       = mimemagi
 
 #
 # This is used by the link '-desc ' directive. 
@@ -106,13 +105,13 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) Mime Magic Module
 # This is used by the '-threadname' directive.  If left blank,
 # NLM_NAME Thread will be used.
 #
-NLM_THREAD_NAME        = CERN Meta Module
+NLM_THREAD_NAME        = minemagic 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
@@ -138,14 +137,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
@@ -173,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)
 
 #
@@ -215,13 +214,13 @@ FILES_nlm_Ximports = \
 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)
@@ -248,3 +247,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/metadata/NWGNUmodident b/modules/metadata/NWGNUmodident
index 0677b431022945392fe5931bf14a3b73e27d06fa..dc7ef4089e393d0179f933161c20748c4d8fd567 100644 (file)
--- a/modules/metadata/NWGNUmodident
+++ b/modules/metadata/NWGNUmodident
@@ -28,7 +28,6 @@ XINCDIRS      += \
 # These flags will come after CFLAGS
 #
 XCFLAGS                += \
-                       -prefix pre_nw.h \
                        $(EOLIST)
 
 #
@@ -58,7 +57,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -72,7 +71,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -94,7 +93,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               = modident
+NLM_NAME       = modident
 
 #
 # This is used by the link '-desc ' directive. 
@@ -112,7 +111,7 @@ NLM_THREAD_NAME     = Mod_Ident 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
@@ -138,14 +137,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
@@ -173,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)
 
 #
@@ -215,13 +214,13 @@ FILES_nlm_Ximports = \
 FILES_nlm_exports = \
        ident_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)
@@ -248,3 +247,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/metadata/NWGNUmodversion b/modules/metadata/NWGNUmodversion
index 9f97d64926cc100826923bc4fceb25bb29ed37f3..eab2d11e3941216122b199d6da537c98d5687e5d 100644 (file)
--- a/modules/metadata/NWGNUmodversion
+++ b/modules/metadata/NWGNUmodversion
@@ -28,7 +28,6 @@ XINCDIRS      += \
 # These flags will come after CFLAGS
 #
 XCFLAGS                += \
-                       -prefix pre_nw.h \
                        $(EOLIST)
 
 #
@@ -58,7 +57,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -72,7 +71,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -94,7 +93,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               = modversion
+NLM_NAME       = modversion
 
 #
 # This is used by the link '-desc ' directive. 
@@ -112,7 +111,7 @@ NLM_THREAD_NAME     = Version 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
@@ -138,14 +137,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
@@ -173,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)
 
 #
@@ -215,13 +214,13 @@ FILES_nlm_Ximports = \
 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)
@@ -248,3 +247,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/metadata/NWGNUuniqueid b/modules/metadata/NWGNUuniqueid
index 699ac227c6471cedeede7c17e720d934fb521b28..0e4058c26fcd631b330d8acb6f772ec57e20978a 100644 (file)
--- a/modules/metadata/NWGNUuniqueid
+++ b/modules/metadata/NWGNUuniqueid
@@ -28,7 +28,6 @@ XINCDIRS      += \
 # These flags will come after CFLAGS
 #
 XCFLAGS                += \
-                       -prefix pre_nw.h \
                        $(EOLIST)
 
 #
@@ -58,7 +57,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -72,7 +71,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -94,7 +93,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               = uniqueid
+NLM_NAME       = uniqueid
 
 #
 # This is used by the link '-desc ' directive. 
@@ -112,7 +111,7 @@ NLM_THREAD_NAME     = Unique ID 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
@@ -138,14 +137,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
@@ -174,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)
 
 #
@@ -213,7 +212,7 @@ FILES_nlm_Ximports = \
 # Don't link with Winsock if standard sockets are being used
 ifndef USE_STDSOCKETS
 FILES_nlm_Ximports += @ws2nlm.imp \
-              $(EOLIST)
+       $(EOLIST)
 endif
  
 #   
@@ -222,13 +221,13 @@ endif
 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)
@@ -257,3 +256,4 @@ vpath %.c ../arch/netware
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/metadata/NWGNUusertrk b/modules/metadata/NWGNUusertrk
index 0249a0f929a0564770566fa8b2e8fb26b10d8a59..450bf652b510c421270c77c4d8613ee955a757d1 100644 (file)
--- a/modules/metadata/NWGNUusertrk
+++ b/modules/metadata/NWGNUusertrk
@@ -28,7 +28,6 @@ XINCDIRS      += \
 # These flags will come after CFLAGS
 #
 XCFLAGS                += \
-                       -prefix pre_nw.h \
                        $(EOLIST)
 
 #
@@ -58,7 +57,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -72,7 +71,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -94,7 +93,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               = usertrk
+NLM_NAME       = usertrk
 
 #
 # This is used by the link '-desc ' directive. 
@@ -112,7 +111,7 @@ NLM_THREAD_NAME     = User Track 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
@@ -138,14 +137,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
@@ -173,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)
 
 #
@@ -215,7 +214,7 @@ FILES_nlm_Ximports = \
 FILES_nlm_exports = \
        usertrack_module \
        $(EOLIST)
-       
+
 #   
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
@@ -248,3 +247,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/proxy/NWGNUmakefile b/modules/proxy/NWGNUmakefile
index d264698d34c66ef4ed2b27e21dc66c25b782a783..212a5be7e358a907e40db0732f59705436f7ebb5 100644 (file)
--- a/modules/proxy/NWGNUmakefile
+++ b/modules/proxy/NWGNUmakefile
@@ -59,7 +59,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -73,7 +73,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -95,7 +95,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               =
+NLM_NAME       =
 
 #
 # This is used by the link '-desc ' directive. 
@@ -113,7 +113,7 @@ NLM_THREAD_NAME     =
 # 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 +139,14 @@ NLM_CHECK_SYM     =
 #
 # If these are specified it will be used by the link '-flags' directive
 #
-NLM_FLAGS              =
+NLM_FLAGS      =
 
 #
 # 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
@@ -213,13 +213,13 @@ FILES_nlm_Ximports = \
 #
 FILES_nlm_exports = \
        $(EOLIST)
-       
+
 #   
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -246,4 +246,5 @@ install :: nlms FORCE
 #
 
 include $(AP_WORK)\build\NWGNUtail.inc
-       
+
+

diff --git a/modules/proxy/NWGNUproxy b/modules/proxy/NWGNUproxy
index ac36e50beab5d886ad6c92c37f0bf07826b11cc7..eede5a5c69d03596f7d9de5c9a46da0a2e18c428 100644 (file)
--- a/modules/proxy/NWGNUproxy
+++ b/modules/proxy/NWGNUproxy
@@ -31,7 +31,6 @@ XINCDIRS      += \
 # These flags will come after CFLAGS
 #
 XCFLAGS                += \
-                       -prefix pre_nw.h \
                        $(EOLIST)
 
 #
@@ -61,7 +60,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -75,7 +74,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -97,7 +96,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. 
@@ -115,7 +114,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
@@ -141,14 +140,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)
 
 #
@@ -217,7 +216,7 @@ FILES_nlm_Ximports = \
 # Don't link with Winsock if standard sockets are being used
 ifndef USE_STDSOCKETS
 FILES_nlm_Ximports += @ws2nlm.imp \
-              $(EOLIST)
+       $(EOLIST)
 endif
  
 #   
@@ -235,13 +234,13 @@ FILES_nlm_exports = \
        ap_proxy_ssl_val \
        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)
@@ -270,3 +269,4 @@ vpath %.c ../arch/netware
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/proxy/NWGNUproxyajp b/modules/proxy/NWGNUproxyajp
index 6750891413dff5a176a15e6bb6232b91e6269f8e..77942ffc5f98669e5c8f6ed0e9cb449f7fb80df8 100644 (file)
--- a/modules/proxy/NWGNUproxyajp
+++ b/modules/proxy/NWGNUproxyajp
@@ -29,7 +29,6 @@ XINCDIRS      += \
 # These flags will come after CFLAGS
 #
 XCFLAGS                += \
-                       -relax_pointers \
                        $(EOLIST)
 
 #
@@ -95,7 +94,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               = proxyajp
+NLM_NAME       = proxyajp
 
 #
 # This is used by the link '-desc ' directive. 
@@ -228,7 +227,7 @@ FILES_nlm_Ximports = \
 # Don't link with Winsock if standard sockets are being used
 ifndef USE_STDSOCKETS
 FILES_nlm_Ximports += @ws2nlm.imp \
-              $(EOLIST)
+       $(EOLIST)
 endif
  
 #   
@@ -272,3 +271,4 @@ vpath %.c ../arch/netware
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/proxy/NWGNUproxybalancer b/modules/proxy/NWGNUproxybalancer
index 0f7635faf5a3141c6ca375c64be5b756e9b9fb1f..c50c48f641e2b6bae3a4ff4dabef3bde6c479751 100644 (file)
--- a/modules/proxy/NWGNUproxybalancer
+++ b/modules/proxy/NWGNUproxybalancer
@@ -29,7 +29,6 @@ XINCDIRS      += \
 # These flags will come after CFLAGS
 #
 XCFLAGS                += \
-                       -prefix pre_nw.h \
                        $(EOLIST)
 
 #
@@ -59,7 +58,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -73,7 +72,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -95,7 +94,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               = proxybalancer
+NLM_NAME       = proxybalancer
 
 #
 # This is used by the link '-desc ' directive. 
@@ -113,7 +112,7 @@ NLM_THREAD_NAME     = Prxy Blncr 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 +138,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 +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)
 
 #
@@ -225,7 +224,7 @@ FILES_nlm_Ximports = \
 # Don't link with Winsock if standard sockets are being used
 ifndef USE_STDSOCKETS
 FILES_nlm_Ximports += @ws2nlm.imp \
-              $(EOLIST)
+       $(EOLIST)
 endif
  
 #   
@@ -234,13 +233,13 @@ endif
 FILES_nlm_exports = \
        proxy_balancer_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)
@@ -269,3 +268,4 @@ vpath %.c ../arch/netware
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/proxy/NWGNUproxycon b/modules/proxy/NWGNUproxycon
index 1e044b68a06a38fc09772995707130baf7338d09..6650197b41e3f4150dce7ca2993c4363e8d62c45 100644 (file)
--- a/modules/proxy/NWGNUproxycon
+++ b/modules/proxy/NWGNUproxycon
@@ -29,7 +29,6 @@ XINCDIRS      += \
 # These flags will come after CFLAGS
 #
 XCFLAGS                += \
-                       -prefix pre_nw.h \
                        $(EOLIST)
 
 #
@@ -59,7 +58,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -73,7 +72,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -95,7 +94,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               = proxycon
+NLM_NAME       = proxycon
 
 #
 # This is used by the link '-desc ' directive. 
@@ -113,7 +112,7 @@ NLM_THREAD_NAME     = Proxy Conn 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 +138,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
@@ -221,13 +220,13 @@ FILES_nlm_Ximports = \
 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)
@@ -254,3 +253,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/proxy/NWGNUproxyftp b/modules/proxy/NWGNUproxyftp
index c8a1bd846dd5378b8612375a887f3f17b5d46ed7..89fef5ac4a3757cac6348fe8cbf64aed74d1cf66 100644 (file)
--- a/modules/proxy/NWGNUproxyftp
+++ b/modules/proxy/NWGNUproxyftp
@@ -29,7 +29,6 @@ XINCDIRS      += \
 # These flags will come after CFLAGS
 #
 XCFLAGS                += \
-                       -prefix pre_nw.h \
                        $(EOLIST)
 
 #
@@ -59,7 +58,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -73,7 +72,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -95,7 +94,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 +112,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 +138,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 +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)
 
 #
@@ -221,7 +220,7 @@ FILES_nlm_Ximports = \
 # Don't link with Winsock if standard sockets are being used
 ifndef USE_STDSOCKETS
 FILES_nlm_Ximports += @ws2nlm.imp \
-              $(EOLIST)
+       $(EOLIST)
 endif
  
 #   
@@ -230,13 +229,13 @@ endif
 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)
@@ -265,3 +264,4 @@ vpath %.c ../arch/netware
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/proxy/NWGNUproxyhtp b/modules/proxy/NWGNUproxyhtp
index bf4f870123f1c1ebfbf6a815fc41059eb7173ea5..5f5c2ada6c491c73362570be0628544ac233014f 100644 (file)
--- a/modules/proxy/NWGNUproxyhtp
+++ b/modules/proxy/NWGNUproxyhtp
@@ -29,7 +29,6 @@ XINCDIRS      += \
 # These flags will come after CFLAGS
 #
 XCFLAGS                += \
-                       -prefix pre_nw.h \
                        $(EOLIST)
 
 #
@@ -59,7 +58,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -73,7 +72,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -95,7 +94,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               = proxyhtp
+NLM_NAME       = proxyhtp
 
 #
 # This is used by the link '-desc ' directive. 
@@ -113,7 +112,7 @@ NLM_THREAD_NAME     = Proxy HTTP 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 +138,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 +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)
 
 #
@@ -222,7 +221,7 @@ FILES_nlm_Ximports = \
 # Don't link with Winsock if standard sockets are being used
 ifndef USE_STDSOCKETS
 FILES_nlm_Ximports += @ws2nlm.imp \
-              $(EOLIST)
+       $(EOLIST)
 endif
  
 #   
@@ -231,13 +230,13 @@ endif
 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)
@@ -266,3 +265,4 @@ vpath %.c ../arch/netware
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/ssl/NWGNUmakefile b/modules/ssl/NWGNUmakefile
index 0b7e9c2f880e6014a2f7eb992a934444a08dfcb6..655cdd6932e1fbe1faf973ec23a732f4d3fa51c6 100644 (file)
--- a/modules/ssl/NWGNUmakefile
+++ b/modules/ssl/NWGNUmakefile
@@ -299,4 +299,3 @@ ssl_expr_scan.c : ssl_expr_scan.l
 include $(AP_WORK)\build\NWGNUtail.inc
 
 
-

diff --git a/server/NWGNUmakefile b/server/NWGNUmakefile
index f2f6da75f7bb45c4caa4811affa7fdcb1c6b347a..512adfdc8e6eb789e1b3f32303bd707a3dd75da3 100644 (file)
--- a/server/NWGNUmakefile
+++ b/server/NWGNUmakefile
@@ -102,7 +102,7 @@ NLM_NAME    = genchars
 # This is used by the link '-desc ' directive. 
 # If left blank, NLM_NAME will be used.
 #
-NLM_DESCRIPTION        = Generate Test Characters
+NLM_DESCRIPTION        = Apache $(VERSION_STR) Generate Test Characters
 
 #
 # This is used by the '-threadname' directive.  If left blank,
@@ -112,9 +112,9 @@ NLM_THREAD_NAME     = genchars
 
 #
 # If this is specified, it will override VERSION value in 
-# $(AP_WORK)\NWGNUNetWare.rul
+# $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION    = 1,0,0
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K

diff --git a/support/NWGNUab b/support/NWGNUab
index 9f94eebde83f17507b9b75fd9246ddf5106d2889..8d7b0370e22140a8958129c2a0aff3e8b63589fb 100644 (file)
--- a/support/NWGNUab
+++ b/support/NWGNUab
@@ -57,7 +57,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -71,7 +71,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -93,7 +93,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               = ab
+NLM_NAME       = ab
 
 #
 # This is used by the link '-desc ' directive.
@@ -118,7 +118,7 @@ NLM_SCREEN_NAME = DEFAULT
 # 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
@@ -144,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
@@ -179,7 +179,7 @@ FILES_nlm_objs = \
 # These will be added as a library command in the link.opt file.
 #
 FILES_nlm_libs = \
-       libcpre.o \
+       libcpre.o \
        $(EOLIST)
 
 #
@@ -225,7 +225,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 +252,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/support/NWGNUhtcacheclean b/support/NWGNUhtcacheclean
index 17d03d362ac1768684f5fa7c4e3d1b026d36f8db..df66bf4b671f8483c4f14e0a63b88d828789c26c 100644 (file)
--- a/support/NWGNUhtcacheclean
+++ b/support/NWGNUhtcacheclean
@@ -56,7 +56,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -70,7 +70,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -92,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               = htcacheclean
+NLM_NAME       = htcacheclean
 
 #
 # This is used by the link '-desc ' directive. 
@@ -116,7 +116,7 @@ NLM_SCREEN_NAME = DEFAULT
 # 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 +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
@@ -177,7 +177,7 @@ FILES_nlm_objs = \
 # These will be added as a library command in the link.opt file.
 #
 FILES_nlm_libs = \
-       libcpre.o \
+       libcpre.o \
        $(EOLIST)
 
 #
@@ -217,13 +217,13 @@ FILES_nlm_Ximports = \
 #
 FILES_nlm_exports = \
        $(EOLIST)
-       
+
 #   
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -250,3 +250,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/support/NWGNUhtdbm b/support/NWGNUhtdbm
index 492d22924e4618e718b4c84a7e602abab8a73995..062693f9243c510cae91b67cb24683015cd9be05 100644 (file)
--- a/support/NWGNUhtdbm
+++ b/support/NWGNUhtdbm
@@ -56,7 +56,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -70,7 +70,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -92,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               = htdbm
+NLM_NAME       = htdbm
 
 #
 # This is used by the link '-desc ' directive.
@@ -116,7 +116,7 @@ NLM_SCREEN_NAME = htdbm Password Management
 # 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 +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
@@ -177,7 +177,7 @@ FILES_nlm_objs = \
 # These will be added as a library command in the link.opt file.
 #
 FILES_nlm_libs = \
-       libcpre.o \
+       libcpre.o \
        $(EOLIST)
 
 #
@@ -223,7 +223,7 @@ FILES_nlm_exports = \
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -250,3 +250,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/support/NWGNUhtdigest b/support/NWGNUhtdigest
index 4fbdc040cce1113f1088af0605487f298ff5b09d..538e67937ad2b29336be5a53c056fea89195eb53 100644 (file)
--- a/support/NWGNUhtdigest
+++ b/support/NWGNUhtdigest
@@ -56,7 +56,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -70,7 +70,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -92,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               = htdigest
+NLM_NAME       = htdigest
 
 #
 # This is used by the link '-desc ' directive. 
@@ -116,7 +116,7 @@ NLM_SCREEN_NAME = Digest Password Management
 # 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 +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
@@ -177,7 +177,7 @@ FILES_nlm_objs = \
 # These will be added as a library command in the link.opt file.
 #
 FILES_nlm_libs = \
-       libcpre.o \
+       libcpre.o \
        $(EOLIST)
 
 #
@@ -217,13 +217,13 @@ FILES_nlm_Ximports = \
 #
 FILES_nlm_exports = \
        $(EOLIST)
-       
+
 #   
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -250,3 +250,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/support/NWGNUhtpasswd b/support/NWGNUhtpasswd
index 2b692db4b8b781c887e718d94a8e1f0cf1f856e2..d87adc3adaed12fc24eba7f7362bd7ec44927d84 100644 (file)
--- a/support/NWGNUhtpasswd
+++ b/support/NWGNUhtpasswd
@@ -56,7 +56,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -70,7 +70,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -92,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               = htpasswd
+NLM_NAME       = htpasswd
 
 #
 # This is used by the link '-desc ' directive. 
@@ -116,7 +116,7 @@ NLM_SCREEN_NAME = htpasswd Password Management
 # 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 +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
@@ -177,7 +177,7 @@ FILES_nlm_objs = \
 # These will be added as a library command in the link.opt file.
 #
 FILES_nlm_libs = \
-       libcpre.o \
+       libcpre.o \
        $(EOLIST)
 
 #
@@ -217,13 +217,13 @@ FILES_nlm_Ximports = \
 #
 FILES_nlm_exports = \
        $(EOLIST)
-       
+
 #   
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -250,3 +250,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/support/NWGNUhttxt2dbm b/support/NWGNUhttxt2dbm
index 17710de6bbbbaa254127dac0f0d569cc762c1644..97bccf97b8f9b0ba35b7f30bcd30abbcf86d8739 100644 (file)
--- a/support/NWGNUhttxt2dbm
+++ b/support/NWGNUhttxt2dbm
@@ -56,7 +56,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -70,7 +70,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -92,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               = httxt2dbm
+NLM_NAME       = httxt2dbm
 
 #
 # This is used by the link '-desc ' directive.
@@ -116,7 +116,7 @@ NLM_SCREEN_NAME = httxt2dbm Conversion Utility
 # 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 +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
@@ -177,7 +177,7 @@ FILES_nlm_objs = \
 # These will be added as a library command in the link.opt file.
 #
 FILES_nlm_libs = \
-       libcpre.o \
+       libcpre.o \
        $(EOLIST)
 
 #
@@ -223,7 +223,7 @@ FILES_nlm_exports = \
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -250,3 +250,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/support/NWGNUlogres b/support/NWGNUlogres
index 982cdb78b1f1350c679541ff8811f09386d8b6ba..c2ad592943d3677dea31bd92eac773375015e807 100644 (file)
--- a/support/NWGNUlogres
+++ b/support/NWGNUlogres
@@ -57,7 +57,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -71,7 +71,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -93,7 +93,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 +117,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 +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
@@ -178,7 +178,7 @@ FILES_nlm_objs = \
 # These will be added as a library command in the link.opt file.
 #
 FILES_nlm_libs = \
-       libcpre.o \
+       libcpre.o \
        $(EOLIST)
 
 #
@@ -216,7 +216,7 @@ FILES_nlm_Ximports = \
 # Don't link with Winsock if standard sockets are being used
 ifndef USE_STDSOCKETS
 FILES_nlm_Ximports += @ws2nlm.imp \
-              $(EOLIST)
+       $(EOLIST)
 endif
  
 #
@@ -230,7 +230,7 @@ FILES_nlm_exports = \
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -257,3 +257,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/support/NWGNUmakefile b/support/NWGNUmakefile
index 851b6ae71d8100933c1afb6bcff99d89a18bde30..8116cbf033d0afb7ca91bc82360774e3d44bc23b 100644 (file)
--- a/support/NWGNUmakefile
+++ b/support/NWGNUmakefile
@@ -58,7 +58,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -72,7 +72,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -94,7 +94,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               =
+NLM_NAME       =
 
 #
 # This is used by the link '-desc ' directive. 
@@ -112,7 +112,7 @@ NLM_THREAD_NAME     =
 # 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 +138,14 @@ NLM_CHECK_SYM     =
 #
 # If these are specified it will be used by the link '-flags' directive
 #
-NLM_FLAGS              =
+NLM_FLAGS      =
 
 #
 # 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
@@ -214,13 +214,13 @@ FILES_nlm_Ximports = \
 #
 FILES_nlm_exports = \
        $(EOLIST)
-       
+
 #   
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)

diff --git a/support/NWGNUrotlogs b/support/NWGNUrotlogs
index 9a55095208e294947550559ac4b180ff2fe49dc5..a74c28712807ff23e2e4e019d10e60f5d8d92e29 100644 (file)
--- a/support/NWGNUrotlogs
+++ b/support/NWGNUrotlogs
@@ -55,7 +55,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -69,7 +69,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -91,7 +91,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               = rotlogs
+NLM_NAME       = rotlogs
 
 #
 # This is used by the link '-desc ' directive. 
@@ -109,13 +109,13 @@ NLM_THREAD_NAME   = rotlogs
 # This is used by the '-screenname' directive.  If left blank,
 # 'Apache for NetWare' Thread will be used.
 #
-NLM_SCREEN_NAME = DEFAULT
+NLM_SCREEN_NAME        = DEFAULT
 
 #
 # 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 +141,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 
 # 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 +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)
 
 #
@@ -216,13 +216,13 @@ FILES_nlm_Ximports = \
 #
 FILES_nlm_exports = \
        $(EOLIST)
-       
+
 #   
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -249,3 +249,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+