apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject cvs commit: apr-util/xml Makefile.in
Date Mon, 30 Jul 2001 04:32:42 GMT
rbb         01/07/29 21:32:42

  Modified:    .        buildconf.sh configure.in
               buckets  Makefile.in
               crypto   Makefile.in
               dbm      Makefile.in
               dbm/sdbm Makefile.in
               encoding Makefile.in
               hooks    Makefile.in
               misc     Makefile.in
               uri      Makefile.in
               xml      Makefile.in
  Removed:     build    Makefile.in PrintPath default.pl install-sh
                        rules.mk.in
  Log:
  Convert apr-util to use APR's build directory.  This greatly simplifies
  apr-util's build system, because it has basically been removed.
  
  Revision  Changes    Path
  1.10      +0 -24     apr-util/buildconf.sh
  
  Index: buildconf.sh
  ===================================================================
  RCS file: /home/cvs/apr-util/buildconf.sh,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- buildconf.sh	2001/07/08 05:30:41	1.9
  +++ buildconf.sh	2001/07/30 04:32:41	1.10
  @@ -1,30 +1,6 @@
   #!/bin/sh
   
   #
  -# Build aclocal.m4 from libtool's libtool.m4 and our own M4 files.
  -#
  -libtoolize=`build/PrintPath glibtoolize libtoolize`
  -if [ "x$libtoolize" = "x" ]; then
  -    echo "libtoolize not found in path"
  -    exit 1
  -fi
  -ltpath=`dirname $libtoolize`
  -ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
  -echo "Incorporating $ltfile into aclocal.m4 ..."
  -echo "dnl THIS FILE IS AUTOMATICALLY GENERATED BY buildconf.sh" > aclocal.m4
  -echo "dnl edits here will be lost" >> aclocal.m4
  -echo "dnl please edit build/apu-conf.m4" >> aclocal.m4
  -cat build/apu-conf.m4 $ltfile >> aclocal.m4
  -
  -#
  -# Create the libtool helper files
  -#
  -# Note: we always replace the files, and we copy (rather than link) them.
  -#
  -echo "Copying libtool helper files ..."
  -$libtoolize --force --copy
  -
  -#
   # Generate the autoconf header (include/apu_config.h) and ./configure
   #
   echo "Creating include/private/apu_config.h ..."
  
  
  
  1.27      +6 -4      apr-util/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr-util/configure.in,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- configure.in	2001/07/09 02:30:51	1.26
  +++ configure.in	2001/07/30 04:32:41	1.27
  @@ -3,11 +3,13 @@
   dnl
   
   AC_PREREQ(2.13)
  -AC_INIT(build/rules.mk.in)
  +AC_INIT(export_vars.sh.in)
   
   AC_CONFIG_HEADER(include/private/apu_config.h)
  -AC_CONFIG_AUX_DIR(build)
  +AC_CONFIG_AUX_DIR(../apr/build)
   
  +sinclude(build/apu_config.m4)
  +
   AC_PROG_CC
   AC_PROG_AWK
   AC_CHECK_PROG(RM, rm, rm)
  @@ -122,10 +124,10 @@
   dnl
   case "$host_alias" in
   *bsdi*)
  -    INCLUDE_RULES=".include \"$top_builddir/build/rules.mk\""
  +    INCLUDE_RULES=".include \"$top_builddir/../apr/build/rules.mk\""
       ;;
   *)
  -    INCLUDE_RULES="include $top_builddir/build/rules.mk"
  +    INCLUDE_RULES="include $top_builddir/../apr/build/rules.mk"
       ;;
   esac
   AC_SUBST(INCLUDE_RULES)
  
  
  
  1.11      +3 -0      apr-util/buckets/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/buckets/Makefile.in,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Makefile.in	2001/01/19 07:01:59	1.10
  +++ Makefile.in	2001/07/30 04:32:41	1.11
  @@ -1,4 +1,7 @@
   
  +top_builddir=@top_builddir@
  +INCLUDES=-I$(top_builddir)/include -I$(top_builddir)/../apr/include
  +
   TARGETS = apr_buckets_file.lo apr_buckets_pool.lo apr_buckets_flush.lo \
   apr_buckets_refcount.lo apr_buckets_heap.lo apr_buckets_simple.lo apr_buckets.lo \
   apr_buckets_mmap.lo apr_buckets_socket.lo apr_buckets_eos.lo apr_buckets_pipe.lo \
  
  
  
  1.7       +3 -0      apr-util/crypto/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/crypto/Makefile.in,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Makefile.in	2001/06/01 22:34:06	1.6
  +++ Makefile.in	2001/07/30 04:32:41	1.7
  @@ -1,4 +1,7 @@
   
  +top_builddir=@top_builddir@
  +INCLUDES=-I$(top_builddir)/include -I$(top_builddir)/../apr/include
  +
   TARGETS = apr_sha1.lo apr_md4.lo
   
   # bring in rules.mk for standard functionality
  
  
  
  1.5       +3 -0      apr-util/dbm/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/dbm/Makefile.in,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Makefile.in	2001/01/07 01:35:50	1.4
  +++ Makefile.in	2001/07/30 04:32:41	1.5
  @@ -1,3 +1,6 @@
  +top_builddir=@top_builddir@
  +INCLUDES=-I$(top_builddir)/include -I$(top_builddir)/include/private -I$(top_builddir)/../apr/include
  +
   TARGETS = apr_dbm.lo
   
   # bring in rules.mk for standard functionality
  
  
  
  1.4       +3 -0      apr-util/dbm/sdbm/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/dbm/sdbm/Makefile.in,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Makefile.in	2001/01/07 01:35:50	1.3
  +++ Makefile.in	2001/07/30 04:32:41	1.4
  @@ -1,4 +1,7 @@
   
  +top_builddir=@top_builddir@
  +INCLUDES=-I$(top_builddir)/include -I$(top_builddir)/../apr/include
  +
   TARGETS = sdbm.lo sdbm_hash.lo sdbm_lock.lo sdbm_pair.lo
   
   # bring in rules.mk for standard functionality
  
  
  
  1.7       +3 -0      apr-util/encoding/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/encoding/Makefile.in,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Makefile.in	2001/01/19 07:02:02	1.6
  +++ Makefile.in	2001/07/30 04:32:41	1.7
  @@ -1,4 +1,7 @@
   
  +top_builddir=@top_builddir@
  +INCLUDES=-I$(top_builddir)/include -I$(top_builddir)/../apr/include
  +
   TARGETS = apr_base64.lo
   
   # bring in rules.mk for standard functionality
  
  
  
  1.6       +3 -0      apr-util/hooks/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/hooks/Makefile.in,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Makefile.in	2001/01/19 07:02:02	1.5
  +++ Makefile.in	2001/07/30 04:32:42	1.6
  @@ -1,4 +1,7 @@
   
  +top_builddir=@top_builddir@
  +INCLUDES=-I$(top_builddir)/include -I$(top_builddir)/../apr/include
  +
   TARGETS = apr_hooks.lo
   
   # bring in rules.mk for standard functionality
  
  
  
  1.2       +3 -0      apr-util/misc/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/misc/Makefile.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.in	2001/05/31 04:54:06	1.1
  +++ Makefile.in	2001/07/30 04:32:42	1.2
  @@ -1,3 +1,6 @@
  +top_builddir=@top_builddir@
  +INCLUDES=-I$(top_builddir)/include -I$(top_builddir)/../apr/include
  +
   TARGETS = apr_date.lo
   CLEAN_TARGETS = 
   
  
  
  
  1.9       +3 -0      apr-util/uri/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/uri/Makefile.in,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Makefile.in	2001/07/13 03:51:26	1.8
  +++ Makefile.in	2001/07/30 04:32:42	1.9
  @@ -1,3 +1,6 @@
  +top_builddir=@top_builddir@
  +INCLUDES=-I$(top_builddir)/include -I$(top_builddir)/include/private -I$(top_builddir)/../apr/include
  +
   TARGETS = $(top_builddir)/include/private/uri_delims.h apr_uri.lo
   CLEAN_TARGETS = gen_uri_delims $(top_builddir)/include/private/uri_delims.h
   
  
  
  
  1.7       +3 -0      apr-util/xml/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/xml/Makefile.in,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Makefile.in	2001/03/09 14:37:23	1.6
  +++ Makefile.in	2001/07/30 04:32:42	1.7
  @@ -1,4 +1,7 @@
   
  +top_builddir=@top_builddir@
  +INCLUDES=-I$(top_builddir)/include -I$(top_builddir)/include/private -I$(top_builddir)/../apr/include
-I$(top_builddir)/xml/expat/lib
  +
   TARGETS = apr_xml.lo
   
   SUBDIRS = @APR_XML_SUBDIRS@
  
  
  

Mime
View raw message