diff options
Diffstat (limited to '')
| -rw-r--r-- | build/NWGNUenvironment.inc | 1 | ||||
| -rw-r--r-- | build/NWGNUmakefile | 7 | ||||
| -rw-r--r-- | build/make_nw_export.awk | 12 |
3 files changed, 14 insertions, 6 deletions
diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc index 728c427b16..2b0cc70ec2 100644 --- a/build/NWGNUenvironment.inc +++ b/build/NWGNUenvironment.inc @@ -357,6 +357,7 @@ APRUTIL = $(subst \,/,$(APU_WORK)) APBUILD = $(SRC)/build STDMOD = $(SRC)/modules HTTPD = $(SRC)/modules/http +DAV = $(SRC)/modules/dav NWOS = $(SRC)/os/netware SERVER = $(SRC)/server SUPMOD = $(SRC)/support diff --git a/build/NWGNUmakefile b/build/NWGNUmakefile index 30a1fd4e5c..8d730d6b29 100644 --- a/build/NWGNUmakefile +++ b/build/NWGNUmakefile @@ -22,10 +22,14 @@ FILES_prebuild_headers = \ $(PCRE)/pcre.h \ $(EOLIST) -nlms :: libs $(NWOS)/httpd.imp +nlms :: libs $(NWOS)/httpd.imp $(DAV)/main/dav.imp libs :: chkapr $(NWOS)/chartables.c +$(DAV)/main/dav.imp : make_nw_export.awk $(DAV)/main/mod_dav.h + @echo $(DL)GEN $@$(DL) + $(AWK) -v EXPPREFIX=AP$(VERSION_MAJMIN) -f $^ | $(SORT) >$@ + $(NWOS)/httpd.imp : make_nw_export.awk nw_export.i @echo $(DL)GEN $@$(DL) $(AWK) -v EXPPREFIX=AP$(VERSION_MAJMIN) -f $^ | $(SORT) >$@ @@ -104,6 +108,7 @@ install :: nlms FORCE clean :: $(call DEL,$(PCRE)/config.h) $(call DEL,$(PCRE)/pcre.h) + $(call DEL,$(DAV)/main/dav.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 628ea60ff1..9386c7b558 100644 --- a/build/make_nw_export.awk +++ b/build/make_nw_export.awk @@ -25,8 +25,8 @@ BEGIN { #/ap_some_name/{next} /ap_mpm_pod_/{next} -/^[ \t]*AP([RU]|_CORE)?_DECLARE[^(]*[(][^)]*[)]([^ ]* )*[^(]+[(]/ { - sub("[ \t]*AP([RU]|_CORE)?_DECLARE[^(]*[(][^)]*[)][ \t]*", "") +/^[ \t]*(AP|DAV)([RU]|_CORE)?_DECLARE[^(]*[(][^)]*[)]([^ ]* )*[^(]+[(]/ { + sub("[ \t]*(AP|DAV)([RU]|_CORE)?_DECLARE[^(]*[(][^)]*[)][ \t]*", "") sub("[(].*", "") sub("([^ ]* (^([ \t]*[(])))+", "") add_symbol($0) @@ -46,12 +46,14 @@ BEGIN { /^[ \t]*AP[RU]?_DECLARE_EXTERNAL_HOOK[^(]*[(][^)]*/ { split($0, args, ",") + prefix = args[1] + sub("^.*[(]", "", prefix) symbol = args[4] sub("^[ \t]+", "", symbol) sub("[ \t]+$", "", symbol) - add_symbol("ap_hook_" symbol) - add_symbol("ap_hook_get_" symbol) - add_symbol("ap_run_" symbol) + add_symbol(prefix "_hook_" symbol) + add_symbol(prefix "_hook_get_" symbol) + add_symbol(prefix "_run_" symbol) next } |