From 5d67263c06a48e73cac73d56034e87f7b52956b6 Mon Sep 17 00:00:00 2001 From: Guenter Knauf Date: Tue, 15 Sep 2009 16:55:03 +0000 Subject: [PATCH] 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 --- modules/proxy/NWGNUproxy | 27 ++++++++++++++++----------- modules/proxy/NWGNUproxyajp | 9 +-------- modules/proxy/NWGNUproxybalancer | 10 +--------- modules/proxy/NWGNUproxycon | 4 +--- modules/proxy/NWGNUproxyfcgi | 7 +------ modules/proxy/NWGNUproxyftp | 6 +----- modules/proxy/NWGNUproxyhtp | 7 +------ 7 files changed, 22 insertions(+), 48 deletions(-) diff --git a/modules/proxy/NWGNUproxy b/modules/proxy/NWGNUproxy index cf625547b5..72f0c746fc 100644 --- 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 0de56cdb75..506de20aca 100644 --- 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 bc998af92d..52824cfd8b 100644 --- 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 8afb75b7c9..45d8b4b472 100644 --- 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 f7d760e370..74b19b63a7 100644 --- a/modules/proxy/NWGNUproxyfcgi +++ b/modules/proxy/NWGNUproxyfcgi @@ -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 diff --git a/modules/proxy/NWGNUproxyftp b/modules/proxy/NWGNUproxyftp index 7d799da46b..aee359d483 100644 --- 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 f5eed36bbb..f7b0e21167 100644 --- 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 -- 2.40.0