changed build of proxy modules to use common mod_proxy.imp file (backport r815392).

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

diff --git a/modules/proxy/NWGNUproxy b/modules/proxy/NWGNUproxy
index eede5a5c69d03596f7d9de5c9a46da0a2e18c428..4d3beee40fa0af6ca847358e1dfd2c1ac6dc2928 100644 (file)
--- a/modules/proxy/NWGNUproxy
+++ b/modules/proxy/NWGNUproxy
@@ -223,16 +223,7 @@ endif
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
-       proxy_module \
-       proxy_hook_scheme_handler \
-       proxy_hook_canon_handler \
-       proxy_hook_pre_request \
-       proxy_hook_post_request \
-       ap_proxy_ssl_enable \
-       ap_proxy_ssl_disable \
-       ap_proxy_conn_is_https \
-       ap_proxy_ssl_val \
-       proxy_run_fixups \
+       @$(OBJDIR)/mod_proxy.imp \
        $(EOLIST)
 
 #   
@@ -248,7 +239,7 @@ FILES_lib_objs = \
 
 libs :: $(OBJDIR) $(TARGET_lib)
 
-nlms :: libs $(TARGET_nlm)
+nlms :: libs $(OBJDIR)/mod_proxy.imp $(TARGET_nlm)
 
 #
 # Updated this target to create necessary directories and copy files to the 
@@ -262,6 +253,20 @@ install :: nlms FORCE
 
 vpath %.c ../arch/netware
 
+$(OBJDIR)/mod_proxy.imp:
+       @echo Creating $@
+       @echo # Exports of mod_proxy > $@
+       @echo   proxy_module, >> $@
+       @echo   proxy_hook_canon_handler, >> $@
+       @echo   proxy_hook_post_request, >> $@
+       @echo   proxy_hook_pre_request, >> $@
+       @echo   proxy_hook_scheme_handler, >> $@
+       @echo   proxy_run_fixups, >> $@
+       @echo   ap_proxy_conn_is_https, >> $@
+       @echo   ap_proxy_ssl_enable, >> $@
+       @echo   ap_proxy_ssl_disable, >> $@
+       @echo   ap_proxy_ssl_val >> $@
+
 #
 # Include the 'tail' makefile that has targets that depend on variables defined
 # in this makefile

diff --git a/modules/proxy/NWGNUproxyajp b/modules/proxy/NWGNUproxyajp
index 77942ffc5f98669e5c8f6ed0e9cb449f7fb80df8..446549f81c041e0da9af5daa834ed6b1800faf03 100644 (file)
--- a/modules/proxy/NWGNUproxyajp
+++ b/modules/proxy/NWGNUproxyajp
@@ -213,15 +213,8 @@ FILE_nlm_copyright =
 FILES_nlm_Ximports = \
        @$(APR)/aprlib.imp \
        @$(NWOS)/httpd.imp \
+       @$(OBJDIR)/mod_proxy.imp \
        @libc.imp \
-       proxy_module \
-       proxy_hook_scheme_handler \
-       proxy_hook_canon_handler \
-       proxy_run_fixups \
-       ap_proxy_ssl_enable \
-       ap_proxy_ssl_disable \
-       ap_proxy_conn_is_https \
-       ap_proxy_ssl_val \
        $(EOLIST)
  
 # Don't link with Winsock if standard sockets are being used

diff --git a/modules/proxy/NWGNUproxybalancer b/modules/proxy/NWGNUproxybalancer
index c50c48f641e2b6bae3a4ff4dabef3bde6c479751..7dc04b8ea39f17459e838776c5dd0724c062b7b3 100644 (file)
--- a/modules/proxy/NWGNUproxybalancer
+++ b/modules/proxy/NWGNUproxybalancer
@@ -209,16 +209,8 @@ FILE_nlm_copyright =
 FILES_nlm_Ximports = \
        @$(APR)/aprlib.imp \
        @$(NWOS)/httpd.imp \
+       @$(OBJDIR)/mod_proxy.imp \
        @libc.imp \
-       proxy_module \
-       proxy_hook_scheme_handler \
-       proxy_hook_canon_handler \
-       proxy_hook_pre_request \
-       proxy_hook_post_request \
-       proxy_hook_load_lbmethods \
-       proxy_run_fixups \
-       ap_proxy_ssl_enable \
-       ap_proxy_ssl_disable \
        $(EOLIST)
  
 # Don't link with Winsock if standard sockets are being used

diff --git a/modules/proxy/NWGNUproxycon b/modules/proxy/NWGNUproxycon
index 6650197b41e3f4150dce7ca2993c4363e8d62c45..4ce871cf34230e8bb34f3c8bf719a71eb12f85f1 100644 (file)
--- a/modules/proxy/NWGNUproxycon
+++ b/modules/proxy/NWGNUproxycon
@@ -208,10 +208,8 @@ FILE_nlm_copyright =
 FILES_nlm_Ximports = \
        @$(APR)/aprlib.imp \
        @$(NWOS)/httpd.imp \
+       @$(OBJDIR)/mod_proxy.imp \
        @libc.imp \
-       proxy_module \
-       proxy_hook_scheme_handler \
-       proxy_hook_canon_handler \
        $(EOLIST)
  
 #   

diff --git a/modules/proxy/NWGNUproxyftp b/modules/proxy/NWGNUproxyftp
index 89fef5ac4a3757cac6348fe8cbf64aed74d1cf66..653d9d7b1e7d85d911683c278c6a1f1814ae8ba1 100644 (file)
--- a/modules/proxy/NWGNUproxyftp
+++ b/modules/proxy/NWGNUproxyftp
@@ -209,12 +209,8 @@ FILE_nlm_copyright =
 FILES_nlm_Ximports = \
        @$(APR)/aprlib.imp \
        @$(NWOS)/httpd.imp \
+       @$(OBJDIR)/mod_proxy.imp \
        @libc.imp \
-       proxy_module \
-       proxy_hook_scheme_handler \
-       proxy_hook_canon_handler \
-       ap_proxy_ssl_enable \
-       ap_proxy_ssl_disable \
        $(EOLIST)
  
 # Don't link with Winsock if standard sockets are being used

diff --git a/modules/proxy/NWGNUproxyhtp b/modules/proxy/NWGNUproxyhtp
index 5f5c2ada6c491c73362570be0628544ac233014f..21debea1cf91c8e6642a19d492efa50dae589cab 100644 (file)
--- a/modules/proxy/NWGNUproxyhtp
+++ b/modules/proxy/NWGNUproxyhtp
@@ -209,13 +209,8 @@ FILE_nlm_copyright =
 FILES_nlm_Ximports = \
        @$(APR)/aprlib.imp \
        @$(NWOS)/httpd.imp \
+       @$(OBJDIR)/mod_proxy.imp \
        @libc.imp \
-       proxy_module \
-       proxy_hook_scheme_handler \
-       proxy_hook_canon_handler \
-       proxy_run_fixups \
-       ap_proxy_ssl_enable \
-       ap_proxy_ssl_disable \
        $(EOLIST)
  
 # Don't link with Winsock if standard sockets are being used