gstein      01/01/06 17:35:51

  Modified:    .        Makefile.in configure.in
               build    Makefile.in
               src      Makefile.in
               src/buckets Makefile.in
               src/crypto Makefile.in
               src/dbm  Makefile.in
               src/dbm/sdbm Makefile.in
               src/encoding Makefile.in
               src/hooks Makefile.in
               src/uri  Makefile.in
               src/xml  Makefile.in
               test     Makefile.in
  Log:
  Simplify the inclusion of rules.mk -- no need for top_builddir now that
  we're substituting the whole line.
  
  Revision  Changes    Path
  1.15      +1 -1      apr-util/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/Makefile.in,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -u -r1.14 -r1.15
  --- Makefile.in	2001/01/07 00:31:48	1.14
  +++ Makefile.in	2001/01/07 01:35:49	1.15
  @@ -7,7 +7,7 @@
   
   TARGETS = delete-lib $(TARGET_LIB) delete-exports $(TARGET_EXPORTS)
   
  -top_builddir = @top_builddir@
  +# bring in rules.mk for standard functionality
   @INCLUDE_RULES@
   
   SUBDIRS = src . build test
  
  
  
  1.9       +3 -2      apr-util/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr-util/configure.in,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -u -r1.8 -r1.9
  --- configure.in	2001/01/07 00:27:28	1.8
  +++ configure.in	2001/01/07 01:35:49	1.9
  @@ -21,6 +21,7 @@
   
   dnl
   dnl compute the top directory of the build
  +dnl note: this substitution is needed for LIBTOOL
   dnl
   top_builddir="`cd $srcdir ; pwd`"
   AC_SUBST(top_builddir)
  @@ -59,10 +60,10 @@
   dnl
   case "$host_alias" in
   *bsdi*)
  -    INCLUDE_RULES='.include "$(top_builddir)/build/rules.mk"'
  +    INCLUDE_RULES=".include \"$top_builddir/build/rules.mk\""
       ;;
   *)
  -    INCLUDE_RULES='include $(top_builddir)/build/rules.mk'
  +    INCLUDE_RULES="include $top_builddir/build/rules.mk"
       ;;
   esac
   AC_SUBST(INCLUDE_RULES)
  
  
  
  1.4       +1 -2      apr-util/build/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/build/Makefile.in,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -u -r1.3 -r1.4
  --- Makefile.in	2001/01/07 00:37:14	1.3
  +++ Makefile.in	2001/01/07 01:35:49	1.4
  @@ -1,5 +1,4 @@
  -
  -top_builddir = @top_builddir@
  +# bring in rules.mk for standard functionality
   @INCLUDE_RULES@
   
   DISTCLEAN_TARGETS = rules.mk
  
  
  
  1.3       +1 -2      apr-util/src/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/src/Makefile.in,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -u -r1.2 -r1.3
  --- Makefile.in	2001/01/04 20:07:37	1.2
  +++ Makefile.in	2001/01/07 01:35:49	1.3
  @@ -1,5 +1,4 @@
  -
  -top_builddir = @top_builddir@
  +# bring in rules.mk for standard functionality
   @INCLUDE_RULES@
   
   SUBDIRS = buckets crypto dbm encoding hooks uri xml
  
  
  
  1.8       +1 -1      apr-util/src/buckets/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/src/buckets/Makefile.in,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -u -r1.7 -r1.8
  --- Makefile.in	2001/01/04 20:07:40	1.7
  +++ Makefile.in	2001/01/07 01:35:49	1.8
  @@ -3,5 +3,5 @@
   ap_buckets_refcount.lo ap_buckets_heap.lo ap_buckets_simple.lo ap_buckets.lo \
   ap_buckets_mmap.lo ap_buckets_socket.lo ap_buckets_eos.lo ap_buckets_pipe.lo
   
  -top_builddir = @top_builddir@
  +# bring in rules.mk for standard functionality
   @INCLUDE_RULES@
  
  
  
  1.4       +1 -1      apr-util/src/crypto/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/src/crypto/Makefile.in,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -u -r1.3 -r1.4
  --- Makefile.in	2001/01/04 20:07:42	1.3
  +++ Makefile.in	2001/01/07 01:35:50	1.4
  @@ -1,5 +1,5 @@
   
   TARGETS = ap_sha1.lo
   
  -top_builddir = @top_builddir@
  +# bring in rules.mk for standard functionality
   @INCLUDE_RULES@
  
  
  
  1.4       +1 -1      apr-util/src/dbm/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/src/dbm/Makefile.in,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -u -r1.3 -r1.4
  --- Makefile.in	2001/01/04 20:07:44	1.3
  +++ Makefile.in	2001/01/07 01:35:50	1.4
  @@ -1,6 +1,6 @@
   TARGETS = apr_dbm.lo
   
  -top_builddir = @top_builddir@
  +# bring in rules.mk for standard functionality
   @INCLUDE_RULES@
   
   SUBDIRS = sdbm .
  
  
  
  1.3       +1 -1      apr-util/src/dbm/sdbm/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/src/dbm/sdbm/Makefile.in,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -u -r1.2 -r1.3
  --- Makefile.in	2001/01/04 20:07:45	1.2
  +++ Makefile.in	2001/01/07 01:35:50	1.3
  @@ -1,5 +1,5 @@
   
   TARGETS = sdbm.lo sdbm_hash.lo sdbm_lock.lo sdbm_pair.lo
   
  -top_builddir = @top_builddir@
  +# bring in rules.mk for standard functionality
   @INCLUDE_RULES@
  
  
  
  1.5       +1 -1      apr-util/src/encoding/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/src/encoding/Makefile.in,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -u -r1.4 -r1.5
  --- Makefile.in	2001/01/04 20:07:48	1.4
  +++ Makefile.in	2001/01/07 01:35:50	1.5
  @@ -1,5 +1,5 @@
   
   TARGETS = ap_base64.lo
   
  -top_builddir = @top_builddir@
  +# bring in rules.mk for standard functionality
   @INCLUDE_RULES@
  
  
  
  1.4       +1 -1      apr-util/src/hooks/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/src/hooks/Makefile.in,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -u -r1.3 -r1.4
  --- Makefile.in	2001/01/04 20:07:49	1.3
  +++ Makefile.in	2001/01/07 01:35:51	1.4
  @@ -1,5 +1,5 @@
   
   TARGETS = ap_hooks.lo
   
  -top_builddir = @top_builddir@
  +# bring in rules.mk for standard functionality
   @INCLUDE_RULES@
  
  
  
  1.3       +1 -2      apr-util/src/uri/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/src/uri/Makefile.in,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -u -r1.2 -r1.3
  --- Makefile.in	2001/01/04 20:07:51	1.2
  +++ Makefile.in	2001/01/07 01:35:51	1.3
  @@ -1,3 +1,2 @@
  -
  -top_builddir = @top_builddir@
  +# bring in rules.mk for standard functionality
   @INCLUDE_RULES@
  
  
  
  1.3       +1 -2      apr-util/src/xml/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/src/xml/Makefile.in,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -u -r1.2 -r1.3
  --- Makefile.in	2001/01/04 20:07:52	1.2
  +++ Makefile.in	2001/01/07 01:35:51	1.3
  @@ -1,3 +1,2 @@
  -
  -top_builddir = @top_builddir@
  +# bring in rules.mk for standard functionality
   @INCLUDE_RULES@
  
  
  
  1.7       +1 -1      apr-util/test/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/test/Makefile.in,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -u -r1.6 -r1.7
  --- Makefile.in	2001/01/06 21:46:35	1.6
  +++ Makefile.in	2001/01/07 01:35:51	1.7
  @@ -2,7 +2,7 @@
   PROGRAMS = testdbm
   DISTCLEAN_TARGETS = Makefile
   
  -top_builddir = @top_builddir@
  +# bring in rules.mk for standard functionality
   @INCLUDE_RULES@
   
   test: $(PROGRAMS)