From: Bradley Nicholes <bnicholes@apache.org>
Date: Fri, 2 Nov 2001 17:56:14 +0000 (+0000)
Subject: Consolidated the APR imports to a single import file
X-Git-Tag: 2.0.28~58
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=60d882ff595c4c6658dd699b0abd66bfb6559c5a;p=apache

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 655c3da3ea..af73caed03 100644
--- 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 bdc45658c1..4fc0346f84 100755
--- 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