apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject cvs commit: apr-util/xml Makefile.in
Date Fri, 04 Jan 2002 21:54:50 GMT
jerenkrantz    02/01/04 13:54:50

  Modified:    .        CHANGES Makefile.in configure.in
               buckets  Makefile.in
               crypto   Makefile.in
               dbm      Makefile.in
               dbm/sdbm Makefile.in
               encoding Makefile.in
               hooks    Makefile.in
               ldap     Makefile.in
               misc     Makefile.in
               test     Makefile.in
               uri      Makefile.in
               xml      Makefile.in
  Log:
  Fix up VPATH support so that it will survive config.status invocations.
  
  - Add srcdir, VPATH, and top_srcdir to all Makefile.in's
  - Remove configure.in hack to add srcdir and VPATH to all Makefiles
  - Rely on APR_INCLUDES for APR's path.  (Should switch to find_apr.m4 ASAP)
  - Make all INCLUDES paths relative to top_srcdir/top_builddir rather than
    relying on ../../../../  (way too confusing to maintain)
  
  Revision  Changes    Path
  1.46      +2 -0      apr-util/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apr-util/CHANGES,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- CHANGES	9 Dec 2001 20:19:43 -0000	1.45
  +++ CHANGES	4 Jan 2002 21:54:49 -0000	1.46
  @@ -1,5 +1,7 @@
   Changes with APR-util b1  
   
  +  *) Rework and fix VPATH-build support.  [Justin Erenkrantz]
  +
     *) Add support for Berkeley DB4.  [Justin Erenkrantz]
   
     *) Improve testdbm help.  [Justin Erenkrantz]
  
  
  
  1.56      +3 -0      apr-util/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/Makefile.in,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- Makefile.in	31 Dec 2001 07:34:05 -0000	1.55
  +++ Makefile.in	4 Jan 2002 21:54:49 -0000	1.56
  @@ -3,6 +3,9 @@
   #
   CPP = @CPP@
   
  +srcdir = @srcdir@
  +VPATH = @srcdir@
  +
   INCLUDES=-I./include -I$(srcdir)/include @APR_INCLUDES@
   
   TARGET_LIB = libaprutil.la
  
  
  
  1.41      +0 -20     apr-util/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr-util/configure.in,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- configure.in	31 Dec 2001 07:25:25 -0000	1.40
  +++ configure.in	4 Jan 2002 21:54:49 -0000	1.41
  @@ -122,23 +122,3 @@
       include/apu.h
       $MAKEFILES
   	])
  -
  -dnl #----------------------------- Fixup Makefiles for VPATH support
  - 
  -changequote({,})
  - 
  -if test -n "$USE_VPATH"; then
  -  for makefile in $MAKEFILES; do
  -    dir=`echo $makefile|sed 's%[^/][^/]*$%%'`
  -    (cat <<EOF
  -srcdir = $abs_srcdir/$dir
  -VPATH  = $abs_srcdir/$dir
  - 
  -EOF
  -)    |  cat - $makefile > tmp
  -    cp tmp $makefile
  -  done
  -  rm -f tmp
  -fi
  - 
  -changequote([,])
  
  
  
  1.13      +4 -1      apr-util/buckets/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/buckets/Makefile.in,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Makefile.in	13 Sep 2001 06:56:54 -0000	1.12
  +++ Makefile.in	4 Jan 2002 21:54:49 -0000	1.13
  @@ -1,6 +1,9 @@
  +srcdir = @srcdir@
  +VPATH = @srcdir@
   
   top_builddir=@top_builddir@
  -INCLUDES=-I$(top_builddir)/include -I$(top_builddir)/../apr/include -I$(srcdir)../../apr/include
-I$(srcdir)../include
  +top_srcdir=@abs_srcdir@
  +INCLUDES=-I$(top_builddir)/include -I$(top_srcdir)/include @APR_INCLUDES@
   
   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 \
  
  
  
  1.9       +4 -1      apr-util/crypto/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/crypto/Makefile.in,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Makefile.in	13 Sep 2001 06:56:54 -0000	1.8
  +++ Makefile.in	4 Jan 2002 21:54:49 -0000	1.9
  @@ -1,6 +1,9 @@
  +srcdir = @srcdir@
  +VPATH = @srcdir@
   
   top_builddir=@top_builddir@
  -INCLUDES=-I$(top_builddir)/include -I$(top_builddir)/../apr/include -I$(srcdir)../../apr/include
-I$(srcdir)../include
  +top_srcdir=@abs_srcdir@
  +INCLUDES=-I$(top_builddir)/include -I$(top_srcdir)/include @APR_INCLUDES@
   
   TARGETS = apr_sha1.lo apr_md4.lo
   
  
  
  
  1.9       +5 -1      apr-util/dbm/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/dbm/Makefile.in,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Makefile.in	28 Nov 2001 17:34:17 -0000	1.8
  +++ Makefile.in	4 Jan 2002 21:54:49 -0000	1.9
  @@ -1,5 +1,9 @@
  +srcdir = @srcdir@
  +VPATH = @srcdir@
  +
   top_builddir=@top_builddir@
  -INCLUDES=-I$(top_builddir)/include -I$(top_builddir)/include/private -I$(top_builddir)/../apr/include
-I$(srcdir)../../apr/include -I$(srcdir)../include -I$(srcdir)../include/private
  +top_srcdir=@abs_srcdir@
  +INCLUDES=-I$(top_builddir)/include -I$(top_builddir)/include/private -I$(top_srcdir)/include
-I$(top_srcdir)/include/private @APR_INCLUDES@
   
   TARGETS = apr_dbm.lo apr_dbm_berkeleydb.lo apr_dbm_gdbm.lo apr_dbm_sdbm.lo
   
  
  
  
  1.6       +4 -1      apr-util/dbm/sdbm/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/dbm/sdbm/Makefile.in,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Makefile.in	13 Sep 2001 06:56:54 -0000	1.5
  +++ Makefile.in	4 Jan 2002 21:54:49 -0000	1.6
  @@ -1,6 +1,9 @@
  +srcdir = @srcdir@
  +VPATH = @srcdir@
   
   top_builddir=@top_builddir@
  -INCLUDES=-I$(top_builddir)/include -I$(top_builddir)/../apr/include -I$(srcdir)../../../apr/include
-I$(srcdir)../../include
  +top_srcdir=@abs_srcdir@
  +INCLUDES=-I$(top_builddir)/include -I$(top_srcdir)/include @APR_INCLUDES@
   
   TARGETS = sdbm.lo sdbm_hash.lo sdbm_lock.lo sdbm_pair.lo
   
  
  
  
  1.9       +4 -1      apr-util/encoding/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/encoding/Makefile.in,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Makefile.in	13 Sep 2001 06:56:54 -0000	1.8
  +++ Makefile.in	4 Jan 2002 21:54:49 -0000	1.9
  @@ -1,6 +1,9 @@
  +srcdir = @srcdir@
  +VPATH = @srcdir@
   
   top_builddir=@top_builddir@
  -INCLUDES=-I$(top_builddir)/include -I$(top_builddir)/../apr/include -I$(srcdir)../../apr/include
-I$(srcdir)../include
  +top_srcdir=@abs_srcdir@
  +INCLUDES=-I$(top_builddir)/include -I$(top_srcdir)/include @APR_INCLUDES@
   
   TARGETS = apr_base64.lo
   
  
  
  
  1.8       +4 -1      apr-util/hooks/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/hooks/Makefile.in,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Makefile.in	13 Sep 2001 06:56:54 -0000	1.7
  +++ Makefile.in	4 Jan 2002 21:54:50 -0000	1.8
  @@ -1,6 +1,9 @@
  +srcdir = @srcdir@
  +VPATH = @srcdir@
   
   top_builddir=@top_builddir@
  -INCLUDES=-I$(top_builddir)/include -I$(top_builddir)/../apr/include -I$(srcdir)../../apr/include
-I$(srcdir)../include
  +top_srcdir=@abs_srcdir@
  +INCLUDES=-I$(top_builddir)/include -I$(top_srcdir)/include @APR_INCLUDES@
   
   TARGETS = apr_hooks.lo
   
  
  
  
  1.3       +4 -1      apr-util/ldap/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/ldap/Makefile.in,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Makefile.in	13 Sep 2001 06:56:55 -0000	1.2
  +++ Makefile.in	4 Jan 2002 21:54:50 -0000	1.3
  @@ -1,6 +1,9 @@
  +srcdir = @srcdir@
  +VPATH = @srcdir@
   
   top_builddir=@top_builddir@
  -INCLUDES=-I$(top_builddir)/include -I$(top_builddir)/../apr/include -I$(srcdir)../../apr/include
-I$(srcdir)../include
  +top_srcdir=@abs_srcdir@
  +INCLUDES=-I$(top_builddir)/include -I$(top_srcdir)/include @APR_INCLUDES@
   
   TARGETS = apr_ldap_compat.lo
   
  
  
  
  1.4       +5 -1      apr-util/misc/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/misc/Makefile.in,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Makefile.in	13 Sep 2001 06:56:55 -0000	1.3
  +++ Makefile.in	4 Jan 2002 21:54:50 -0000	1.4
  @@ -1,5 +1,9 @@
  +srcdir = @srcdir@
  +VPATH = @srcdir@
  +
   top_builddir=@top_builddir@
  -INCLUDES=-I$(top_builddir)/include -I$(top_builddir)/../apr/include -I$(srcdir)../../apr/include
-I$(srcdir)../include
  +top_srcdir=@abs_srcdir@
  +INCLUDES=-I$(top_builddir)/include -I$(top_srcdir)/include @APR_INCLUDES@
   
   TARGETS = apr_date.lo
   CLEAN_TARGETS = 
  
  
  
  1.17      +5 -1      apr-util/test/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/test/Makefile.in,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- Makefile.in	24 Aug 2001 03:18:54 -0000	1.16
  +++ Makefile.in	4 Jan 2002 21:54:50 -0000	1.17
  @@ -1,5 +1,9 @@
  +srcdir = @srcdir@
  +VPATH = @srcdir@
  +
   top_builddir=@top_builddir@
  -INCLUDES=-I$(top_builddir)/include -I$(top_builddir)/include/private -I@APR_SOURCE_DIR@/include
  +top_srcdir=@abs_srcdir@
  +INCLUDES=-I$(top_builddir)/include -I$(top_builddir)/include/private -I$(top_srcdir)/include
-I$(top_srcdir)/include @APR_INCLUDES@
   TARGETS =
   PROGRAMS = testdbm testdate testmd4 testxml
   
  
  
  
  1.13      +5 -1      apr-util/uri/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/uri/Makefile.in,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Makefile.in	28 Nov 2001 23:47:54 -0000	1.12
  +++ Makefile.in	4 Jan 2002 21:54:50 -0000	1.13
  @@ -1,5 +1,9 @@
  +srcdir = @srcdir@
  +VPATH = @srcdir@
  +
   top_builddir=@top_builddir@
  -INCLUDES=-I$(top_builddir)/include -I$(top_builddir)/include/private -I$(top_builddir)/../apr/include
-I$(srcdir)../../apr/include -I$(srcdir)../include -I$(srcdir)../include/private
  +top_srcdir=@abs_srcdir@
  +INCLUDES=-I$(top_builddir)/include -I$(top_builddir)/include/private -I$(top_srcdir)/include
-I$(top_srcdir)/include/private @APR_INCLUDES@
   
   TARGETS = $(top_builddir)/include/private/uri_delims.h apr_uri.lo
   CLEAN_TARGETS = gen_uri_delims $(top_builddir)/include/private/uri_delims.h
  
  
  
  1.9       +4 -1      apr-util/xml/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/xml/Makefile.in,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Makefile.in	13 Sep 2001 06:56:55 -0000	1.8
  +++ Makefile.in	4 Jan 2002 21:54:50 -0000	1.9
  @@ -1,6 +1,9 @@
  +srcdir = @srcdir@
  +VPATH = @srcdir@
   
   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 -I$(srcdir)../../apr/include -I$(srcdir)../include -I$(srcdir)../../include/private
-I$(srcdir)/lib
  +top_srcdir=@abs_srcdir@
  +INCLUDES=-I$(top_builddir)/include -I$(top_builddir)/include/private -I$(top_builddir)/xml/expat/lib
-I$(top_srcdir)/include -I$(top_srcdir)/include/private -I$(srcdir)/lib @APR_INCLUDES@
   
   TARGETS = apr_xml.lo
   
  
  
  

Mime
View raw message