apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@locus.apache.org
Subject cvs commit: apr-util Makefile.in buildconf.sh
Date Tue, 05 Dec 2000 18:29:08 GMT
rbb         00/12/05 10:29:08

  Modified:    build    build2.mk buildexports.awk buildexports.sh
               .        Makefile.in buildconf.sh
  Log:
  Generate the apr-utils exports file using APR's buildexports scripts.
  This also modified Apache's buildconf to add those symbols to the
  exports.c file.
  
  Revision  Changes    Path
  1.22      +4 -4      httpd-2.0/build/build2.mk
  
  Index: build2.mk
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/build2.mk,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- build2.mk	2000/12/05 04:30:55	1.21
  +++ build2.mk	2000/12/05 18:29:06	1.22
  @@ -88,8 +88,8 @@
   	@echo rebuilding $@
   	@cat acinclude.m4 $(libtool_m4) > $@
   
  -export_lists:
  -	@build/buildexports.sh server/exports.c srclib/apr/apr.exports
  +export_lists: $(aprutil_configure) $(apr_configure)
  +	@build/buildexports.sh server/exports.c srclib/apr/apr.exports srclib/apr-util/aprutil.exports
   
   $(LT_TARGETS):
   	libtoolize $(AMFLAGS) --force
  @@ -118,9 +118,9 @@
   	@rm -f $@
   	(cd srclib/apr && autoheader)
   
  -$(aprutil_configure): srclib/apr-util/configure.in
  +$(aprutil_configure): srclib/apr-util/configure.in 
   	@echo rebuilding $@
  -	(cd srclib/apr-util && ./buildconf.sh)
  +	(cd srclib/apr-util && ./buildconf.sh ../apr)
   
   $(apr_configure): srclib/apr/aclocal.m4 srclib/apr/configure.in srclib/apr/apr_common.m4
srclib/apr/hints.m4
   	@echo rebuilding $@
  
  
  
  1.2       +1 -1      httpd-2.0/build/buildexports.awk
  
  Index: buildexports.awk
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/buildexports.awk,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- buildexports.awk	2000/12/05 14:36:31	1.1
  +++ buildexports.awk	2000/12/05 18:29:06	1.2
  @@ -1,7 +1,7 @@
   {
       if ($1 ~ /^APR_/)
           print "#if", $1;
  -    if ($1 ~ /^apr_/)
  +    if ($1 ~ /^apr?_/)
           print "const void *ap_hack_" $1 " = (const void *)" $1 ";";
       if ($1 ~ /^\/APR_/)
           print "#endif /*", substr($1,2), "*/";
  
  
  
  1.8       +16 -8     httpd-2.0/build/buildexports.sh
  
  Index: buildexports.sh
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/buildexports.sh,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- buildexports.sh	2000/12/05 14:36:31	1.7
  +++ buildexports.sh	2000/12/05 18:29:06	1.8
  @@ -1,23 +1,31 @@
   #! /bin/sh
   
  -exec >$1
  -exec <$2
  +outfile=$1
  +exec >$outfile
  +shift
   
   echo "/* This is an ugly hack that needs to be here, so that libtool will"
   echo " * link all of the APR functions into server regardless of whether"
   echo " * the base server uses them."
   echo " */"
   echo ""
  - 
  -cd srclib/apr/include 
  -for file in *.h
  +
  +for dir in srclib/apr/include srclib/apr-util/include
   do
  -    echo "#include \"$file\""
  +    cd $dir
  +    for file in *.h
  +    do
  +        echo "#include \"$file\""
  +    done
  +    cd ../../../
   done
  -cd ../../../
   echo ""
   
  -awk -f build/buildexports.awk
  +for file
  +do
  +    exec <$file
  +    awk -f build/buildexports.awk
  +done
   
   echo ""
   echo "void *ap_ugly_hack;"
  
  
  
  1.2       +1 -1      apr-util/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/Makefile.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.in	2000/12/02 16:13:46	1.1
  +++ Makefile.in	2000/12/05 18:29:06	1.2
  @@ -9,7 +9,7 @@
   
   SUBDIRS = src . test build
   DISTCLEAN_TARGETS = config.cache config.log config.status config.sub \
  -	include/apu_config.h
  +	include/apu_config.h aprutils.exports configure
   EXTRACLEAN_TARGETS = configure libtool aclocal.m4 include/apu_config.h.in
   
   ### fix this up at some point (install location)
  
  
  
  1.2       +5 -0      apr-util/buildconf.sh
  
  Index: buildconf.sh
  ===================================================================
  RCS file: /home/cvs/apr-util/buildconf.sh,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- buildconf.sh	2000/12/02 16:13:46	1.1
  +++ buildconf.sh	2000/12/05 18:29:07	1.2
  @@ -30,3 +30,8 @@
   echo "Creating configure ..."
   ### do some work to toss config.cache?
   autoconf
  +
  +if [ ! -z $1 ]; then
  +    echo "Creating list of exported symbols in aprutil.exports ..."
  +    perl $1/helpers/make_export.pl -o ./aprutil.exports include/*.h
  +fi
  
  
  

Mime
View raw message