Commit 5cfe43c2 authored by Guenter Knauf's avatar Guenter Knauf
Browse files

Reverted r1194896. 


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

build/NWGNUmakefile

+1 −6
Original line number Diff line number Diff line
@@ -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)

build/make_nw_export.awk

+2 −2
Original line number Diff line number Diff line
@@ -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)