From: Guenter Knauf <fuankg@apache.org>
Date: Sat, 29 Oct 2011 22:03:00 +0000 (+0000)
Subject: Reverted r1194896.
X-Git-Tag: 2.3.15~64
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8a7658df96f81978bc85e2c4c1c485041c24c926;p=apache

Reverted r1194896.


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

diff --git a/build/NWGNUmakefile b/build/NWGNUmakefile
index 684c7302f9..8e588aeae7 100644
--- 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 $(PROXY)/proxy.imp
+nlms :: libs $(NWOS)/httpd.imp $(DAV)/main/dav.imp
 
 libs :: chkapr $(NWOS)/chartables.c
 
@@ -31,10 +31,6 @@ $(DAV)/main/dav.imp : make_nw_export.awk $(DAV)/main/mod_dav.h
 	@echo $(DL)GEN  $@$(DL)
 	$(AWK) -v EXPPREFIX=AP$(VERSION_MAJMIN) -f $^ >$@
 
-$(PROXY)/proxy.imp : make_nw_export.awk $(PROXY)/mod_proxy.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,7 +115,6 @@ clean ::
 	$(call DEL,$(PCRE)/config.h)
 	$(call DEL,$(PCRE)/pcre.h)
 	$(call DEL,$(DAV)/main/dav.imp)
-	$(call DEL,$(PROXY)/proxy.imp)
 	$(call DEL,$(NWOS)/httpd.imp)
 	$(call DEL,nw_export.i)
 	$(call DEL,cc.opt)
diff --git a/build/make_nw_export.awk b/build/make_nw_export.awk
index 4c88c8bb67..52f43e531c 100644
--- a/build/make_nw_export.awk
+++ b/build/make_nw_export.awk
@@ -29,8 +29,8 @@ function add_symbol(sym_name) {
 #/ap_some_name/{next}
 /ap_mpm_pod_/{next}
 
-/^[ \t]*(AP|DAV|PROXY)([RU]|_CORE)?_DECLARE[^(]*[(][^)]*[)]([^ ]* )*[^(]+[(]/ {
-    sub("[ \t]*(AP|DAV|PROXY)([RU]|_CORE)?_DECLARE[^(]*[(][^)]*[)][ \t]*", "")
+/^[ \t]*(AP|DAV)([RU]|_CORE)?_DECLARE[^(]*[(][^)]*[)]([^ ]* )*[^(]+[(]/ {
+    sub("[ \t]*(AP|DAV)([RU]|_CORE)?_DECLARE[^(]*[(][^)]*[)][ \t]*", "")
     sub("[(].*", "")
     sub("([^ ]* (^([ \t]*[(])))+", "")
     add_symbol($0)