From: Brian Havard <bjh@apache.org>
Date: Sat, 16 Jun 2001 04:00:50 +0000 (+0000)
Subject: OS/2: Automate export of global variables from core.
X-Git-Tag: 2.0.19~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=041c1cc9ae927f5bb9ae9fbc738e16a3359b2dca;p=thirdparty%2Fapache%2Fhttpd.git

OS/2: Automate export of global variables from core.


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

diff --git a/os/os2/core_header.def b/os/os2/core_header.def
index 9764c4a484f..7c2afa8cbf9 100644
--- a/os/os2/core_header.def
+++ b/os/os2/core_header.def
@@ -1,21 +1,8 @@
 LIBRARY httpd INITINSTANCE
 DESCRIPTION "Apache Server Core"
+
 EXPORTS
   "main"
-  "ap_my_generation"
-  "ap_restart_time"
-  "ap_extended_status"
-  "ap_scoreboard_image"
-  "ap_conftree"
-  "ap_server_root"
-  "ap_top_module"
-
-; Some globals from apr & apr-util
-  "apr_day_snames"
-  "apr_month_snames"
-  "apr_global_hook_pool"
-  "apr_debug_module_hooks"
-  "apr_current_hooking_module"
 
 ; One for mod_dav from socket library
   "_swaps"
@@ -26,4 +13,3 @@ EXPORTS
   "_swapl"
   "h_errno"
   "inet_ntoa"
-
diff --git a/server/Makefile.in b/server/Makefile.in
index ac8d8d96f17..ecad709fac3 100644
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -66,9 +66,10 @@ export_vars.h:
 exports.lo: exports.c
 
 # Rule to make def file for OS/2 core dll
-ApacheCoreOS2.def: exports.c $(top_srcdir)/os/$(OS_DIR)/core_header.def
+ApacheCoreOS2.def: exports.c export_vars.h $(top_srcdir)/os/$(OS_DIR)/core_header.def
 	cat $(top_srcdir)/os/$(OS_DIR)/core_header.def > $@
 	$(CPP) $< $(ALL_CPPFLAGS) $(ALL_INCLUDES) | grep "ap_hack_" | sed -e 's/^.*[)]\(.*\);$$/  "\1"/' >> $@
+	$(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) export_vars.h | grep "^[a-z]" | sed -e 's/^\(.*\)$$/  "\1"/' >> $@
 
 # Rule to make exp file for AIX DSOs
 httpd.exp: exports.c export_vars.h