From: Rainer Jung Date: Sat, 6 Feb 2016 11:01:18 +0000 (+0000) Subject: Reduce differences between Netware proxy makefiles. X-Git-Tag: 2.5.0-alpha~2188 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=086c723635970609b93735b195291b88241e8c5d;p=thirdparty%2Fapache%2Fhttpd.git 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 fb46490681a..cdb80d57f15 100644 --- 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 4f1be58e36d..34fc85a0804 100644 --- 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 522096870e7..62810de43ca 100644 --- 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 7cae388da9b..3e15e1f1ff6 100644 --- 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 f8c2618af77..9a1c151fcc8 100644 --- 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 2da1217cba3..0ac02a29101 100644 --- 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 d20065013ff..5e9a29a4aa0 100644 --- 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 e385f35395f..927a1953475 100644 --- 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 c0888ee92e7..0168e50c805 100644 --- 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 172f2a997cb..0b1a633751a 100644 --- 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 0f14c934cca..3bd90127293 100644 --- 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 e328bda0e56..77ba507986a 100644 --- 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 7eeaaaae644..e9e350e2574 100644 --- 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 beac6e05b3c..be74d3d9fe2 100644 --- 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 57e4bcab73b..d698f0c90d7 100644 --- a/modules/proxy/NWGNUserf +++ b/modules/proxy/NWGNUserf @@ -345,5 +345,3 @@ vpath %.c $(V_PATH) # include $(APBUILD)/NWGNUtail.inc - -