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 9764c4a484f51061e9418694f4742001d0ca2e0d..7c2afa8cbf9b64a8d84af3d2e4ac926aeb80b784 100644 (file)
--- 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 ac8d8d96f17a58f20f8c07dfa2708f6b44d2335e..ecad709fac3c8917cd1bf7c7fafff4dc7506aa7f 100644 (file)
--- 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