removed obsolete -prefix; minor cosmetic changes.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@521264 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/aaa/NWGNUaccesscompat b/modules/aaa/NWGNUaccesscompat
index 29354b14815b9132b0735a589503162194b963d4..ac2ab1d9e7c99d01b5d5911261fc6c4a9ab21909 100644 (file)
--- a/modules/aaa/NWGNUaccesscompat
+++ b/modules/aaa/NWGNUaccesscompat
@@ -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,10 +93,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = accesscompat
+NLM_NAME       = accesscompat
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) host access control compatibility Module
@@ -109,10 +108,10 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) host access control compatibility Module
 NLM_THREAD_NAME        = AccessCompModule
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -138,14 +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 
+# 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)
 
 #
@@ -189,7 +188,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -208,20 +207,20 @@ FILES_nlm_Ximports = \
        @$(NWOS)/httpd.imp \
        @libc.imp \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
        access_compat_module \
        $(EOLIST)
-       
-#   
+
+#
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -232,7 +231,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -248,3 +247,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/aaa/NWGNUauthbasc b/modules/aaa/NWGNUauthbasc
index bc7e1ec92c9c09dae197fee2e50b34d5a5abcd10..d397b01db34cf58ab965af41c8c9162b6ae6c1ec 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,10 +93,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = authbasc
+NLM_NAME       = authbasc
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) Basic Authentication Module
@@ -109,10 +108,10 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) Basic Authentication Module
 NLM_THREAD_NAME        = AuthBasic Module
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -138,14 +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 
+# 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)
 
 #
@@ -189,7 +188,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -208,20 +207,20 @@ FILES_nlm_Ximports = \
        @$(NWOS)/httpd.imp \
        @libc.imp \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 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)
@@ -232,7 +231,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -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..f35944aa7ab1bc655c7ec1decdf31adf86be2f3b 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,10 +93,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = authdigt
+NLM_NAME       = authdigt
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) Digest Authentication Module
@@ -109,10 +108,10 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) Digest Authentication Module
 NLM_THREAD_NAME        = Digest Module
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -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 
+# 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)
 
 #
@@ -189,7 +188,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -208,20 +207,20 @@ FILES_nlm_Ximports = \
        @$(NWOS)/httpd.imp \
        @libc.imp \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
        auth_digest_module \
        $(EOLIST)
-       
-#   
+
+#
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -232,7 +231,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -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..7f42bdb6d239d61e85b22797af9a556c980ae66c 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,10 +93,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = authnano
+NLM_NAME       = authnano
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) Anonymous Authentication Module
@@ -109,10 +108,10 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) Anonymous Authentication Module
 NLM_THREAD_NAME        = AuthAnon Module
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -138,14 +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 
+# 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)
 
 #
@@ -189,7 +188,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -208,20 +207,20 @@ FILES_nlm_Ximports = \
        @$(NWOS)/httpd.imp \
        @libc.imp \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 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)
@@ -232,7 +231,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -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..81c6240660cca321d15c729282eb3b8ea1871f41 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,10 +94,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = authndbd
+NLM_NAME       = authndbd
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) SQL Database Authentication Module
@@ -109,10 +109,10 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) SQL Database Authentication Module
 NLM_THREAD_NAME        = AuthnDBD Module
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -138,14 +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 
+# 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)
 
 #
@@ -189,7 +189,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -208,20 +208,20 @@ FILES_nlm_Ximports = \
        @$(NWOS)/httpd.imp \
        @libc.imp \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 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)
@@ -232,7 +232,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -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..40f72be144e4b33243289550c1f123c162351b5f 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,10 +93,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = authndbm
+NLM_NAME       = authndbm
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) Database Authentication Module
@@ -108,10 +108,10 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) Database Authentication Module
 NLM_THREAD_NAME        = AuthnDBM Module
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -137,14 +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 
+# 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)
 
 #
@@ -188,7 +188,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -207,20 +207,20 @@ FILES_nlm_Ximports = \
        @$(NWOS)/httpd.imp \
        @libc.imp \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 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)
@@ -231,7 +231,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -247,3 +247,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/aaa/NWGNUauthnfil b/modules/aaa/NWGNUauthnfil
index 1cfbb4227337e7914126e7f14f63ae5a62e94640..55e379560fa11a753287fc3148e903e406db704a 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,10 +93,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = authnfil
+NLM_NAME       = authnfil
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) File Authentication Module
@@ -109,10 +108,10 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) File Authentication Module
 NLM_THREAD_NAME        = AuthnFile Module
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -138,14 +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 
+# 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)
 
 #
@@ -189,7 +188,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -208,20 +207,20 @@ FILES_nlm_Ximports = \
        @$(NWOS)/httpd.imp \
        @libc.imp \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 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)
@@ -232,7 +231,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -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..d86cc13ecae1231d86fe5cbbef7956cb32c2b750 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,10 +100,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = authnzldap
+NLM_NAME       = authnzldap
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) LDAP Authentication Module
@@ -115,10 +115,10 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) LDAP Authentication Module
 NLM_THREAD_NAME        = AuthnzLDAP Module
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -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 
+# 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)
 
 #
@@ -196,7 +196,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -222,20 +222,20 @@ FILES_nlm_Ximports = \
        @libc.imp \
        @$(LDAPSDK)/imports/lldapsdk.imp \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 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)
@@ -246,7 +246,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -262,3 +262,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/aaa/NWGNUauthzdbd b/modules/aaa/NWGNUauthzdbd
index 24ecb8a93d1c80a9a59defb87757f0c8a2484176..11cf1260627cf4dd69e8e0efac21505e5ad0e1ea 100644 (file)
--- a/modules/aaa/NWGNUauthzdbd
+++ b/modules/aaa/NWGNUauthzdbd
@@ -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,10 +94,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = authzdbd
+NLM_NAME       = authzdbd
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) DBD Database Authorization Module
@@ -109,10 +109,10 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) DBD Database Authorization Module
 NLM_THREAD_NAME        = AuthzDBD Module
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -138,14 +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 
+# 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)
 
 #
@@ -189,7 +189,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -208,20 +208,20 @@ FILES_nlm_Ximports = \
        @$(NWOS)/httpd.imp \
        @libc.imp \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
        authz_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)
@@ -232,7 +232,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -248,3 +248,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/aaa/NWGNUauthzdbm b/modules/aaa/NWGNUauthzdbm
index 1b7bd137603f0e7274331ed700c6cd2586864531..4d4f7b44ad41db9d80a2cfd1590eb2dd1f1bdebb 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"
@@ -97,7 +96,7 @@ endif
 NLM_NAME               = authzdbm
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) Database Authorization Module
@@ -109,10 +108,10 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) Database Authorization Module
 NLM_THREAD_NAME        = AuthzDBM Module
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -138,14 +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 
+# 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)
 
 #
@@ -189,7 +188,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -208,20 +207,20 @@ FILES_nlm_Ximports = \
        @$(NWOS)/httpd.imp \
        @libc.imp \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 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)
@@ -232,7 +231,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -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..672d9c790df33c5eaa379186918db8d7ae5c34c6 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,10 +93,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = authzgrp
+NLM_NAME       = authzgrp
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) Group File Authorization Module
@@ -109,10 +108,10 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) Group File Authorization Module
 NLM_THREAD_NAME        = AuthzGrp Module
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -138,14 +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 
+# 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)
 
 #
@@ -189,7 +188,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -208,20 +207,20 @@ FILES_nlm_Ximports = \
        @$(NWOS)/httpd.imp \
        @libc.imp \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 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)
@@ -232,7 +231,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE

diff --git a/modules/aaa/NWGNUauthzusr b/modules/aaa/NWGNUauthzusr
index eb9e2c93c3de1355275b5a7e87173978b1ef973c..6774c4845bcda3d3283f475938792c0c3a5996bb 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,10 +93,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = authzusr
+NLM_NAME       = authzusr
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) User Authorization Module
@@ -109,10 +108,10 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) User Authorization Module
 NLM_THREAD_NAME        = AuthzUser Module
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -138,14 +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 
+# 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)
 
 #
@@ -189,7 +188,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -208,20 +207,20 @@ FILES_nlm_Ximports = \
        @$(NWOS)/httpd.imp \
        @libc.imp \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 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
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -232,7 +231,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE

diff --git a/modules/aaa/NWGNUmakefile b/modules/aaa/NWGNUmakefile
index f8013237e36c8d515a591218aaf973a08928280b..cad83fac80681a7372f51ac556c5d05047478d36 100644 (file)
--- a/modules/aaa/NWGNUmakefile
+++ b/modules/aaa/NWGNUmakefile
@@ -3,7 +3,7 @@
 #
 
 SUBDIRS = \
-       $(EOLIST) 
+       $(EOLIST)
 
 #
 # Get the 'head' of the build environment.  This includes default targets and
@@ -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,10 +95,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               =
+NLM_NAME       =
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        =
@@ -110,10 +110,10 @@ NLM_DESCRIPTION   =
 NLM_THREAD_NAME        =
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -139,14 +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 
+# 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
@@ -202,7 +202,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -218,19 +218,19 @@ FILE_nlm_copyright =
 #
 FILES_nlm_Ximports = \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
        $(EOLIST)
-       
-#   
+
+#
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -241,7 +241,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -257,4 +257,5 @@ install :: nlms FORCE
 #
 
 include $(AP_WORK)\build\NWGNUtail.inc
-       
+
+

diff --git a/modules/cache/NWGNUdsk_cach b/modules/cache/NWGNUdsk_cach
index 9dc385e77e197b589517ab36a462e7e750168abd..f5861c918c355d935c9be6cec1adcceaf07a92c0 100644 (file)
--- a/modules/cache/NWGNUdsk_cach
+++ b/modules/cache/NWGNUdsk_cach
@@ -3,7 +3,7 @@
 #
 
 SUBDIRS = \
-       $(EOLIST) 
+       $(EOLIST)
 
 #
 # Get the 'head' of the build environment.  This includes default targets and
@@ -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,10 +101,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = dsk_cach
+NLM_NAME       = dsk_cach
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) Memory Cache Sub-Module
@@ -116,16 +116,16 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) Memory Cache Sub-Module
 NLM_THREAD_NAME        = dsk_cach
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            = 
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
 #
 NLM_STACK_SIZE = 65536
- 
+
 
 #
 # If this is specified it will be used by the link '-entry' directive
@@ -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 
+# 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)
 
 #
@@ -201,7 +201,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -221,21 +221,20 @@ FILES_nlm_Ximports = \
        @httpd.imp \
        @mod_cache.imp \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
        disk_cache_module \
        $(EOLIST)
-       
-#      @cache.imp \
-#   
+
+#
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -246,11 +245,11 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
-    
+
 #
 # Any specialized rules here
 #
@@ -263,4 +262,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..00b7a7475e44a51f4bdc153af5995da7e0d6530b 100644 (file)
--- a/modules/cache/NWGNUmem_cach
+++ b/modules/cache/NWGNUmem_cach
@@ -3,7 +3,7 @@
 #
 
 SUBDIRS = \
-       $(EOLIST) 
+       $(EOLIST)
 
 #
 # Get the 'head' of the build environment.  This includes default targets and
@@ -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,10 +102,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = mem_cach
+NLM_NAME       = mem_cach
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) Memory Cache Sub-Module
@@ -117,16 +117,16 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) Memory Cache Sub-Module
 NLM_THREAD_NAME        = mem_cach
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            = 
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
 #
 NLM_STACK_SIZE = 65536
- 
+
 
 #
 # If this is specified it will be used by the link '-entry' directive
@@ -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 
+# 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)
 
 #
@@ -205,7 +205,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -225,21 +225,20 @@ FILES_nlm_Ximports = \
        @httpd.imp \
        @mod_cache.imp \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
        mem_cache_module \
        $(EOLIST)
-       
-#      @cache.imp \
-#   
+
+#
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -250,11 +249,11 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
-    
+
 #
 # Any specialized rules here
 #
@@ -267,4 +266,3 @@ install :: nlms FORCE
 include $(AP_WORK)\build\NWGNUtail.inc
 
 
-       

diff --git a/modules/cache/NWGNUmod_cach b/modules/cache/NWGNUmod_cach
index 125c4567940bbe24fa3e8948afd158ce3d74b166..eb6889f0508cfe62a453dfe84b69bcb1be7b3da9 100644 (file)
--- a/modules/cache/NWGNUmod_cach
+++ b/modules/cache/NWGNUmod_cach
@@ -3,7 +3,7 @@
 #
 
 SUBDIRS = \
-       $(EOLIST) 
+       $(EOLIST)
 
 #
 # Get the 'head' of the build environment.  This includes default targets and
@@ -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,10 +102,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = mod_cach
+NLM_NAME       = mod_cach
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) Cache module
@@ -117,16 +117,16 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) Cache module
 NLM_THREAD_NAME        = mod_cach
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            = 
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
 #
 NLM_STACK_SIZE = 65536
- 
+
 
 #
 # If this is specified it will be used by the link '-entry' directive
@@ -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 
+# 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)
 
 #
@@ -204,7 +203,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -224,21 +223,21 @@ FILES_nlm_Ximports = \
        @httpd.imp \
        @netware.imp \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
        @mod_cache.imp \
        cache_module \
        $(EOLIST)
-       
-#   
+
+#
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -249,11 +248,11 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
-    
+
 #
 # Any specialized rules here
 #
@@ -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..a5768dc13d9c7e2450881187f4542c419d7d6213 100644 (file)
--- a/modules/database/NWGNUmakefile
+++ b/modules/database/NWGNUmakefile
@@ -3,7 +3,7 @@
 #
 
 SUBDIRS = \
-       $(EOLIST) 
+       $(EOLIST)
 
 #
 # Get the 'head' of the build environment.  This includes default targets and
@@ -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,10 +101,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = moddbd
+NLM_NAME       = moddbd
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) DBD Module
@@ -117,10 +116,10 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) DBD Module
 NLM_THREAD_NAME        = DBD Module
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -146,14 +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 
+# 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)
 
 #
@@ -197,7 +196,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -216,8 +215,8 @@ FILES_nlm_Ximports = \
        @$(NWOS)/httpd.imp \
        @libc.imp \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
@@ -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)
@@ -245,7 +244,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -263,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..d61fad1f9c18a1207610ce939d6d66e5fe2b749e 100644 (file)
--- a/modules/dav/fs/NWGNUmakefile
+++ b/modules/dav/fs/NWGNUmakefile
@@ -3,7 +3,7 @@
 #
 
 SUBDIRS = \
-       $(EOLIST) 
+       $(EOLIST)
 
 #
 # Get the 'head' of the build environment.  This includes default targets and
@@ -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,10 +104,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = modDAVFS
+NLM_NAME       = modDAVFS
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) DAV FileSystem Sub-Module
@@ -119,16 +119,16 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) DAV FileSystem Sub-Module
 NLM_THREAD_NAME        = modDAVFS Thread
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            = 
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
 #
 NLM_STACK_SIZE = 65536
- 
+
 
 #
 # If this is specified it will be used by the link '-entry' directive
@@ -148,7 +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)
 
 #
@@ -201,7 +201,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -221,26 +221,26 @@ FILES_nlm_Ximports = \
        @httpd.imp \
        @../main/dav.imp \
        $(EOLIST)
- 
+
 # Don't link with Winsock if standard sockets are being used
 ifndef USE_STDSOCKETS
 FILES_nlm_Ximports += @ws2nlm.imp \
-              $(EOLIST)
+       $(EOLIST)
 endif
- 
-#   
+
+#
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
        dav_fs_module \
        $(EOLIST)
-       
-#   
+
+#
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -251,7 +251,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -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..750465744d7321acc19d33ad3eb9cbd0eced73c0 100644 (file)
--- a/modules/dav/lock/NWGNUmakefile
+++ b/modules/dav/lock/NWGNUmakefile
@@ -3,7 +3,7 @@
 #
 
 SUBDIRS = \
-       $(EOLIST) 
+       $(EOLIST)
 
 #
 # Get the 'head' of the build environment.  This includes default targets and
@@ -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,10 +103,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = modDAVLK
+NLM_NAME       = modDAVLK
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) DAV Database Lock Sub-Module
@@ -118,16 +118,16 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) DAV Database Lock Sub-Module
 NLM_THREAD_NAME        = modDAVLK Thread
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            = 
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
 #
 NLM_STACK_SIZE = 65536
- 
+
 
 #
 # If this is specified it will be used by the link '-entry' directive
@@ -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)
 
 #
@@ -197,7 +197,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -217,20 +217,20 @@ FILES_nlm_Ximports = \
        @httpd.imp \
        @../main/dav.imp \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 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)
@@ -241,7 +241,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -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..ba2cf5aa590a33680818839f4a649e547c7f323e 100644 (file)
--- a/modules/dav/main/NWGNUmakefile
+++ b/modules/dav/main/NWGNUmakefile
@@ -3,7 +3,7 @@
 #
 
 SUBDIRS = \
-       $(EOLIST) 
+       $(EOLIST)
 
 #
 # Get the 'head' of the build environment.  This includes default targets and
@@ -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,10 +101,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = mod_DAV
+NLM_NAME       = mod_DAV
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) DAV module
@@ -116,16 +116,16 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) DAV module
 NLM_THREAD_NAME        = mod_DAV
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            = 
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
 #
 NLM_STACK_SIZE = 65536
- 
+
 
 #
 # If this is specified it will be used by the link '-entry' directive
@@ -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 
+# 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)
@@ -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)
 
 #
@@ -206,7 +206,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -225,21 +225,21 @@ FILES_nlm_Ximports = \
        @$(APR)/aprlib.imp \
        @httpd.imp \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
        dav_module \
        @dav.imp \
        $(EOLIST)
-       
-#   
+
+#
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -250,12 +250,12 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
        copy $(OBJDIR)\mod_dav.nlm $(INSTALL)\$(BASEDIR)\modules\*.*
-    
+
 #
 # Any specialized rules here
 #
@@ -268,4 +268,3 @@ install :: nlms FORCE
 include $(AP_WORK)\build\NWGNUtail.inc
 
 
-       

diff --git a/modules/debugging/NWGNUmakefile b/modules/debugging/NWGNUmakefile
index b9023fba832d3e484824f7c243ab79460f01dd8f..e63f019c6844c1e031a2f95060ae0c9d6b0e3652 100644 (file)
--- a/modules/debugging/NWGNUmakefile
+++ b/modules/debugging/NWGNUmakefile
@@ -3,7 +3,7 @@
 #
 
 SUBDIRS = \
-       $(EOLIST) 
+       $(EOLIST)
 
 #
 # Get the 'head' of the build environment.  This includes default targets and
@@ -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,10 +95,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               =
+NLM_NAME       =
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        =
@@ -110,10 +110,10 @@ NLM_DESCRIPTION   =
 NLM_THREAD_NAME        =
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -139,14 +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 
+# 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
@@ -188,7 +187,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -204,19 +203,19 @@ FILE_nlm_copyright =
 #
 FILES_nlm_Ximports = \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
        $(EOLIST)
-       
-#   
+
+#
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -227,7 +226,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -243,4 +242,5 @@ install :: nlms FORCE
 #
 
 include $(AP_WORK)\build\NWGNUtail.inc
-       
+
+

diff --git a/modules/debugging/NWGNUmodbucketeer b/modules/debugging/NWGNUmodbucketeer
index 1c14170ad5eca8f964624f7d7a6904157d7c4769..8c5415e8a8466a62e7de363019b9affda680b831 100644 (file)
--- a/modules/debugging/NWGNUmodbucketeer
+++ b/modules/debugging/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,10 +93,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = modbucketeer
+NLM_NAME       = modbucketeer
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) Debugging IO Module
@@ -109,10 +108,10 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) Debugging IO Module
 NLM_THREAD_NAME        = Bucketeer Module
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -138,14 +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 
+# 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)
 
 #
@@ -189,7 +188,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -208,20 +207,20 @@ FILES_nlm_Ximports = \
        @$(NWOS)/httpd.imp \
        @libc.imp \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 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)
@@ -232,7 +231,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -248,3 +247,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/debugging/NWGNUmoddumpio b/modules/debugging/NWGNUmoddumpio
index 7db7075d1ee01aa2acd2aa815ff01f420a7c8bc7..ceb1cfb3ab781cb5a1a772fec3c3a5749caab0db 100644 (file)
--- a/modules/debugging/NWGNUmoddumpio
+++ b/modules/debugging/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,10 +93,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = moddumpio
+NLM_NAME       = moddumpio
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) Debugging IO Module
@@ -109,10 +108,10 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) Debugging IO Module
 NLM_THREAD_NAME        = DumpIO Module
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -138,14 +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 
+# 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)
 
 #
@@ -189,7 +188,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -208,20 +207,20 @@ FILES_nlm_Ximports = \
        @$(NWOS)/httpd.imp \
        @libc.imp \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
        dumpio_module \
        $(EOLIST)
-       
-#   
+
+#
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -232,7 +231,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -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..13a5beac11d76d58bf585e2e558ea98d162f4081 100644 (file)
--- a/modules/echo/NWGNUmakefile
+++ b/modules/echo/NWGNUmakefile
@@ -3,7 +3,7 @@
 #
 
 SUBDIRS = \
-       $(EOLIST) 
+       $(EOLIST)
 
 #
 # Get the 'head' of the build environment.  This includes default targets and
@@ -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,10 +101,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = echo
+NLM_NAME       = echo
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) Echo Module
@@ -117,10 +116,10 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) Echo Module
 NLM_THREAD_NAME        = Echo Module
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -146,14 +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 
+# 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)
 
 #
@@ -197,7 +196,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -216,20 +215,20 @@ FILES_nlm_Ximports = \
        @$(NWOS)/httpd.imp \
        @libc.imp \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
        echo_module \
        $(EOLIST)
-       
-#   
+
+#
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -240,7 +239,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -258,4 +257,3 @@ install :: nlms FORCE
 include $(AP_WORK)\build\NWGNUtail.inc
 
 
-       

diff --git a/modules/experimental/NWGNUcase_flt b/modules/experimental/NWGNUcase_flt
index 39908fe9c29c8981016e85bc7bd608f7df416b75..411da3c647dd91e2374c776743b119934c90a3a0 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\r
 \r
 \r
-\r

diff --git a/modules/experimental/NWGNUcase_flt_in b/modules/experimental/NWGNUcase_flt_in
index a90378411a5687089141bb8621af4307e54a0472..a5b4dbea699f3f7eeff07b64539f9624213ad781 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\r
 \r
 \r
-\r

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

diff --git a/modules/experimental/NWGNUmakefile b/modules/experimental/NWGNUmakefile
index 497589e2d101747dadbd5d7e98f295dec650a17d..7085ec9d72b8bf52a0ac853f5c664cbe360d5856 100644 (file)
--- a/modules/experimental/NWGNUmakefile
+++ b/modules/experimental/NWGNUmakefile
@@ -253,3 +253,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/experimental/NWGNUsedfilter b/modules/experimental/NWGNUsedfilter
index 631aa8a1f105acc7560f98fd2061680f590f5449..c865cd907601a921cc8c2be7a09dbf8c04bb8180 100644 (file)
--- a/modules/experimental/NWGNUsedfilter
+++ b/modules/experimental/NWGNUsedfilter
@@ -256,4 +256,3 @@ 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..589fff3917261bf4f0b30c5c74a62cc937593dca 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,10 +93,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = extfiltr
+NLM_NAME       = extfiltr
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) External Filter Module
@@ -109,10 +108,10 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) External Filter Module
 NLM_THREAD_NAME        = ExtFilter Module
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -138,14 +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 
+# 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)
 
 #
@@ -189,7 +188,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -208,20 +207,20 @@ FILES_nlm_Ximports = \
        @$(NWOS)/httpd.imp \
        @libc.imp \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
        ext_filter_module \
        $(EOLIST)
-       
-#   
+
+#
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -232,7 +231,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -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..9a01213bce0fe1e6ca9f8a41973cd614dcd12a8b 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,10 +93,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = mod_filter
+NLM_NAME       = mod_filter
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) Filter Module
@@ -109,10 +108,10 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) Filter Module
 NLM_THREAD_NAME        = Filter Module
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -138,14 +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 
+# 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)
 
 #
@@ -189,7 +188,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -208,20 +207,20 @@ FILES_nlm_Ximports = \
        @$(NWOS)/httpd.imp \
        @libc.imp \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 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)
@@ -232,7 +231,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -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..8305c55444889bf8322a38800dc752fa1e5be7b5 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,10 +94,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = autoindex
+NLM_NAME       = autoindex
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) Autoindex Module
@@ -110,10 +109,10 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) Autoindex Module
 NLM_THREAD_NAME        = Autoindex Module
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -139,14 +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 
+# 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)
 
 #
@@ -190,7 +189,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -209,20 +208,20 @@ FILES_nlm_Ximports = \
        @$(NWOS)/httpd.imp \
        @libc.imp \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 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)
@@ -233,7 +232,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -249,3 +248,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/generators/NWGNUinfo b/modules/generators/NWGNUinfo
index 8d1a8972f922e3ec530ab3500655a0ff54de3c5f..0477dbf9770222a1165e76110d1cfc47c50c9fb8 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,10 +93,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = info
+NLM_NAME       = info
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) Info Module
@@ -109,10 +108,10 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) Info Module
 NLM_THREAD_NAME        = Info Module
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -138,14 +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 
+# 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)
 
 #
@@ -189,7 +188,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -208,20 +207,20 @@ FILES_nlm_Ximports = \
        @$(NWOS)/httpd.imp \
        @libc.imp \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
        info_module \
        $(EOLIST)
-       
-#   
+
+#
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -232,7 +231,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -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..0a4075a5cab4f4553490f7a7c32bd3f497b5b97e 100644 (file)
--- a/modules/generators/NWGNUmakefile
+++ b/modules/generators/NWGNUmakefile
@@ -3,7 +3,7 @@
 #
 
 SUBDIRS = \
-       $(EOLIST) 
+       $(EOLIST)
 
 #
 # Get the 'head' of the build environment.  This includes default targets and
@@ -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,10 +95,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               =
+NLM_NAME       =
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        =
@@ -110,10 +110,10 @@ NLM_DESCRIPTION   =
 NLM_THREAD_NAME        =
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -139,14 +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 
+# 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
@@ -190,7 +190,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -206,19 +206,19 @@ FILE_nlm_copyright =
 #
 FILES_nlm_Ximports = \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
        $(EOLIST)
-       
-#   
+
+#
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -229,7 +229,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -247,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..58f6ce203fbee4a984fcbc4a35e5586c7770139e 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,10 +94,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = mod_asis
+NLM_NAME       = mod_asis
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) ASIS Module
@@ -110,10 +109,10 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) ASIS Module
 NLM_THREAD_NAME        = Mod_asis Module
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -139,14 +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 
+# 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)
 
 #
@@ -190,7 +189,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -209,20 +208,20 @@ FILES_nlm_Ximports = \
        @$(NWOS)/httpd.imp \
        @libc.imp \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 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)
@@ -233,7 +232,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -249,3 +248,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/generators/NWGNUmod_cgi b/modules/generators/NWGNUmod_cgi
index 179621216721ffcd234c6afb5808cc292df42007..341fac02b4e683c13345cb6db386da420833b977 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)
 
 #
@@ -96,10 +95,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = mod_cgi
+NLM_NAME       = mod_cgi
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) CGI Module
@@ -111,10 +110,10 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) CGI Module
 NLM_THREAD_NAME        = Mod_cgi Module
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -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 
+# 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)
 
 #
@@ -191,7 +190,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -210,20 +209,20 @@ FILES_nlm_Ximports = \
        @$(NWOS)/httpd.imp \
        @libc.imp \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 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)
@@ -234,7 +233,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE

diff --git a/modules/generators/NWGNUstatus b/modules/generators/NWGNUstatus
index 6e9c1d823afa0c3c14d7621808be21d97033aeb0..a6658ad28231ea2e0dddde293dde17acdfad3dfb 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,10 +93,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = status
+NLM_NAME       = status
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) Status Module
@@ -109,10 +108,10 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) Status Module
 NLM_THREAD_NAME        = Status Module
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -138,14 +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 
+# 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)
 
 #
@@ -189,7 +188,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -208,20 +207,20 @@ FILES_nlm_Ximports = \
        @$(NWOS)/httpd.imp \
        @libc.imp \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
        status_module \
        $(EOLIST)
-       
-#   
+
+#
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -232,7 +231,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -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..91818800351f2a298576a1e21a4610e1bbfb0105 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,10 +101,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = utilldap
+NLM_NAME       = utilldap
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) LDAP Authentication Module
@@ -117,10 +116,10 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) LDAP Authentication Module
 NLM_THREAD_NAME        = UtilLDAP Module
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -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 
+# 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)
 
 #
@@ -201,7 +200,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -222,20 +221,20 @@ FILES_nlm_Ximports = \
        @$(LDAPSDK)/imports/lldapsdk.imp \
        @$(LDAPSDK)/imports/lldapssl.imp \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 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)
@@ -246,7 +245,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -263,3 +262,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/loggers/NWGNUforensic b/modules/loggers/NWGNUforensic
index 6ebcd38f04c9e2a1b37cf155b97ab82c08344ae1..0a979dae06dced1f0dc72c59eb651df4458e9465 100644 (file)
--- a/modules/loggers/NWGNUforensic
+++ b/modules/loggers/NWGNUforensic
@@ -3,7 +3,7 @@
 #
 
 SUBDIRS = \
-       $(EOLIST) 
+       $(EOLIST)
 
 #
 # Get the 'head' of the build environment.  This includes default targets and
@@ -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,10 +101,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = forensic
+NLM_NAME       = forensic
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) Forensic Logging Module
@@ -117,10 +116,10 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) Forensic Logging Module
 NLM_THREAD_NAME        = Forensic Module
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -146,14 +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 
+# 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)
 
 #
@@ -197,7 +196,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -216,20 +215,20 @@ FILES_nlm_Ximports = \
        @$(NWOS)/httpd.imp \
        @libc.imp \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
        log_forensic_module \
        $(EOLIST)
-       
-#   
+
+#
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -240,7 +239,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -258,4 +257,3 @@ install :: nlms FORCE
 include $(AP_WORK)\build\NWGNUtail.inc
 
 
-       

diff --git a/modules/loggers/NWGNUmakefile b/modules/loggers/NWGNUmakefile
index f0504acd86b385ccd054fd3f506a51993000923c..8cca62469d17ba524546b01f2d03c513ac075735 100644 (file)
--- a/modules/loggers/NWGNUmakefile
+++ b/modules/loggers/NWGNUmakefile
@@ -3,7 +3,7 @@
 #
 
 SUBDIRS = \
-       $(EOLIST) 
+       $(EOLIST)
 
 #
 # Get the 'head' of the build environment.  This includes default targets and
@@ -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,10 +95,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               =
+NLM_NAME       =
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        =
@@ -110,10 +110,10 @@ NLM_DESCRIPTION   =
 NLM_THREAD_NAME        =
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -139,14 +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 
+# 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
@@ -187,7 +187,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -203,19 +203,19 @@ FILE_nlm_copyright =
 #
 FILES_nlm_Ximports = \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
        $(EOLIST)
-       
-#   
+
+#
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -226,7 +226,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -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..ee367f3598aaa24949c5983cf4da47d8c4c6c017 100644 (file)
--- a/modules/loggers/NWGNUmodlogio
+++ b/modules/loggers/NWGNUmodlogio
@@ -3,7 +3,7 @@
 #
 
 SUBDIRS = \
-       $(EOLIST) 
+       $(EOLIST)
 
 #
 # Get the 'head' of the build environment.  This includes default targets and
@@ -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,10 +101,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = logio
+NLM_NAME       = logio
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) IO Logging Module
@@ -117,10 +116,10 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) IO Logging Module
 NLM_THREAD_NAME        = Logio Module
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -146,14 +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 
+# 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)
 
 #
@@ -197,7 +196,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -216,20 +215,20 @@ FILES_nlm_Ximports = \
        @$(NWOS)/httpd.imp \
        @libc.imp \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
        logio_module \
        $(EOLIST)
-       
-#   
+
+#
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -240,7 +239,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -258,4 +257,3 @@ install :: nlms FORCE
 include $(AP_WORK)\build\NWGNUtail.inc
 
 
-       

diff --git a/modules/mappers/NWGNUactions b/modules/mappers/NWGNUactions
index 479e4ff21c2076d7c6cc1aa74e8364d09e2fd6fe..0429f7809d0fdd39850dac03b6ed5e164728c81e 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,10 +93,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = actions
+NLM_NAME       = actions
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) Actions Module
@@ -108,10 +108,10 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) Actions Module
 NLM_THREAD_NAME        = Actions Module
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -137,14 +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 
+# 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)
 
 #
@@ -188,7 +188,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -207,20 +207,20 @@ FILES_nlm_Ximports = \
        @$(NWOS)/httpd.imp \
        @libc.imp \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 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)
@@ -231,7 +231,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -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..a5e7f37c00c10ca0724fcd9fe8a8d4baebf8206f 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,10 +94,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = imagemap
+NLM_NAME       = imagemap
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) Image Map Module
@@ -109,10 +109,10 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) Image Map Module
 NLM_THREAD_NAME        = Image Map Module
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -138,14 +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 
+# 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)
 
 #
@@ -189,7 +189,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -208,20 +208,20 @@ FILES_nlm_Ximports = \
        @$(NWOS)/httpd.imp \
        @libc.imp \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 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)
@@ -232,7 +232,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -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..d265bc0802be1702c324111fe7f665ce67d12c3d 100644 (file)
--- a/modules/mappers/NWGNUmakefile
+++ b/modules/mappers/NWGNUmakefile
@@ -3,7 +3,7 @@
 #
 
 SUBDIRS = \
-       $(EOLIST) 
+       $(EOLIST)
 
 #
 # Get the 'head' of the build environment.  This includes default targets and
@@ -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,10 +95,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               =
+NLM_NAME       =
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        =
@@ -110,10 +110,10 @@ NLM_DESCRIPTION   =
 NLM_THREAD_NAME        =
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -139,14 +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 
+# 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
@@ -191,7 +191,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -207,19 +207,19 @@ FILE_nlm_copyright =
 #
 FILES_nlm_Ximports = \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
        $(EOLIST)
-       
-#   
+
+#
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -230,7 +230,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE

diff --git a/modules/mappers/NWGNUrewrite b/modules/mappers/NWGNUrewrite
index f2be9c62b65f09ea2b2ad556391d7d25a8bfabdc..f03d00537eca9d19ac8fdbab3cf7169893e57b0c 100644 (file)
--- a/modules/mappers/NWGNUrewrite
+++ b/modules/mappers/NWGNUrewrite
@@ -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,10 +95,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = rewrite
+NLM_NAME       = rewrite
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) Rewrite Module
@@ -110,10 +110,10 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) Rewrite Module
 NLM_THREAD_NAME        = Rewrite Module
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -139,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 
+# 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 +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)
 
 #
@@ -190,7 +190,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -209,20 +209,20 @@ FILES_nlm_Ximports = \
        @$(NWOS)/httpd.imp \
        @libc.imp \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
        rewrite_module \
        $(EOLIST)
-       
-#   
+
+#
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -233,7 +233,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -249,3 +249,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/mappers/NWGNUspeling b/modules/mappers/NWGNUspeling
index 16c6677d6fde6ef99f64e6ecbd280410ee25deff..57ca91f08fe56c77670ef5135780b55a871dbc93 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,10 +93,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = speling
+NLM_NAME       = speling
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) Speling Module
@@ -108,10 +108,10 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) Speling Module
 NLM_THREAD_NAME        = Speling Module
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -137,14 +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 
+# 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)
 
 #
@@ -188,7 +188,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -207,20 +207,20 @@ FILES_nlm_Ximports = \
        @$(NWOS)/httpd.imp \
        @libc.imp \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
        speling_module \
        $(EOLIST)
-       
-#   
+
+#
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -231,7 +231,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -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..269722bf836de06f651c017fe1ef8a2000f8cbda 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,10 +94,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = userdir
+NLM_NAME       = userdir
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) User Dir Module
@@ -109,10 +109,10 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) User Dir Module
 NLM_THREAD_NAME        = UserDir Module
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -138,14 +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 
+# 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)
 
 #
@@ -189,7 +189,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -208,20 +208,20 @@ FILES_nlm_Ximports = \
        @$(NWOS)/httpd.imp \
        @libc.imp \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 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)
@@ -232,7 +232,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -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..886bd1d372c7d0a4b77f2a16b6a0c0bfd9e49ed3 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,10 +93,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = vhost
+NLM_NAME       = vhost
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) Vhost Alias Module
@@ -108,10 +108,10 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) Vhost Alias Module
 NLM_THREAD_NAME        = Vhost Alias Module
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -137,14 +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 
+# 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)
 
 #
@@ -188,7 +188,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -207,20 +207,20 @@ FILES_nlm_Ximports = \
        @$(NWOS)/httpd.imp \
        @libc.imp \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
        vhost_alias_module \
        $(EOLIST)
-       
-#   
+
+#
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -231,7 +231,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -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..d92e0ac49eee4fe7058c14feb40a3f33b00a111b 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)
 
 #
@@ -72,7 +71,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -94,10 +93,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = cernmeta
+NLM_NAME       = cernmeta
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) CERN Meta Module
@@ -109,10 +108,10 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) CERN Meta Module
 NLM_THREAD_NAME        = CERN Meta Module
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -138,14 +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 
+# 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)
 
 #
@@ -189,7 +188,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -208,20 +207,20 @@ FILES_nlm_Ximports = \
        @$(NWOS)/httpd.imp \
        @libc.imp \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
        cern_meta_module \
        $(EOLIST)
-       
-#   
+
+#
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -232,7 +231,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -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..ea98ce4eb51c72b9774fcdcb01c27f5d077e7b46 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,10 +93,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = expires
+NLM_NAME       = expires
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) Expires Module
@@ -109,10 +108,10 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) Expires Module
 NLM_THREAD_NAME        = Expires Module
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -138,14 +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 
+# 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)
 
 #
@@ -189,7 +188,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -208,20 +207,20 @@ FILES_nlm_Ximports = \
        @$(NWOS)/httpd.imp \
        @libc.imp \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
        expires_module \
        $(EOLIST)
-       
-#   
+
+#
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -232,7 +231,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -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..7283c33c535f8665fc9adccf0e815c077be4478d 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,10 +94,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = headers
+NLM_NAME       = headers
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) Headers Module
@@ -110,10 +109,10 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) Headers Module
 NLM_THREAD_NAME        = Headers Module
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -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 
+# 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)
 
 #
@@ -190,7 +189,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -209,20 +208,20 @@ FILES_nlm_Ximports = \
        @$(NWOS)/httpd.imp \
        @libc.imp \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
        headers_module \
        $(EOLIST)
-       
-#   
+
+#
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -233,7 +232,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -249,3 +248,4 @@ install :: nlms FORCE
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/metadata/NWGNUmakefile b/modules/metadata/NWGNUmakefile
index 07e0dc4778baa6d45893d5d1a1badde5cae92af2..6a2266f9ecc2cd5770a7bc724b37b8742d8eb964 100644 (file)
--- a/modules/metadata/NWGNUmakefile
+++ b/modules/metadata/NWGNUmakefile
@@ -3,7 +3,7 @@
 #
 
 SUBDIRS = \
-       $(EOLIST) 
+       $(EOLIST)
 
 #
 # Get the 'head' of the build environment.  This includes default targets and
@@ -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,10 +96,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               =
+NLM_NAME       =
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        =
@@ -111,10 +111,10 @@ NLM_DESCRIPTION   =
 NLM_THREAD_NAME        =
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -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 
+# 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
@@ -194,7 +194,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -210,19 +210,19 @@ FILE_nlm_copyright =
 #
 FILES_nlm_Ximports = \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
        $(EOLIST)
-       
-#   
+
+#
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -233,7 +233,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE

diff --git a/modules/metadata/NWGNUmimemagi b/modules/metadata/NWGNUmimemagi
index 3c5f11a430edf80afa2e3cc8039ca70fae2662bb..4bfac168ca3f728a9ceca28a4dc9c674f3ebf707 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,10 +93,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = mimemagi
+NLM_NAME       = mimemagi
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) Mime Magic Module
@@ -109,10 +108,10 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) Mime Magic Module
 NLM_THREAD_NAME        = CERN Meta Module
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -138,14 +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 
+# 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)
 
 #
@@ -189,7 +188,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -208,20 +207,20 @@ FILES_nlm_Ximports = \
        @$(NWOS)/httpd.imp \
        @libc.imp \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
        mime_magic_module \
        $(EOLIST)
-       
-#   
+
+#
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -232,7 +231,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -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..ef80af9e3f252c3725e71a024200701ece75eca1 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,10 +93,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = modident
+NLM_NAME       = modident
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) Remote User Identity Module
@@ -109,10 +108,10 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) Remote User Identity Module
 NLM_THREAD_NAME        = Mod_Ident Module
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -138,14 +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 
+# 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)
 
 #
@@ -189,7 +188,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -208,20 +207,20 @@ FILES_nlm_Ximports = \
        @$(NWOS)/httpd.imp \
        @libc.imp \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 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)
@@ -232,7 +231,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -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..c06cd657e93fe2e971b2ab4699bd4e2f99fc5034 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,10 +93,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = modversion
+NLM_NAME       = modversion
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) Version Module
@@ -109,10 +108,10 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) Version Module
 NLM_THREAD_NAME        = Version Module
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -138,14 +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 
+# 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)
 
 #
@@ -189,7 +188,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -208,20 +207,20 @@ FILES_nlm_Ximports = \
        @$(NWOS)/httpd.imp \
        @libc.imp \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
        version_module \
        $(EOLIST)
-       
-#   
+
+#
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -232,7 +231,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -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..52c5086da21857fd0c5ebe26f0dfed61c78bafcd 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,10 +93,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = uniqueid
+NLM_NAME       = uniqueid
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) Unique ID Module
@@ -109,10 +108,10 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) Unique ID Module
 NLM_THREAD_NAME        = Unique ID Module
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -138,14 +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 
+# 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)
 
 #
@@ -190,7 +189,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -209,26 +208,26 @@ FILES_nlm_Ximports = \
        @$(NWOS)/httpd.imp \
        @libc.imp \
        $(EOLIST)
- 
+
 # Don't link with Winsock if standard sockets are being used
 ifndef USE_STDSOCKETS
 FILES_nlm_Ximports += @ws2nlm.imp \
-              $(EOLIST)
+       $(EOLIST)
 endif
- 
-#   
+
+#
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
        unique_id_module \
        $(EOLIST)
-       
-#   
+
+#
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -239,7 +238,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -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..41cb1a5fe54483971e24e186035550025b4f9342 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,10 +93,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = usertrk
+NLM_NAME       = usertrk
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) User Track Module
@@ -109,10 +108,10 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) User Track Module
 NLM_THREAD_NAME        = User Track Module
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -138,14 +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 
+# 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)
 
 #
@@ -189,7 +188,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -208,20 +207,20 @@ FILES_nlm_Ximports = \
        @$(NWOS)/httpd.imp \
        @libc.imp \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
        usertrack_module \
        $(EOLIST)
-       
-#   
+
+#
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -232,7 +231,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -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..6509f523fe13639c3ff95da3bacda513a29920cd 100644 (file)
--- a/modules/proxy/NWGNUmakefile
+++ b/modules/proxy/NWGNUmakefile
@@ -3,7 +3,7 @@
 #
 
 SUBDIRS = \
-       $(EOLIST) 
+       $(EOLIST)
 
 #
 # Get the 'head' of the build environment.  This includes default targets and
@@ -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,10 +95,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               =
+NLM_NAME       =
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        =
@@ -110,10 +110,10 @@ NLM_DESCRIPTION   =
 NLM_THREAD_NAME        =
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -139,14 +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 
+# 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
@@ -191,7 +191,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -207,19 +207,19 @@ FILE_nlm_copyright =
 #
 FILES_nlm_Ximports = \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
        $(EOLIST)
-       
-#   
+
+#
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -230,7 +230,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -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..cf625547b5503f200d106cdc6eb01b85ef629843 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,10 +96,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = proxy
+NLM_NAME       = proxy
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) Proxy Module
@@ -112,10 +111,10 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) Proxy Module
 NLM_THREAD_NAME        = Proxy Module
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -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 
+# 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)
 
 #
@@ -194,7 +193,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -213,14 +212,14 @@ FILES_nlm_Ximports = \
        @$(NWOS)/httpd.imp \
        @libc.imp \
        $(EOLIST)
- 
+
 # Don't link with Winsock if standard sockets are being used
 ifndef USE_STDSOCKETS
 FILES_nlm_Ximports += @ws2nlm.imp \
-              $(EOLIST)
+       $(EOLIST)
 endif
- 
-#   
+
+#
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
@@ -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)
@@ -252,7 +251,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -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..0de56cdb7535796653cb94ebb93eecb943612f74 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. 
@@ -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..bc998af92dc8d7ca79615d4dfcd66e7ca4780fb5 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,10 +94,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = proxybalancer
+NLM_NAME       = proxybalancer
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) Proxy Balancer Sub-Module
@@ -110,10 +109,10 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) Proxy Balancer Sub-Module
 NLM_THREAD_NAME        = Prxy Blncr Module
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -139,14 +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 
+# 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)
 
 #
@@ -193,7 +192,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -221,26 +220,26 @@ FILES_nlm_Ximports = \
        ap_proxy_ssl_enable \
        ap_proxy_ssl_disable \
        $(EOLIST)
- 
+
 # Don't link with Winsock if standard sockets are being used
 ifndef USE_STDSOCKETS
 FILES_nlm_Ximports += @ws2nlm.imp \
-              $(EOLIST)
+       $(EOLIST)
 endif
- 
-#   
+
+#
 # Any symbols exported to here
 #
 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)
@@ -251,7 +250,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -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..8afb75b7c9f651f817dd614687f31529b23bed8d 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,10 +94,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = proxycon
+NLM_NAME       = proxycon
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) Proxy Connection Sub-Module
@@ -110,10 +109,10 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) Proxy Connection Sub-Module
 NLM_THREAD_NAME        = Proxy Conn Module
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -139,14 +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 
+# 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)
 
 #
@@ -192,7 +191,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -214,20 +213,20 @@ FILES_nlm_Ximports = \
        proxy_hook_scheme_handler \
        proxy_hook_canon_handler \
        $(EOLIST)
- 
-#   
+
+#
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
        proxy_connect_module \
        $(EOLIST)
-       
-#   
+
+#
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -238,7 +237,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -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..7d799da46bc18317e9592caac257df4876b36e32 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,10 +94,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = proxyftp
+NLM_NAME       = proxyftp
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) Proxy FTP Sub-Module
@@ -110,10 +109,10 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) Proxy FTP Sub-Module
 NLM_THREAD_NAME        = Proxy FTP Module
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -139,14 +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 
+# 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)
 
 #
@@ -193,7 +192,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -217,26 +216,26 @@ FILES_nlm_Ximports = \
        ap_proxy_ssl_enable \
        ap_proxy_ssl_disable \
        $(EOLIST)
- 
+
 # Don't link with Winsock if standard sockets are being used
 ifndef USE_STDSOCKETS
 FILES_nlm_Ximports += @ws2nlm.imp \
-              $(EOLIST)
+       $(EOLIST)
 endif
- 
-#   
+
+#
 # Any symbols exported to here
 #
 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)
@@ -247,7 +246,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -265,3 +264,4 @@ vpath %.c ../arch/netware
 
 include $(AP_WORK)\build\NWGNUtail.inc
 
+

diff --git a/modules/proxy/NWGNUproxyhtp b/modules/proxy/NWGNUproxyhtp
index bf4f870123f1c1ebfbf6a815fc41059eb7173ea5..f5eed36bbb61283355ab0c763d40d6491f98f406 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,10 +94,10 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = proxyhtp
+NLM_NAME       = proxyhtp
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) Proxy HTTP Sub-Module
@@ -110,10 +109,10 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) Proxy HTTP Sub-Module
 NLM_THREAD_NAME        = Proxy HTTP Module
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -139,14 +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 
+# 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)
 
 #
@@ -193,7 +192,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -218,26 +217,26 @@ FILES_nlm_Ximports = \
        ap_proxy_ssl_enable \
        ap_proxy_ssl_disable \
        $(EOLIST)
- 
+
 # Don't link with Winsock if standard sockets are being used
 ifndef USE_STDSOCKETS
 FILES_nlm_Ximports += @ws2nlm.imp \
-              $(EOLIST)
+       $(EOLIST)
 endif
- 
-#   
+
+#
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
        proxy_http_module \
        $(EOLIST)
-       
-#   
+
+#
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)
@@ -248,7 +247,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -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 b357c4eec51c6185e29a47daa444aaacad622a0d..5968cb7c735c20aeb55a99a8c4893f6a0e9b463e 100644 (file)
--- a/modules/ssl/NWGNUmakefile
+++ b/modules/ssl/NWGNUmakefile
@@ -1,5 +1,5 @@
 #
-# This Makefile requires the environment var OSSLSDK 
+# This Makefile requires the environment var OSSLSDK
 # pointing to the base directory of your OpenSSL SDK.
 #
 
@@ -8,7 +8,7 @@
 #
 
 SUBDIRS = \
-       $(EOLIST) 
+       $(EOLIST)
 
 #
 # Get the 'head' of the build environment.  This includes default targets and
@@ -118,7 +118,7 @@ endif
 NLM_NAME       = mod_ssl
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
 NLM_DESCRIPTION        = Apache $(VERSION_STR) SSL module
@@ -130,16 +130,16 @@ NLM_DESCRIPTION   = Apache $(VERSION_STR) SSL module
 NLM_THREAD_NAME        = $(NLM_NAME)
 
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION    = 
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
 #
 NLM_STACK_SIZE = 8192
- 
+
 
 #
 # If this is specified it will be used by the link '-entry' directive
@@ -160,13 +160,13 @@ NLM_CHECK_SYM     =
 # If this is specified it will be used by the link '-flags' directive
 #
 NLM_FLAGS      = AUTOUNLOAD, PSEUDOPREEMPTION
- 
+
 #
-# If this is specified it will be linked in with the XDCData option in the def 
+# If this is specified it will be linked in with the XDCData option in the def
 # file instead of the default of $(NWOS)/apache.xdc.  XDCData can be disabled
 # by setting APACHE_UNIPROC in the environment
 #
-XDCDATA                = 
+XDCDATA                =
 
 #
 # Declare all target files (you must add your files here)
@@ -215,7 +215,7 @@ FILES_nlm_modules = \
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -237,21 +237,21 @@ FILES_nlm_Ximports = \
        RunningProcess \
        GetSuperHighResolutionTimer \
        $(EOLIST)
- 
+
 # Don't link with Winsock if standard sockets are being used
 ifndef USE_STDSOCKETS
 FILES_nlm_Ximports += @ws2nlm.imp \
-              $(EOLIST)
+       $(EOLIST)
 endif
- 
-#   
+
+#
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
        ssl_module \
        $(EOLIST)
 
-#   
+#
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
@@ -267,12 +267,12 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
        copy $(OBJDIR)\mod_ssl.nlm $(INSTALL)\$(BASEDIR)\modules\*.*
-    
+
 #
 # Any specialized rules here
 #
@@ -296,4 +296,3 @@ ssl_expr_scan.c : ssl_expr_scan.l
 include $(AP_WORK)\build\NWGNUtail.inc
 
 
-