Reduce differences between Netware proxy makefiles.

- removing trailing whitespace
- remove trailing empty lines
- choose a common order for lists
- choose a common style for TARGET_nlm and
  TARGET_lib definitions

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

diff --git a/modules/proxy/NWGNUproxyajp b/modules/proxy/NWGNUproxyajp
index fb46490681aeafbf338f1f812ba34e54cd9d3f6a..cdb80d57f15789d665199f5efc6af1958f3cdedd 100644 (file)
--- a/modules/proxy/NWGNUproxyajp
+++ b/modules/proxy/NWGNUproxyajp
@@ -95,7 +95,7 @@ endif
 NLM_NAME       = proxyajp
 
 #
-# 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 AJP Sub-Module
@@ -107,7 +107,7 @@ NLM_DESCRIPTION     = Apache $(VERSION_STR) Proxy AJP Sub-Module
 NLM_THREAD_NAME        = Proxy AJP 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    =
@@ -139,11 +139,11 @@ NLM_CHECK_SYM     =
 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
@@ -193,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,21 +213,21 @@ FILES_nlm_Ximports = \
        @mod_proxy.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 = \
        proxy_ajp_module \
        $(EOLIST)
 
-#   
+#
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
@@ -243,7 +243,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(AP_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
@@ -260,5 +260,3 @@ vpath %.c ../arch/netware
 #
 
 include $(APBUILD)/NWGNUtail.inc
-
-

diff --git a/modules/proxy/NWGNUproxybalancer b/modules/proxy/NWGNUproxybalancer
index 4f1be58e36daebe7cfc219211a8d710fb751a519..34fc85a0804b7e4e62aac5efe885183db10a4324 100644 (file)
--- a/modules/proxy/NWGNUproxybalancer
+++ b/modules/proxy/NWGNUproxybalancer
@@ -256,5 +256,3 @@ vpath %.c ../arch/netware
 #
 
 include $(APBUILD)/NWGNUtail.inc
-
-

diff --git a/modules/proxy/NWGNUproxycon b/modules/proxy/NWGNUproxycon
index 522096870e7edb06208e8c0079b94e86940a6676..62810de43cab8a9f1fb191071822bc0f099f3f6b 100644 (file)
--- a/modules/proxy/NWGNUproxycon
+++ b/modules/proxy/NWGNUproxycon
@@ -98,13 +98,13 @@ NLM_NAME    = proxycon
 # 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
+NLM_DESCRIPTION        = Apache $(VERSION_STR) Proxy CONNECT Sub-Module
 
 #
 # This is used by the '-threadname' directive.  If left blank,
 # NLM_NAME Thread will be used.
 #
-NLM_THREAD_NAME        = Proxy Conn Module
+NLM_THREAD_NAME        = Proxy CONNECT Module
 
 #
 # If this is specified, it will override VERSION value in
@@ -247,5 +247,3 @@ install :: nlms FORCE
 #
 
 include $(APBUILD)/NWGNUtail.inc
-
-

diff --git a/modules/proxy/NWGNUproxyexpress b/modules/proxy/NWGNUproxyexpress
index 7cae388da9bdff4ea3d776ccd97f04f2c49d0552..3e15e1f1ff60e9a2bc98a2d3d07d7e7106c8053c 100644 (file)
--- a/modules/proxy/NWGNUproxyexpress
+++ b/modules/proxy/NWGNUproxyexpress
@@ -148,12 +148,15 @@ XDCDATA           =
 #
 # If there is an NLM target, put it here
 #
-TARGET_nlm = $(OBJDIR)/$(NLM_NAME).nlm
+TARGET_nlm = \
+       $(OBJDIR)/proxyexpress.nlm \
+       $(EOLIST)
 
 #
 # If there is an LIB target, put it here
 #
-TARGET_lib =
+TARGET_lib = \
+       $(EOLIST)
 
 #
 # These are the OBJ files needed to create the NLM target above.
@@ -176,8 +179,8 @@ FILES_nlm_libs = \
 # These will be added as a module command in the link.opt file.
 #
 FILES_nlm_modules = \
-       libc \
        aprlib \
+       libc \
        proxy \
        $(EOLIST)
 
@@ -200,10 +203,10 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @libc.imp \
        @aprlib.imp \
        @httpd.imp \
        @mod_proxy.imp \
+       @libc.imp \
        $(EOLIST)
 
 # Don't link with Winsock if standard sockets are being used
@@ -252,5 +255,3 @@ vpath %.c ../arch/netware
 #
 
 include $(APBUILD)/NWGNUtail.inc
-
-

diff --git a/modules/proxy/NWGNUproxyfcgi b/modules/proxy/NWGNUproxyfcgi
index f8c2618af779ebf5ed24886531a2ec76ec44b6ed..9a1c151fcc8d5a847360481af8611af62cfb9646 100644 (file)
--- a/modules/proxy/NWGNUproxyfcgi
+++ b/modules/proxy/NWGNUproxyfcgi
@@ -257,5 +257,3 @@ vpath %.c ../arch/netware
 #
 
 include $(APBUILD)/NWGNUtail.inc
-
-

diff --git a/modules/proxy/NWGNUproxyftp b/modules/proxy/NWGNUproxyftp
index 2da1217cba3e9dd11db1b77252a9b7ebba6ffffe..0ac02a2910179e870270dac195ece3ecdadd7bb7 100644 (file)
--- a/modules/proxy/NWGNUproxyftp
+++ b/modules/proxy/NWGNUproxyftp
@@ -256,5 +256,3 @@ vpath %.c ../arch/netware
 #
 
 include $(APBUILD)/NWGNUtail.inc
-
-

diff --git a/modules/proxy/NWGNUproxyhcheck b/modules/proxy/NWGNUproxyhcheck
index d20065013ff784e80a7818f4a11814d8876f459d..5e9a29a4aa03899fded2603e67df8590656e925e 100644 (file)
--- a/modules/proxy/NWGNUproxyhcheck
+++ b/modules/proxy/NWGNUproxyhcheck
@@ -148,12 +148,15 @@ XDCDATA           =
 #
 # If there is an NLM target, put it here
 #
-TARGET_nlm = $(OBJDIR)/$(NLM_NAME).nlm
+TARGET_nlm = \
+       $(OBJDIR)/proxyhcheck.nlm \
+       $(EOLIST)
 
 #
 # If there is an LIB target, put it here
 #
-TARGET_lib =
+TARGET_lib = \
+       $(EOLIST)
 
 #
 # These are the OBJ files needed to create the NLM target above.
@@ -176,8 +179,8 @@ FILES_nlm_libs = \
 # These will be added as a module command in the link.opt file.
 #
 FILES_nlm_modules = \
-       libc \
        aprlib \
+       libc \
        proxy \
        $(EOLIST)
 
@@ -200,10 +203,10 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @libc.imp \
        @aprlib.imp \
        @httpd.imp \
        @mod_proxy.imp \
+       @libc.imp \
        $(EOLIST)
 
 # Don't link with Winsock if standard sockets are being used

diff --git a/modules/proxy/NWGNUproxyhtp b/modules/proxy/NWGNUproxyhtp
index e385f35395f63bbeb9b6ba3913300d4f703514f3..927a19534759c3660ea70f46a2ad2d20a36873bf 100644 (file)
--- a/modules/proxy/NWGNUproxyhtp
+++ b/modules/proxy/NWGNUproxyhtp
@@ -256,5 +256,3 @@ vpath %.c ../arch/netware
 #
 
 include $(APBUILD)/NWGNUtail.inc
-
-

diff --git a/modules/proxy/NWGNUproxylbm_busy b/modules/proxy/NWGNUproxylbm_busy
index c0888ee92e73d3c37f3103f019556f31ea64555d..0168e50c805fb4af9e16b77c7dd51510a35e27a2 100644 (file)
--- a/modules/proxy/NWGNUproxylbm_busy
+++ b/modules/proxy/NWGNUproxylbm_busy
@@ -149,12 +149,15 @@ XDCDATA           =
 #
 # If there is an NLM target, put it here
 #
-TARGET_nlm = $(OBJDIR)/$(NLM_NAME).nlm
+TARGET_nlm = \
+       $(OBJDIR)/proxylbm_busy.nlm \
+       $(EOLIST)
 
 #
 # If there is an LIB target, put it here
 #
-TARGET_lib = 
+TARGET_lib = \
+       $(EOLIST)
 
 #
 # These are the OBJ files needed to create the NLM target above.
@@ -177,8 +180,8 @@ FILES_nlm_libs = \
 # These will be added as a module command in the link.opt file.
 #
 FILES_nlm_modules = \
-       libc \
        aprlib \
+       libc \
        proxy \
        $(EOLIST)
 
@@ -201,10 +204,10 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @libc.imp \
        @aprlib.imp \
        @httpd.imp \
        @mod_proxy.imp \
+       @libc.imp \
        $(EOLIST)
 
 #
@@ -240,11 +243,10 @@ install :: nlms FORCE
 #
 
 vpath %.c balancers
+
 #
 # Include the 'tail' makefile that has targets that depend on variables defined
 # in this makefile
 #
 
 include $(APBUILD)/NWGNUtail.inc
-
-

diff --git a/modules/proxy/NWGNUproxylbm_hb b/modules/proxy/NWGNUproxylbm_hb
index 172f2a997cb70cf12245c7d5ae54515616d020f7..0b1a633751a6b80743ca76b65c6155caa123d456 100644 (file)
--- a/modules/proxy/NWGNUproxylbm_hb
+++ b/modules/proxy/NWGNUproxylbm_hb
@@ -149,12 +149,15 @@ XDCDATA           =
 #
 # If there is an NLM target, put it here
 #
-TARGET_nlm = $(OBJDIR)/$(NLM_NAME).nlm
+TARGET_nlm = \
+       $(OBJDIR)/proxylbm_busy.nlm \
+       $(EOLIST)
 
 #
 # If there is an LIB target, put it here
 #
-TARGET_lib =
+TARGET_lib = \
+       $(EOLIST)
 
 #
 # These are the OBJ files needed to create the NLM target above.
@@ -177,8 +180,8 @@ FILES_nlm_libs = \
 # These will be added as a module command in the link.opt file.
 #
 FILES_nlm_modules = \
-       libc \
        aprlib \
+       libc \
        proxy \
        $(EOLIST)
 
@@ -201,10 +204,10 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @libc.imp \
        @aprlib.imp \
        @httpd.imp \
        @mod_proxy.imp \
+       @libc.imp \
        $(EOLIST)
 
 #
@@ -247,5 +250,3 @@ vpath %.c balancers
 #
 
 include $(APBUILD)/NWGNUtail.inc
-
-

diff --git a/modules/proxy/NWGNUproxylbm_req b/modules/proxy/NWGNUproxylbm_req
index 0f14c934cca8b6623ceace8cee4f132877679b30..3bd90127293e9f97d99f37bb7ddf36d53a3c9f09 100644 (file)
--- a/modules/proxy/NWGNUproxylbm_req
+++ b/modules/proxy/NWGNUproxylbm_req
@@ -149,12 +149,15 @@ XDCDATA           =
 #
 # If there is an NLM target, put it here
 #
-TARGET_nlm = $(OBJDIR)/$(NLM_NAME).nlm
+TARGET_nlm = \
+       $(OBJDIR)/proxylbm_busy.nlm \
+       $(EOLIST)
 
 #
 # If there is an LIB target, put it here
 #
-TARGET_lib =
+TARGET_lib = \
+       $(EOLIST)
 
 #
 # These are the OBJ files needed to create the NLM target above.
@@ -177,8 +180,8 @@ FILES_nlm_libs = \
 # These will be added as a module command in the link.opt file.
 #
 FILES_nlm_modules = \
-       libc \
        aprlib \
+       libc \
        proxy \
        $(EOLIST)
 
@@ -201,10 +204,10 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @libc.imp \
        @aprlib.imp \
        @httpd.imp \
        @mod_proxy.imp \
+       @libc.imp \
        $(EOLIST)
 
 #
@@ -247,5 +250,3 @@ vpath %.c balancers
 #
 
 include $(APBUILD)/NWGNUtail.inc
-
-

diff --git a/modules/proxy/NWGNUproxylbm_traf b/modules/proxy/NWGNUproxylbm_traf
index e328bda0e5669c783848a211a949ece128323f01..77ba507986a71759d18ea11533af944e855e1548 100644 (file)
--- a/modules/proxy/NWGNUproxylbm_traf
+++ b/modules/proxy/NWGNUproxylbm_traf
@@ -105,7 +105,7 @@ NLM_DESCRIPTION     = Apache $(VERSION_STR) Proxy LoadBalance by Traffic Sub-Module
 # This is used by the '-threadname' directive.  If left blank,
 # NLM_NAME Thread will be used.
 #
-NLM_THREAD_NAME        = LBM Traf Module
+NLM_THREAD_NAME        = LBM Traffic Module
 
 #
 # If this is specified, it will override VERSION value in
@@ -149,12 +149,15 @@ XDCDATA           =
 #
 # If there is an NLM target, put it here
 #
-TARGET_nlm = $(OBJDIR)/$(NLM_NAME).nlm
+TARGET_nlm = \
+       $(OBJDIR)/proxylbm_busy.nlm \
+       $(EOLIST)
 
 #
 # If there is an LIB target, put it here
 #
-TARGET_lib =
+TARGET_lib = \
+       $(EOLIST)
 
 #
 # These are the OBJ files needed to create the NLM target above.
@@ -177,8 +180,8 @@ FILES_nlm_libs = \
 # These will be added as a module command in the link.opt file.
 #
 FILES_nlm_modules = \
-       libc \
        aprlib \
+       libc \
        proxy \
        $(EOLIST)
 
@@ -201,10 +204,10 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @libc.imp \
        @aprlib.imp \
        @httpd.imp \
        @mod_proxy.imp \
+       @libc.imp \
        $(EOLIST)
 
 #
@@ -247,5 +250,3 @@ vpath %.c balancers
 #
 
 include $(APBUILD)/NWGNUtail.inc
-
-

diff --git a/modules/proxy/NWGNUproxyscgi b/modules/proxy/NWGNUproxyscgi
index 7eeaaaae64453b94454088d7f680ced1c3fd6269..e9e350e25744a71c2e9a4c92f1ea8fcc3224e81e 100644 (file)
--- a/modules/proxy/NWGNUproxyscgi
+++ b/modules/proxy/NWGNUproxyscgi
@@ -95,7 +95,7 @@ endif
 NLM_NAME       = proxyscgi
 
 #
-# 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 SCGI Sub-Module
@@ -107,7 +107,7 @@ NLM_DESCRIPTION     = Apache $(VERSION_STR) Proxy SCGI Sub-Module
 NLM_THREAD_NAME        = Proxy SCGI 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    =
@@ -139,11 +139,11 @@ NLM_CHECK_SYM     =
 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
@@ -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
 #
@@ -209,21 +209,21 @@ FILES_nlm_Ximports = \
        @mod_proxy.imp \
        @libc.imp \
        $(EOLIST)
- 
+
 # Don't link with Winsock if standard sockets are being used
 ifndef USE_STDSOCKETS
 FILES_nlm_Ximports += @ws2nlm.imp \
        $(EOLIST)
 endif
- 
-#   
+
+#
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
        proxy_scgi_module \
        $(EOLIST)
 
-#   
+#
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
@@ -239,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
@@ -256,5 +256,3 @@ vpath %.c ../arch/netware
 #
 
 include $(APBUILD)/NWGNUtail.inc
-
-

diff --git a/modules/proxy/NWGNUproxywstunnel b/modules/proxy/NWGNUproxywstunnel
index beac6e05b3ce8e14656272a9ee64fe85a9e6f27d..be74d3d9fe29371e515554fbb01341fd1cb2db74 100644 (file)
--- a/modules/proxy/NWGNUproxywstunnel
+++ b/modules/proxy/NWGNUproxywstunnel
@@ -149,12 +149,15 @@ XDCDATA           =
 #
 # If there is an NLM target, put it here
 #
-TARGET_nlm = $(OBJDIR)/$(NLM_NAME).nlm
+TARGET_nlm = \
+       $(OBJDIR)/proxywstunnel.nlm \
+       $(EOLIST)
 
 #
 # If there is an LIB target, put it here
 #
-TARGET_lib = 
+TARGET_lib = \
+       $(EOLIST)
 
 #
 # These are the OBJ files needed to create the NLM target above.
@@ -177,8 +180,8 @@ FILES_nlm_libs = \
 # These will be added as a module command in the link.opt file.
 #
 FILES_nlm_modules = \
-       libc \
        aprlib \
+       libc \
        proxy \
        $(EOLIST)
 
@@ -201,10 +204,10 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @libc.imp \
        @aprlib.imp \
        @httpd.imp \
        @mod_proxy.imp \
+       @libc.imp \
        $(EOLIST)
 
 #
@@ -246,5 +249,3 @@ vpath %.c balancers
 #
 
 include $(APBUILD)/NWGNUtail.inc
-
-

diff --git a/modules/proxy/NWGNUserf b/modules/proxy/NWGNUserf
index 57e4bcab73bfae4a240ca5a4a7c7a6f3267acdd5..d698f0c90d76d4ef9e6cc29579557b9147fb9279 100644 (file)
--- a/modules/proxy/NWGNUserf
+++ b/modules/proxy/NWGNUserf
@@ -345,5 +345,3 @@ vpath %.c $(V_PATH)
 #
 
 include $(APBUILD)/NWGNUtail.inc
-
-