Fixed NetWare build for proxy modules.

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

diff --git a/modules/proxy/NWGNUproxy b/modules/proxy/NWGNUproxy
index 8b95ada8ed0011371063433cd4056a0a870215fb..0a66bba2683ad11258777ab87cd2acf7344b9d26 100644 (file)
--- a/modules/proxy/NWGNUproxy
+++ b/modules/proxy/NWGNUproxy
@@ -254,17 +254,74 @@ vpath %.c ../arch/netware
 $(OBJDIR)/mod_proxy.imp:
        @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_hook_canon_handler,$(DL)>> $@
-       @echo $(DL)  proxy_hook_post_request,$(DL)>> $@
-       @echo $(DL)  proxy_hook_pre_request,$(DL)>> $@
-       @echo $(DL)  proxy_hook_scheme_handler,$(DL)>> $@
-       @echo $(DL)  proxy_run_fixups,$(DL)>> $@
-       @echo $(DL)  ap_proxy_conn_is_https,$(DL)>> $@
-       @echo $(DL)  ap_proxy_ssl_enable,$(DL)>> $@
-       @echo $(DL)  ap_proxy_ssl_disable,$(DL)>> $@
-       @echo $(DL)  ap_proxy_ssl_val$(DL)>> $@
+       @echo $(DL) (AP$(VERSION_MAJMIN))$(DL)>> $@
+       @echo $(DL) proxy_module,$(DL)>> $@
+       @echo $(DL) proxy_hook_canon_handler,$(DL)>> $@
+       @echo $(DL) proxy_hook_get_canon_handler,$(DL)>> $@
+       @echo $(DL) proxy_hook_get_post_request,$(DL)>> $@
+       @echo $(DL) proxy_hook_get_pre_request,$(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_scheme_handler,$(DL)>> $@
+       @echo $(DL) proxy_run_canon_handler,$(DL)>> $@
+       @echo $(DL) proxy_run_create_req,$(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_connection_create,$(DL)>> $@
+       @echo $(DL) ap_proxy_cookie_reverse_map,$(DL)>> $@
+       @echo $(DL) ap_proxy_date_canon,$(DL)>> $@
+       @echo $(DL) ap_proxy_define_balancer,$(DL)>> $@
+       @echo $(DL) ap_proxy_define_worker,$(DL)>> $@
+       @echo $(DL) ap_proxy_determine_connection,$(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_hex2sec,$(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_word,$(DL)>> $@
+       @echo $(DL) ap_proxy_liststr,$(DL)>> $@
+       @echo $(DL) ap_proxy_location_reverse_map,$(DL)>> $@
+       @echo $(DL) ap_proxy_make_fake_req,$(DL)>> $@
+       @echo $(DL) ap_proxy_parse_wstatus,$(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_removestr,$(DL)>> $@
+       @echo $(DL) ap_proxy_retry_worker,$(DL)>> $@
+       @echo $(DL) ap_proxy_sec2hex,$(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_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_string_read,$(DL)>> $@
+       @echo $(DL) ap_proxy_sync_balancer,$(DL)>> $@
+       @echo $(DL) ap_proxy_table_unmerge,$(DL)>> $@
+       @echo $(DL) ap_proxy_trans_match,$(DL)>> $@
+       @echo $(DL) ap_proxy_valid_balancer_name,$(DL)>> $@
+       @echo $(DL) ap_proxyerror$(DL)>> $@
 
 #
 # Include the 'tail' makefile that has targets that depend on variables defined

diff --git a/modules/proxy/NWGNUproxyajp b/modules/proxy/NWGNUproxyajp
index 7256fdaaef342369ffb668ffbddf840008d86bdb..0f41248444e8b96973df035bfdfa6fba67638b64 100644 (file)
--- a/modules/proxy/NWGNUproxyajp
+++ b/modules/proxy/NWGNUproxyajp
@@ -164,7 +164,6 @@ TARGET_lib = \
 #
 FILES_nlm_objs = \
        $(OBJDIR)/mod_proxy_ajp.o \
-       $(OBJDIR)/proxy_util.o \
        $(OBJDIR)/ajp_header.o \
        $(OBJDIR)/ajp_msg.o \
        $(OBJDIR)/ajp_link.o \

diff --git a/modules/proxy/NWGNUproxybalancer b/modules/proxy/NWGNUproxybalancer
index 86013923d1f7e88b9abd53d44d58ca27f6a84a2c..976fd50c0f0847e29da04ef7ce4a7dc90fc4d766 100644 (file)
--- a/modules/proxy/NWGNUproxybalancer
+++ b/modules/proxy/NWGNUproxybalancer
@@ -164,7 +164,6 @@ TARGET_lib = \
 #
 FILES_nlm_objs = \
        $(OBJDIR)/mod_proxy_balancer.o \
-       $(OBJDIR)/proxy_util.o \
        $(OBJDIR)/libprews.o \
        $(EOLIST)
 

diff --git a/modules/proxy/NWGNUproxycon b/modules/proxy/NWGNUproxycon
index 994f4b56f73244ddcce0a68d964ea427380bd416..0215a499dc83f8613937ef35c09708229621e9d5 100644 (file)
--- a/modules/proxy/NWGNUproxycon
+++ b/modules/proxy/NWGNUproxycon
@@ -164,7 +164,6 @@ TARGET_lib = \
 #
 FILES_nlm_objs = \
        $(OBJDIR)/mod_proxy_connect.o \
-       $(OBJDIR)/proxy_util.o \
        $(EOLIST)
 
 #

diff --git a/modules/proxy/NWGNUproxyfcgi b/modules/proxy/NWGNUproxyfcgi
index 4545cb0f41b15806674c6bed59c4e35b97322cfe..a4412225cce2e769580e54489f4662e745b37dcb 100644 (file)
--- a/modules/proxy/NWGNUproxyfcgi
+++ b/modules/proxy/NWGNUproxyfcgi
@@ -165,7 +165,6 @@ TARGET_lib = \
 #
 FILES_nlm_objs = \
        $(OBJDIR)/mod_proxy_fcgi.o \
-       $(OBJDIR)/proxy_util.o \
        $(OBJDIR)/libprews.o \
        $(EOLIST)
 

diff --git a/modules/proxy/NWGNUproxyftp b/modules/proxy/NWGNUproxyftp
index 47db54d16f0e977b9fde88ebf1c64ace171401ed..ee7fbf89ec685e55a3ab617d8db13773ef4061c4 100644 (file)
--- a/modules/proxy/NWGNUproxyftp
+++ b/modules/proxy/NWGNUproxyftp
@@ -164,7 +164,6 @@ TARGET_lib = \
 #
 FILES_nlm_objs = \
        $(OBJDIR)/mod_proxy_ftp.o \
-       $(OBJDIR)/proxy_util.o \
        $(OBJDIR)/libprews.o \
        $(EOLIST)
 

diff --git a/modules/proxy/NWGNUproxyhtp b/modules/proxy/NWGNUproxyhtp
index 07aa4d8188f0b3a81a70c5fd14c8212656a02e48..0257d52a3f6c36d09a686a80ffdcb2d3f9e3bfc3 100644 (file)
--- a/modules/proxy/NWGNUproxyhtp
+++ b/modules/proxy/NWGNUproxyhtp
@@ -164,7 +164,6 @@ TARGET_lib = \
 #
 FILES_nlm_objs = \
        $(OBJDIR)/mod_proxy_http.o \
-       $(OBJDIR)/proxy_util.o \
        $(OBJDIR)/libprews.o \
        $(EOLIST)
 

diff --git a/modules/proxy/NWGNUproxyscgi b/modules/proxy/NWGNUproxyscgi
index b7abf9cfdade6ee441f5c833c80da74d049d63d3..9068c69e14769903991bda9618bc4de9efee3ad4 100644 (file)
--- a/modules/proxy/NWGNUproxyscgi
+++ b/modules/proxy/NWGNUproxyscgi
@@ -164,7 +164,6 @@ TARGET_lib = \
 #
 FILES_nlm_objs = \
        $(OBJDIR)/mod_proxy_scgi.o \
-       $(OBJDIR)/proxy_util.o \
        $(OBJDIR)/libprews.o \
        $(EOLIST)