Build symbol import and export files for

proxy on Netware using the same awk script
which is already used for mod_cache.

Adjust other Netware makefiles to use this
new imp file.

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

diff --git a/build/NWGNUmakefile b/build/NWGNUmakefile
index 1954257eb57984cf3f0f8926ece6628d4539a46b..8bc935abd94184669d7333852d3f6f59c1732a9d 100644 (file)
--- a/build/NWGNUmakefile
+++ b/build/NWGNUmakefile
@@ -23,7 +23,7 @@ FILES_prebuild_headers = \
        $(PCRE)/pcre.h \
        $(EOLIST) 
     
-nlms :: libs $(NWOS)/httpd.imp $(DAV)/main/dav.imp $(STDMOD)/cache/mod_cache.imp
+nlms :: libs $(NWOS)/httpd.imp $(DAV)/main/dav.imp $(STDMOD)/cache/mod_cache.imp $(STDMOD)/proxy/mod_proxy.imp
 
 libs :: chkapr $(NWOS)/chartables.c
 
@@ -35,6 +35,10 @@ $(STDMOD)/cache/mod_cache.imp: make_nw_export.awk $(STDMOD)/cache/mod_cache.h $(
        @echo $(DL)GEN  $@$(DL)
        $(AWK) -v EXPPREFIX=AP$(VERSION_MAJMIN) -f $^ >$@
 
+$(STDMOD)/proxy/mod_proxy.imp: make_nw_export.awk $(STDMOD)/proxy/mod_proxy.h $(STDMOD)/proxy/proxy_util.h
+       @echo $(DL)GEN  $@$(DL)
+       $(AWK) -v EXPPREFIX=AP$(VERSION_MAJMIN) -f $^ >$@
+
 $(NWOS)/httpd.imp : make_nw_export.awk nw_export.i
        @echo $(DL)GEN  $@$(DL)
        $(AWK) -v EXPPREFIX=AP$(VERSION_MAJMIN) -f $^ >$@
@@ -119,6 +123,7 @@ clean ::
        $(call DEL,$(PCRE)/config.h)
        $(call DEL,$(PCRE)/pcre.h)
        $(call DEL,$(STDMOD)/cache/mod_cache.imp)
+       $(call DEL,$(STDMOD)/proxy/mod_proxy.imp)
        $(call DEL,$(DAV)/main/dav.imp)
        $(call DEL,$(NWOS)/httpd.imp)
        $(call DEL,nw_export.i)

diff --git a/modules/proxy/NWGNUproxy b/modules/proxy/NWGNUproxy
index e91b37cc208c7e98c28c6e4f0bb81e39d1c8fd36..5238b2377217c5cd58505e2d26012e4a3d3c7377 100644 (file)
--- a/modules/proxy/NWGNUproxy
+++ b/modules/proxy/NWGNUproxy
@@ -221,7 +221,8 @@ endif
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
-       @$(OBJDIR)/mod_proxy.imp \
+       @mod_proxy.imp \
+       proxy_module \
        $(EOLIST)
 
 #
@@ -237,7 +238,7 @@ FILES_lib_objs = \
 
 libs :: $(OBJDIR) $(TARGET_lib)
 
-nlms :: libs $(OBJDIR)/mod_proxy.imp $(TARGET_nlm)
+nlms :: libs $(TARGET_nlm)
 
 #
 # Updated this target to create necessary directories and copy files to the
@@ -251,94 +252,6 @@ install :: nlms FORCE
 
 vpath %.c ../arch/netware
 
-$(OBJDIR)/mod_proxy.imp: NWGNUproxy
-       @echo $(DL)GEN  $@$(DL)
-       @echo $(DL)# Exports of mod_proxy$(DL)> $@
-       @echo $(DL) (AP$(VERSION_MAJMIN))$(DL)>> $@
-       @echo $(DL) proxy_module,$(DL)>> $@
-       @echo $(DL) proxy_hcmethods,$(DL)>> $@
-       @echo $(DL) proxy_hook_canon_handler,$(DL)>> $@
-       @echo $(DL) proxy_hook_create_req,$(DL)>> $@
-       @echo $(DL) proxy_hook_detach_backend,$(DL)>> $@
-       @echo $(DL) proxy_hook_fixups,$(DL)>> $@
-       @echo $(DL) proxy_hook_get_canon_handler,$(DL)>> $@
-       @echo $(DL) proxy_hook_get_create_req,$(DL)>> $@
-       @echo $(DL) proxy_hook_get_detach_backend,$(DL)>> $@
-       @echo $(DL) proxy_hook_get_fixups,$(DL)>> $@
-       @echo $(DL) proxy_hook_get_post_request,$(DL)>> $@
-       @echo $(DL) proxy_hook_get_pre_request,$(DL)>> $@
-       @echo $(DL) proxy_hook_get_request_status,$(DL)>> $@
-       @echo $(DL) proxy_hook_get_scheme_handler,$(DL)>> $@
-       @echo $(DL) proxy_hook_post_request,$(DL)>> $@
-       @echo $(DL) proxy_hook_pre_request,$(DL)>> $@
-       @echo $(DL) proxy_hook_request_status,$(DL)>> $@
-       @echo $(DL) proxy_hook_scheme_handler,$(DL)>> $@
-       @echo $(DL) proxy_run_canon_handler,$(DL)>> $@
-       @echo $(DL) proxy_run_create_req,$(DL)>> $@
-       @echo $(DL) proxy_run_detach_backend,$(DL)>> $@
-       @echo $(DL) proxy_run_fixups,$(DL)>> $@
-       @echo $(DL) proxy_run_post_request,$(DL)>> $@
-       @echo $(DL) proxy_run_pre_request,$(DL)>> $@
-       @echo $(DL) proxy_run_request_status,$(DL)>> $@
-       @echo $(DL) proxy_run_scheme_handler,$(DL)>> $@
-       @echo $(DL) ap_proxy_acquire_connection,$(DL)>> $@
-       @echo $(DL) ap_proxy_backend_broke,$(DL)>> $@
-       @echo $(DL) ap_proxy_buckets_lifetime_transform,$(DL)>> $@
-       @echo $(DL) ap_proxy_c2hex,$(DL)>> $@
-       @echo $(DL) ap_proxy_canon_netloc,$(DL)>> $@
-       @echo $(DL) ap_proxy_canonenc,$(DL)>> $@
-       @echo $(DL) ap_proxy_checkproxyblock,$(DL)>> $@
-       @echo $(DL) ap_proxy_conn_is_https,$(DL)>> $@
-       @echo $(DL) ap_proxy_connect_backend,$(DL)>> $@
-       @echo $(DL) ap_proxy_connect_to_backend,$(DL)>> $@
-       @echo $(DL) ap_proxy_connect_uds,$(DL)>> $@
-       @echo $(DL) ap_proxy_connection_create,$(DL)>> $@
-       @echo $(DL) ap_proxy_connection_reusable,$(DL)>> $@
-       @echo $(DL) ap_proxy_cookie_reverse_map,$(DL)>> $@
-       @echo $(DL) ap_proxy_create_hdrbrgd,$(DL)>> $@
-       @echo $(DL) ap_proxy_de_socketfy,$(DL)>> $@
-       @echo $(DL) ap_proxy_define_balancer,$(DL)>> $@
-       @echo $(DL) ap_proxy_define_match_worker,$(DL)>> $@
-       @echo $(DL) ap_proxy_define_worker,$(DL)>> $@
-       @echo $(DL) ap_proxy_determine_connection,$(DL)>> $@
-       @echo $(DL) ap_proxy_find_balancershm,$(DL)>> $@
-       @echo $(DL) ap_proxy_find_workershm,$(DL)>> $@
-       @echo $(DL) ap_proxy_get_balancer,$(DL)>> $@
-       @echo $(DL) ap_proxy_get_worker,$(DL)>> $@
-       @echo $(DL) ap_proxy_hashfunc,$(DL)>> $@
-       @echo $(DL) ap_proxy_hex2c,$(DL)>> $@
-       @echo $(DL) ap_proxy_initialize_balancer,$(DL)>> $@
-       @echo $(DL) ap_proxy_initialize_worker,$(DL)>> $@
-       @echo $(DL) ap_proxy_is_domainname,$(DL)>> $@
-       @echo $(DL) ap_proxy_is_hostname,$(DL)>> $@
-       @echo $(DL) ap_proxy_is_ipaddr,$(DL)>> $@
-       @echo $(DL) ap_proxy_is_socket_connected,$(DL)>> $@
-       @echo $(DL) ap_proxy_is_word,$(DL)>> $@
-       @echo $(DL) ap_proxy_location_reverse_map,$(DL)>> $@
-       @echo $(DL) ap_proxy_parse_wstatus,$(DL)>> $@
-       @echo $(DL) ap_proxy_pass_brigade,$(DL)>> $@
-       @echo $(DL) ap_proxy_port_of_scheme,$(DL)>> $@
-       @echo $(DL) ap_proxy_post_request,$(DL)>> $@
-       @echo $(DL) ap_proxy_pre_http_request,$(DL)>> $@
-       @echo $(DL) ap_proxy_pre_request,$(DL)>> $@
-       @echo $(DL) ap_proxy_release_connection,$(DL)>> $@
-       @echo $(DL) ap_proxy_set_wstatus,$(DL)>> $@
-       @echo $(DL) ap_proxy_share_balancer,$(DL)>> $@
-       @echo $(DL) ap_proxy_share_worker,$(DL)>> $@
-       @echo $(DL) ap_proxy_show_hcmethod,$(DL)>> $@
-       @echo $(DL) ap_proxy_ssl_connection_cleanup,$(DL)>> $@
-       @echo $(DL) ap_proxy_ssl_disable,$(DL)>> $@
-       @echo $(DL) ap_proxy_ssl_enable,$(DL)>> $@
-       @echo $(DL) ap_proxy_ssl_val,$(DL)>> $@
-       @echo $(DL) ap_proxy_strncpy,$(DL)>> $@
-       @echo $(DL) ap_proxy_sync_balancer,$(DL)>> $@
-       @echo $(DL) ap_proxy_trans_match,$(DL)>> $@
-       @echo $(DL) ap_proxy_transfer_between_connections,$(DL)>> $@
-       @echo $(DL) ap_proxy_update_balancer,$(DL)>> $@
-       @echo $(DL) ap_proxy_valid_balancer_name,$(DL)>> $@
-       @echo $(DL) ap_proxy_worker_name,$(DL)>> $@
-       @echo $(DL) ap_proxyerror$(DL)>> $@
-
 #
 # 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 9fc0ef22120a7d68bba8cff40977a6543b9d826a..fb46490681aeafbf338f1f812ba34e54cd9d3f6a 100644 (file)
--- a/modules/proxy/NWGNUproxyajp
+++ b/modules/proxy/NWGNUproxyajp
@@ -210,7 +210,7 @@ FILE_nlm_copyright =
 FILES_nlm_Ximports = \
        @aprlib.imp \
        @httpd.imp \
-       @$(OBJDIR)/mod_proxy.imp \
+       @mod_proxy.imp \
        @libc.imp \
        $(EOLIST)
  

diff --git a/modules/proxy/NWGNUproxybalancer b/modules/proxy/NWGNUproxybalancer
index 277dcbd490fefcf8bd94b58867e9e8808d490302..93cd196533dd5941abbef19605a46928037e42dc 100644 (file)
--- a/modules/proxy/NWGNUproxybalancer
+++ b/modules/proxy/NWGNUproxybalancer
@@ -206,7 +206,7 @@ FILE_nlm_copyright =
 FILES_nlm_Ximports = \
        @aprlib.imp \
        @httpd.imp \
-       @$(OBJDIR)/mod_proxy.imp \
+       @mod_proxy.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/proxy/NWGNUproxycon b/modules/proxy/NWGNUproxycon
index 614293181a34cc18f8218af5e305d1caeb4816a1..522096870e7edb06208e8c0079b94e86940a6676 100644 (file)
--- a/modules/proxy/NWGNUproxycon
+++ b/modules/proxy/NWGNUproxycon
@@ -205,7 +205,7 @@ FILE_nlm_copyright =
 FILES_nlm_Ximports = \
        @aprlib.imp \
        @httpd.imp \
-       @$(OBJDIR)/mod_proxy.imp \
+       @mod_proxy.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/proxy/NWGNUproxyexpress b/modules/proxy/NWGNUproxyexpress
index 1c34133a8b5cb3fb765cacfa3c326707506c3e0d..f2dbc599345c16aa56e1bfae1ae9da060e40d0d0 100644 (file)
--- a/modules/proxy/NWGNUproxyexpress
+++ b/modules/proxy/NWGNUproxyexpress
@@ -203,7 +203,7 @@ FILES_nlm_Ximports = \
        @libc.imp \
        @aprlib.imp \
        @httpd.imp \
-       @$(OBJDIR)/mod_proxy.imp \
+       @mod_proxy.imp \
        $(EOLIST)
 
 # Don't link with Winsock if standard sockets are being used

diff --git a/modules/proxy/NWGNUproxyfcgi b/modules/proxy/NWGNUproxyfcgi
index a3ecf4cb8599348b4c9213a8846a8311db1201da..f8c2618af779ebf5ed24886531a2ec76ec44b6ed 100644 (file)
--- a/modules/proxy/NWGNUproxyfcgi
+++ b/modules/proxy/NWGNUproxyfcgi
@@ -207,7 +207,7 @@ FILE_nlm_copyright =
 FILES_nlm_Ximports = \
        @aprlib.imp \
        @httpd.imp \
-       @$(OBJDIR)/mod_proxy.imp \
+       @mod_proxy.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/proxy/NWGNUproxyftp b/modules/proxy/NWGNUproxyftp
index 27fee00a69d30ece4c1bd6a375d7c89a54c5f210..2da1217cba3e9dd11db1b77252a9b7ebba6ffffe 100644 (file)
--- a/modules/proxy/NWGNUproxyftp
+++ b/modules/proxy/NWGNUproxyftp
@@ -206,7 +206,7 @@ FILE_nlm_copyright =
 FILES_nlm_Ximports = \
        @aprlib.imp \
        @httpd.imp \
-       @$(OBJDIR)/mod_proxy.imp \
+       @mod_proxy.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/proxy/NWGNUproxyhtp b/modules/proxy/NWGNUproxyhtp
index 5c4f8932b3faf0b859d7ceb757e9e73c1a861252..e385f35395f63bbeb9b6ba3913300d4f703514f3 100644 (file)
--- a/modules/proxy/NWGNUproxyhtp
+++ b/modules/proxy/NWGNUproxyhtp
@@ -206,7 +206,7 @@ FILE_nlm_copyright =
 FILES_nlm_Ximports = \
        @aprlib.imp \
        @httpd.imp \
-       @$(OBJDIR)/mod_proxy.imp \
+       @mod_proxy.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/proxy/NWGNUproxylbm_busy b/modules/proxy/NWGNUproxylbm_busy
index fff1db75617560a6522943aa8c2ba9e02cc922d0..c0888ee92e73d3c37f3103f019556f31ea64555d 100644 (file)
--- a/modules/proxy/NWGNUproxylbm_busy
+++ b/modules/proxy/NWGNUproxylbm_busy
@@ -204,7 +204,7 @@ FILES_nlm_Ximports = \
        @libc.imp \
        @aprlib.imp \
        @httpd.imp \
-       @$(OBJDIR)/mod_proxy.imp \
+       @mod_proxy.imp \
        $(EOLIST)
 
 #

diff --git a/modules/proxy/NWGNUproxylbm_hb b/modules/proxy/NWGNUproxylbm_hb
index 35a7348a2c3e30cdcab57b75e196b4dfd91853ae..172f2a997cb70cf12245c7d5ae54515616d020f7 100644 (file)
--- a/modules/proxy/NWGNUproxylbm_hb
+++ b/modules/proxy/NWGNUproxylbm_hb
@@ -204,7 +204,7 @@ FILES_nlm_Ximports = \
        @libc.imp \
        @aprlib.imp \
        @httpd.imp \
-       @$(OBJDIR)/mod_proxy.imp \
+       @mod_proxy.imp \
        $(EOLIST)
 
 #

diff --git a/modules/proxy/NWGNUproxylbm_req b/modules/proxy/NWGNUproxylbm_req
index 5d41f78a1a9d5c3b87384bb5840fd5708b24afe2..0f14c934cca8b6623ceace8cee4f132877679b30 100644 (file)
--- a/modules/proxy/NWGNUproxylbm_req
+++ b/modules/proxy/NWGNUproxylbm_req
@@ -204,7 +204,7 @@ FILES_nlm_Ximports = \
        @libc.imp \
        @aprlib.imp \
        @httpd.imp \
-       @$(OBJDIR)/mod_proxy.imp \
+       @mod_proxy.imp \
        $(EOLIST)
 
 #

diff --git a/modules/proxy/NWGNUproxylbm_traf b/modules/proxy/NWGNUproxylbm_traf
index 61b14c096056f9a9d314fce59dd1b2d08e7c1a05..e328bda0e5669c783848a211a949ece128323f01 100644 (file)
--- a/modules/proxy/NWGNUproxylbm_traf
+++ b/modules/proxy/NWGNUproxylbm_traf
@@ -204,7 +204,7 @@ FILES_nlm_Ximports = \
        @libc.imp \
        @aprlib.imp \
        @httpd.imp \
-       @$(OBJDIR)/mod_proxy.imp \
+       @mod_proxy.imp \
        $(EOLIST)
 
 #

diff --git a/modules/proxy/NWGNUproxyscgi b/modules/proxy/NWGNUproxyscgi
index 2445fd3f20ef181e50ba7055153c81c3f2a43521..7eeaaaae64453b94454088d7f680ced1c3fd6269 100644 (file)
--- a/modules/proxy/NWGNUproxyscgi
+++ b/modules/proxy/NWGNUproxyscgi
@@ -206,7 +206,7 @@ FILE_nlm_copyright =
 FILES_nlm_Ximports = \
        @aprlib.imp \
        @httpd.imp \
-       @$(OBJDIR)/mod_proxy.imp \
+       @mod_proxy.imp \
        @libc.imp \
        $(EOLIST)
  

diff --git a/modules/proxy/NWGNUproxywstunnel b/modules/proxy/NWGNUproxywstunnel
index ce84ce4566248993b29eb7b38c57520047c3ee1d..235f29470d0d4702692748d75e0d50398fd27bf7 100644 (file)
--- a/modules/proxy/NWGNUproxywstunnel
+++ b/modules/proxy/NWGNUproxywstunnel
@@ -204,7 +204,7 @@ FILES_nlm_Ximports = \
        @libc.imp \
        @aprlib.imp \
        @httpd.imp \
-       @$(OBJDIR)/mod_proxy.imp \
+       @mod_proxy.imp \
        $(EOLIST)
 
 #