diff options
| author | Guenter Knauf <fuankg@apache.org> | 2011-10-29 14:30:59 +0000 |
|---|---|---|
| committer | Guenter Knauf <fuankg@apache.org> | 2011-10-29 14:30:59 +0000 |
| commit | eef2cedfc8127b663d578d883b2140257b9bf6bb (patch) | |
| tree | da3b5db2ef6a3d3b9f0f7295546b02d2f32b65e9 /build | |
| parent | 2b26aee8d1561c6c570a4c83aeb684600d896c0a (diff) | |
| download | httpd-eef2cedfc8127b663d578d883b2140257b9bf6bb.tar.gz | |
Some NetWare build tweaks: generate proxy import list.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1194896 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build')
| -rw-r--r-- | build/NWGNUmakefile | 7 | ||||
| -rw-r--r-- | build/make_nw_export.awk | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/build/NWGNUmakefile b/build/NWGNUmakefile index 8e588aeae7..684c7302f9 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 +nlms :: libs $(NWOS)/httpd.imp $(DAV)/main/dav.imp $(PROXY)/proxy.imp libs :: chkapr $(NWOS)/chartables.c @@ -31,6 +31,10 @@ $(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 $^ >$@ @@ -115,6 +119,7 @@ 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 52f43e531c..4c88c8bb67 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)([RU]|_CORE)?_DECLARE[^(]*[(][^)]*[)]([^ ]* )*[^(]+[(]/ { - sub("[ \t]*(AP|DAV)([RU]|_CORE)?_DECLARE[^(]*[(][^)]*[)][ \t]*", "") +/^[ \t]*(AP|DAV|PROXY)([RU]|_CORE)?_DECLARE[^(]*[(][^)]*[)]([^ ]* )*[^(]+[(]/ { + sub("[ \t]*(AP|DAV|PROXY)([RU]|_CORE)?_DECLARE[^(]*[(][^)]*[)][ \t]*", "") sub("[(].*", "") sub("([^ ]* (^([ \t]*[(])))+", "") add_symbol($0) |