Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm
Precedence: bulk
Reply-To: new-httpd@apache.org
Date: 16 Jun 2001 04:00:51 -0000
Message-ID: <20010616040051.40685.qmail@apache.org>
From: bjh@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/server Makefile.in

bjh         01/06/15 21:00:51

  Modified:    os/os2   core_header.def
               server   Makefile.in
  Log:
  OS/2: Automate export of global variables from core.
  
  Revision  Changes    Path
  1.4       +1 -15     httpd-2.0/os/os2/core_header.def
  
  Index: core_header.def
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/os/os2/core_header.def,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- core_header.def	2001/04/23 14:35:50	1.3
  +++ core_header.def	2001/06/16 04:00:50	1.4
  @@ -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 @@
     "_swapl"
     "h_errno"
     "inet_ntoa"
  -
  
  
  
  1.59      +2 -1      httpd-2.0/server/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/Makefile.in,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -u -r1.58 -r1.59
  --- Makefile.in	2001/06/11 23:43:22	1.58
  +++ Makefile.in	2001/06/16 04:00:50	1.59
  @@ -66,9 +66,10 @@
   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