changed build of proxy modules to use common mod_proxy.imp file.

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

diff --git a/modules/proxy/NWGNUproxy b/modules/proxy/NWGNUproxy
index cf625547b5503f200d106cdc6eb01b85ef629843..72f0c746fc3976f243dcb5cc5c4eb5e94018f0eb 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 0de56cdb7535796653cb94ebb93eecb943612f74..506de20aca8d9776ed72965de2f613e92cd69066 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 bc998af92dc8d7ca79615d4dfcd66e7ca4780fb5..52824cfd8bdf31b30118b22aa1527eb08f492c06 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 8afb75b7c9f651f817dd614687f31529b23bed8d..45d8b4b47265d74957bfa60eedb170bd728bbb5b 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/NWGNUproxyfcgi b/modules/proxy/NWGNUproxyfcgi
index f7d760e37007817995b984fc892387c62d816909..74b19b63a751d226dd61a41dda865ddd9d490b1d 100644 (file)
--- a/modules/proxy/NWGNUproxyfcgi
+++ b/modules/proxy/NWGNUproxyfcgi
@@ -209,13 +209,8 @@ FILE_nlm_copyright =
 FILES_nlm_Ximports = \\r
        @$(APR)/aprlib.imp \\r
        @$(NWOS)/httpd.imp \\r
+       @$(OBJDIR)/mod_proxy.imp \\r
        @libc.imp \\r
-       proxy_module \\r
-       proxy_hook_scheme_handler \\r
-       proxy_hook_canon_handler \\r
-       proxy_run_fixups \\r
-       ap_proxy_ssl_enable \\r
-       ap_proxy_ssl_disable \\r
        $(EOLIST)\r
 \r
 # Don't link with Winsock if standard sockets are being used\r

diff --git a/modules/proxy/NWGNUproxyftp b/modules/proxy/NWGNUproxyftp
index 7d799da46bc18317e9592caac257df4876b36e32..aee359d483bdcb6ee9c1d6a92729c67ade4fc662 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 f5eed36bbb61283355ab0c763d40d6491f98f406..f7b0e2116724ae2d1e7106a36d8f50545781a7b5 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