Consolidated the APR imports to a single import file

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

diff --git a/build/make_nw_export.awk b/build/make_nw_export.awk
index 655c3da3ea98ceabfb3c2cfe536fd32b4000674a..af73caed03a58aaf9dfb2e76f4f63e6f20d3ae67 100644 (file)
--- a/build/make_nw_export.awk
+++ b/build/make_nw_export.awk
@@ -31,8 +31,8 @@ function add_symbol (sym_name) {
        }
 }
 
-/^[ \t]*AP[RU]?_DECLARE[^(]*[(][^)]*[)]([^ ]* )*[^(]+[(]/ {
-    sub("[ \t]*AP[RU]?_DECLARE[^(]*[(][^)]*[)][ \t]*", "")
+/^[ \t]*AP([RU]|_CORE)?_DECLARE[^(]*[(][^)]*[)]([^ ]* )*[^(]+[(]/ {
+    sub("[ \t]*AP([RU]|_CORE)?_DECLARE[^(]*[(][^)]*[)][ \t]*", "")
     sub("[(].*", "")
     sub("([^ ]* (^([ \t]*[(])))+", "")
 

diff --git a/build/prebuildNW.bat b/build/prebuildNW.bat
index bdc45658c14d408b71b92fce012df44c9ca70897..4fc0346f843bba1dd341ead8a2fc990f47137631 100755 (executable)
--- a/build/prebuildNW.bat
+++ b/build/prebuildNW.bat
@@ -21,5 +21,5 @@ copy ..\srclib\pcre\pcre.hw ..\srclib\pcre\pcre.h
 
 @echo Generating the import lists...
 awk -f ..\srclib\apr\build\make_nw_export.awk ..\srclib\apr\include\*.h |sort > ..\srclib\apr\aprlib.imp
-awk -f ..\srclib\apr\build\make_nw_export.awk ..\srclib\apr-util\include\*.h |sort > ..\srclib\apr\aprutil.imp
-awk -f make_nw_export.awk ..\include\*.h |sort > ..\os\netware\httpd.imp
+awk -f ..\srclib\apr\build\make_nw_export.awk ..\srclib\apr-util\include\*.h |sort >> ..\srclib\apr\aprlib.imp
+awk -f make_nw_export.awk ..\include\*.h ..\modules\http\*.h |sort > ..\os\netware\httpd.imp