apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gst...@apache.org
Subject cvs commit: apr-util/xml Makefile.in
Date Wed, 06 Feb 2002 12:42:51 GMT
gstein      02/02/06 04:42:51

  Modified:    .        Makefile.in configure.in
               buckets  Makefile.in
               build    apu-conf.m4
               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:
  Switch APRUTIL over to use the APR_FIND_APR macro provided by APR.
  Also cleaned up the configuration (ues apr-config, avoid APRVARS,
  handle includes better, etc). Revamp all the Makefiles to simplify
  their INCLUDES handling and to toss the unused srcdir variable.
  
  * configure.in: use ../apr/build/find_apr.m4; this will eventually
      need to change to a copied find_apr, but there is more work for
      that to happen (we also have to get rules.mk from an installed
      APR, for instance). revamp all the includes stuff: the INCLUDES
      symbol was unused. define APRUTIL_INCLUDES for the public includes
      (will go into apu-config) and APRUTIL_PRIV_INCLUDES for our
      private stuff (only used in our build). don't worry about setting
      CFLAGS either. LIBS now uses APR_LIBS, but we probably don't want
      to set LIBS.
  
  * apu-conf.m4: remove custom --with-apr processing and use
      APR_FIND_APR (from find_apr.m4). tweak some of the
      fetching-of-flags from APR to use apr-config.
  
  * test/Makefile.in: don't refer to libapr.la explicitly. use APR_LIBS.
  
  * uri/Makefile.in: create uri_delims.h in BUILD/uri/ rather than our
      private include area. add the .c file as a dep of apr_uri.lo.
      ensure that the INCLUDES has an "-I." to pick up the delims.
  
  Revision  Changes    Path
  1.59      +1 -1      apr-util/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/Makefile.in,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -u -r1.58 -r1.59
  --- Makefile.in	18 Jan 2002 17:57:40 -0000	1.58
  +++ Makefile.in	6 Feb 2002 12:42:50 -0000	1.59
  @@ -6,7 +6,7 @@
   srcdir = @srcdir@
   VPATH = @srcdir@
   
  -INCLUDES=-I./include -I$(srcdir)/include @APR_INCLUDES@ @APRUTIL_INCLUDES@
  +INCLUDES = @APR_INCLUDES@ @APRUTIL_INCLUDES@ @APRUTIL_PRIV_INCLUDES@
   
   TARGET_LIB = libaprutil.la
   INSTALL_SUBDIRS = @APR_XML_DIR@
  
  
  
  1.45      +14 -12    apr-util/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr-util/configure.in,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- configure.in	19 Jan 2002 05:03:57 -0000	1.44
  +++ configure.in	6 Feb 2002 12:42:50 -0000	1.45
  @@ -10,6 +10,7 @@
   
   sinclude(build/apu-conf.m4)
   sinclude(../apr/build/apr_common.m4)
  +sinclude(../apr/build/find_apr.m4)
   
   dnl Generate ./config.nice for reproducing runs of configure
   dnl 
  @@ -37,11 +38,15 @@
   dnl
   dnl set up the compilation flags and stuff
   dnl
  -APR_ADDTO(INCLUDES, [-I\$(top_builddir)/include/private -I\$(top_builddir)/include])
   
  +APRUTIL_INCLUDES="-I$top_builddir/include"
  +APRUTIL_PRIV_INCLUDES="-I$top_builddir/include/private"
   if test -n "$USE_VPATH"; then
  -    APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/include])
  +    APRUTIL_PRIV_INCLUDES="$APRUTIL_PRIV_INCLUDES -I$abs_srcdir/include/private"
  +    APRUTIL_INCLUDES="$APRUTIL_INCLUDES -I$abs_srcdir/include"
   fi
  +AC_SUBST(APRUTIL_INCLUDES)
  +AC_SUBST(APRUTIL_PRIV_INCLUDES)
   
   dnl
   dnl 1. Find the APR includes directory and (possibly) the source (base) dir.
  @@ -53,10 +58,6 @@
   APU_CHECK_DBM
   APU_FIND_EXPAT
   
  -dnl Add in the INCLUDES from APR
  -APR_ADDTO(INCLUDES, [$APR_INCLUDES])
  -dnl Add in the Includes from APR-UTIL
  -APR_ADDTO(INCLUDES, [$APRUTIL_INCLUDES])
   so_ext=$APR_SO_EXT
   lib_target=$APR_LIB_TARGET
   AC_SUBST(so_ext)
  @@ -66,9 +67,12 @@
   host_alias=`uname -s`
   case "$host_alias" in
   *BeOS*)
  -    # Horrible Hack !!!
  -    # if we're building on BeOS then we need to add in the
  -    # apr and expat libraries to the build...  Grrrr...
  +    dnl ### Horrible Hack !!!
  +    dnl ### if we're building on BeOS then we need to add in the
  +    dnl ### apr and expat libraries to the build...  Grrrr...
  +    dnl
  +    dnl ### we should use $apr_config --link-libtool probably...
  +    dnl ### or at least $apr_config --apr-la-file
       EXTRA_OS_LINK="$APR_BUILD_DIR/libapr.la $top_builddir/xml/expat/lib/libexpat.la"
       ;;
   *)
  @@ -80,9 +84,7 @@
   dnl
   dnl Prep all the flags and stuff for compilation and export to other builds
   dnl
  -APR_ADDTO(CFLAGS, [$CFLAGS $INCLUDES $APR_EXPORT_CFLAGS $APR_EXPORT_CPPFLAGS])
  -APR_ADDTO(LIBS, [$APR_EXPORT_LIBS])
  -APR_ADDTO(INCLUDES, [$APRUTIL_INCLUDES])
  +APR_ADDTO(LIBS, [$APR_LIBS])
   
   AC_SUBST(APRUTIL_EXPORT_LIBS)
   AC_SUBST(APRUTIL_INCLUDES)
  
  
  
  1.15      +1 -4      apr-util/buckets/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/buckets/Makefile.in,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- Makefile.in	18 Jan 2002 17:57:41 -0000	1.14
  +++ Makefile.in	6 Feb 2002 12:42:50 -0000	1.15
  @@ -1,9 +1,6 @@
  -srcdir = @srcdir@
   VPATH = @srcdir@
   
  -top_builddir=@top_builddir@
  -top_srcdir=@abs_srcdir@
  -INCLUDES=-I$(top_builddir)/include -I$(top_srcdir)/include @APR_INCLUDES@ @APRUTIL_INCLUDES@
  +INCLUDES = @APR_INCLUDES@ @APRUTIL_INCLUDES@ @APRUTIL_PRIV_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.32      +29 -52    apr-util/build/apu-conf.m4
  
  Index: apu-conf.m4
  ===================================================================
  RCS file: /home/cvs/apr-util/build/apu-conf.m4,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- apu-conf.m4	6 Feb 2002 08:42:12 -0000	1.31
  +++ apu-conf.m4	6 Feb 2002 12:42:50 -0000	1.32
  @@ -7,56 +7,35 @@
   dnl
   AC_DEFUN(APU_FIND_APR,[
   
  -AC_MSG_CHECKING(for APR)
  -AC_ARG_WITH(apr,
  -[  --with-apr=DIR          path to APR source or the APR includes],
  -[
  -    if test "$withval" = "yes"; then
  -        AC_MSG_ERROR(You need to specify a directory with --with-apr)
  -    fi
  -    absdir="`cd $withval ; pwd`"
  -    if test -f "$absdir/apr.h"; then
  -	APR_INCLUDES="$absdir"
  -    elif test -f "$absdir/include/apr.h"; then
  -	APR_BUILD_DIR="$absdir"
  -    fi
  -],[
  -    dnl see if we can find APR
  -    if test -f "$srcdir/apr/include/apr.h"; then
  -	APR_BUILD_DIR="$srcdir/apr"
  -    elif test -f "$srcdir/../apr/include/apr.h"; then
  -	APR_BUILD_DIR="`cd $srcdir/../apr ; pwd`"
  -    fi
  -])
  +  dnl use the find_apr.m4 script to locate APR. sets apr_found and apr_config
  +  APR_FIND_APR
  +  if test "$apr_found" = "no"; then
  +    AC_MSG_ERROR(APR could not be located. Please use the --with-apr option.)
  +  fi
   
  -dnl
  -dnl grab flags from APR.
  -dnl ### APR doesn't have "nice" names for its exports (yet), but it isn't
  -dnl ### a problem to deal with them right here
  -dnl
  +  changequote(<<,>>)dnl
  +  APR_BUILD_DIR="`echo $apr_config | sed 's,/[^/]*$,,'`"
  +  changequote([,])dnl
   
  -. "$APR_BUILD_DIR/APRVARS"
  -APR_EXPORT_CPPFLAGS="$EXTRA_CPPFLAGS"
  -APR_EXPORT_CFLAGS="$EXTRA_CFLAGS"
  -APR_EXPORT_LIBS="$EXTRA_LIBS"
  +  dnl make APR_BUILD_DIR an absolute directory (we'll need it in the
  +  dnl sub-projects in some cases)
  +  APR_BUILD_DIR="`cd $APR_BUILD_DIR && pwd`"
   
  -if test -n "$APR_BUILD_DIR"; then
  -    APR_INCLUDES="-I$APR_BUILD_DIR/include"
  -    if test "$APR_BUILD_DIR" != "$APR_SOURCE_DIR"; then
  -        APR_INCLUDES="$APR_INCLUDES -I$APR_SOURCE_DIR/include"
  -    fi
  -fi
  +  dnl ### need to get rid of these two lines
  +  dnl ### used for: CC, CPP, ...
  +  . "$APR_BUILD_DIR/APRVARS"
   
  -if test -z "$APR_INCLUDES"; then
  -    AC_MSG_RESULT(not found)
  -    AC_MSG_ERROR(APR could not be located. Please use the --with-apr option.)
  -fi
   
  -AC_MSG_RESULT($APR_INCLUDES)
  +  APR_INCLUDES="`$apr_config --includes`"
  +  APR_LIBS="`$apr_config --link-libtool --libs`"
  +
  +  AC_SUBST(APR_INCLUDES)
  +  AC_SUBST(APR_LIBS)
   
  -AC_SUBST(APR_BUILD_DIR)
  -AC_SUBST(APR_SOURCE_DIR)
  -AC_SUBST(APR_INCLUDES)
  +  dnl ### would be nice to obsolete these
  +  APR_SOURCE_DIR="`$apr_config --srcdir`"
  +  AC_SUBST(APR_BUILD_DIR)
  +  AC_SUBST(APR_SOURCE_DIR)
   ])
   
   dnl
  @@ -278,23 +257,23 @@
         AC_MSG_RESULT(looking for berkeley-db includes with $BDB_INC)
         AC_MSG_RESULT(looking for berkeley-db libs with $BDB_LDFLAGS)
       fi
  -    SAVE_CPPFLAGS="$CPPFLAGS"
  -    SAVE_LDFLAGS="$LDFLAGS"
  +    save_cppflags="$CPPFLAGS"
  +    save_ldflags="$LDFLAGS"
       CPPFLAGS="$CPPFLAGS $BDB_INC"
       LDFLAGS="$LDFLAGS $BDB_LDFLAGS"
       if test "$apu_want_db" != "0"; then
           APU_CHECK_BERKELEY_DB
           if test "$apu_db_version" != "0"; then
               if test "$withval" != "yes"; then
  -                APR_ADDTO( APRUTIL_INCLUDES, [$BDB_INC])
  -                APR_ADDTO( APRUTIL_LDFLAGS, [$BDB_LDFLAGS])
  +                APR_ADDTO(APRUTIL_INCLUDES, [$BDB_INC])
  +                APR_ADDTO(APRUTIL_LDFLAGS, [$BDB_LDFLAGS])
               fi
           elif test "$withval" != "yes"; then
               AC_ERROR( Berkeley DB not found in the specified directory)
           fi
       fi 
  -    CPPFLAGS="$SAVE_CPPFLAGS"
  -    LDFLAGS="$SAVE_LDFLAGS"
  +    CPPFLAGS="$save_cppflags"
  +    LDFLAGS="$save_ldflags"
   ],[
       APU_CHECK_BERKELEY_DB
   ])
  @@ -631,8 +610,6 @@
       AC_CHECK_HEADERS(ldap.h, ldap_h=["#include <ldap.h>"])
       AC_CHECK_HEADERS(lber.h, lber_h=["#include <lber.h>"])
       AC_CHECK_HEADERS(ldap_ssl.h, ldap_ssl_h=["#include <ldap_ssl.h>"])
  -
  -
     ])
   
   AC_SUBST(ldap_h)
  
  
  
  1.11      +1 -4      apr-util/crypto/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/crypto/Makefile.in,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Makefile.in	18 Jan 2002 17:57:41 -0000	1.10
  +++ Makefile.in	6 Feb 2002 12:42:50 -0000	1.11
  @@ -1,9 +1,6 @@
  -srcdir = @srcdir@
   VPATH = @srcdir@
   
  -top_builddir=@top_builddir@
  -top_srcdir=@abs_srcdir@
  -INCLUDES=-I$(top_builddir)/include -I$(top_srcdir)/include @APR_INCLUDES@ @APRUTIL_INCLUDES@
  +INCLUDES = @APR_INCLUDES@ @APRUTIL_INCLUDES@ @APRUTIL_PRIV_INCLUDES@
   
   TARGETS = apr_sha1.lo apr_md4.lo
   
  
  
  
  1.11      +1 -4      apr-util/dbm/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/dbm/Makefile.in,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Makefile.in	18 Jan 2002 17:57:41 -0000	1.10
  +++ Makefile.in	6 Feb 2002 12:42:50 -0000	1.11
  @@ -1,9 +1,6 @@
  -srcdir = @srcdir@
   VPATH = @srcdir@
   
  -top_builddir=@top_builddir@
  -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@ @APRUTIL_INCLUDES@
  +INCLUDES = @APR_INCLUDES@ @APRUTIL_INCLUDES@ @APRUTIL_PRIV_INCLUDES@
   
   TARGETS = apr_dbm.lo apr_dbm_berkeleydb.lo apr_dbm_gdbm.lo apr_dbm_sdbm.lo
   
  
  
  
  1.8       +1 -4      apr-util/dbm/sdbm/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/dbm/sdbm/Makefile.in,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Makefile.in	18 Jan 2002 17:57:41 -0000	1.7
  +++ Makefile.in	6 Feb 2002 12:42:50 -0000	1.8
  @@ -1,9 +1,6 @@
  -srcdir = @srcdir@
   VPATH = @srcdir@
   
  -top_builddir=@top_builddir@
  -top_srcdir=@abs_srcdir@
  -INCLUDES=-I$(top_builddir)/include -I$(top_srcdir)/include @APR_INCLUDES@ @APRUTIL_INCLUDES@
  +INCLUDES = @APR_INCLUDES@ @APRUTIL_INCLUDES@ @APRUTIL_PRIV_INCLUDES@
   
   TARGETS = sdbm.lo sdbm_hash.lo sdbm_lock.lo sdbm_pair.lo
   
  
  
  
  1.11      +1 -4      apr-util/encoding/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/encoding/Makefile.in,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Makefile.in	18 Jan 2002 17:57:41 -0000	1.10
  +++ Makefile.in	6 Feb 2002 12:42:50 -0000	1.11
  @@ -1,9 +1,6 @@
  -srcdir = @srcdir@
   VPATH = @srcdir@
   
  -top_builddir=@top_builddir@
  -top_srcdir=@abs_srcdir@
  -INCLUDES=-I$(top_builddir)/include -I$(top_srcdir)/include @APR_INCLUDES@ @APRUTIL_INCLUDES@
  +INCLUDES = @APR_INCLUDES@ @APRUTIL_INCLUDES@ @APRUTIL_PRIV_INCLUDES@
   
   TARGETS = apr_base64.lo
   
  
  
  
  1.10      +1 -4      apr-util/hooks/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/hooks/Makefile.in,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Makefile.in	18 Jan 2002 17:57:41 -0000	1.9
  +++ Makefile.in	6 Feb 2002 12:42:50 -0000	1.10
  @@ -1,9 +1,6 @@
  -srcdir = @srcdir@
   VPATH = @srcdir@
   
  -top_builddir=@top_builddir@
  -top_srcdir=@abs_srcdir@
  -INCLUDES=-I$(top_builddir)/include -I$(top_srcdir)/include @APR_INCLUDES@ @APRUTIL_INCLUDES@
  +INCLUDES = @APR_INCLUDES@ @APRUTIL_INCLUDES@ @APRUTIL_PRIV_INCLUDES@
   
   TARGETS = apr_hooks.lo
   
  
  
  
  1.5       +1 -4      apr-util/ldap/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/ldap/Makefile.in,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Makefile.in	18 Jan 2002 17:57:41 -0000	1.4
  +++ Makefile.in	6 Feb 2002 12:42:50 -0000	1.5
  @@ -1,9 +1,6 @@
  -srcdir = @srcdir@
   VPATH = @srcdir@
   
  -top_builddir=@top_builddir@
  -top_srcdir=@abs_srcdir@
  -INCLUDES=-I$(top_builddir)/include -I$(top_srcdir)/include @APR_INCLUDES@ @APRUTIL_INCLUDES@
  +INCLUDES = @APR_INCLUDES@ @APRUTIL_INCLUDES@ @APRUTIL_PRIV_INCLUDES@
   
   TARGETS = apr_ldap_compat.lo
   
  
  
  
  1.7       +1 -5      apr-util/misc/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/misc/Makefile.in,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Makefile.in	18 Jan 2002 20:49:23 -0000	1.6
  +++ Makefile.in	6 Feb 2002 12:42:50 -0000	1.7
  @@ -1,12 +1,8 @@
  -srcdir = @srcdir@
   VPATH = @srcdir@
   
  -top_builddir=@top_builddir@
  -top_srcdir=@abs_srcdir@
  -INCLUDES=-I$(top_builddir)/include -I$(top_srcdir)/include @APR_INCLUDES@ @APRUTIL_INCLUDES@
  +INCLUDES = @APR_INCLUDES@ @APRUTIL_INCLUDES@ @APRUTIL_PRIV_INCLUDES@
   
   TARGETS = apr_date.lo apr_rmm.lo
  -CLEAN_TARGETS = 
   
   # bring in rules.mk for standard functionality
   @INCLUDE_RULES@
  
  
  
  1.21      +6 -8      apr-util/test/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/test/Makefile.in,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- Makefile.in	19 Jan 2002 05:03:57 -0000	1.20
  +++ Makefile.in	6 Feb 2002 12:42:50 -0000	1.21
  @@ -1,9 +1,7 @@
  -srcdir = @srcdir@
   VPATH = @srcdir@
   
  -top_builddir=@top_builddir@
  -top_srcdir=@abs_srcdir@
  -INCLUDES=-I$(top_builddir)/include -I$(top_builddir)/include/private -I$(top_srcdir)/include
-I$(top_srcdir)/include @APR_INCLUDES@ @APRUTIL_INCLUDES@
  +INCLUDES = @APR_INCLUDES@ @APRUTIL_INCLUDES@ @APRUTIL_PRIV_INCLUDES@
  +
   TARGETS =
   PROGRAMS = testdbm testdate testmd4 testxml
   
  @@ -14,21 +12,21 @@
   test: $(PROGRAMS)
   
   testdbm_OBJECTS = testdbm.lo
  -testdbm_LDADD =  ../libaprutil.la @APR_BUILD_DIR@/libapr.la 
  +testdbm_LDADD =  ../libaprutil.la @APR_LIBS@
   testdbm: $(testdbm_OBJECTS) $(testdbm_LDADD)
   	$(LINK) $(testdbm_OBJECTS) $(testdbm_LDADD) $(LIBS)
   
   testdate_OBJECTS = testdate.lo
  -testdate_LDADD =  ../libaprutil.la @APR_BUILD_DIR@/libapr.la 
  +testdate_LDADD =  ../libaprutil.la @APR_LIBS@
   testdate: $(testdate_OBJECTS) $(testdate_LDADD)
   	$(LINK) $(testdate_OBJECTS) $(testdate_LDADD) $(LIBS)
   
   testxml_OBJECTS = testxml.lo
  -testxml_LDADD =  ../libaprutil.la @APR_BUILD_DIR@/libapr.la 
  +testxml_LDADD =  ../libaprutil.la @APR_LIBS@
   testxml: $(testxml_OBJECTS) $(testxml_LDADD)
   	$(LINK) $(testxml_OBJECTS) $(testxml_LDADD) $(LIBS)
   
   testmd4_OBJECTS = testmd4.lo
  -testmd4_LDADD =  ../libaprutil.la @APR_BUILD_DIR@/libapr.la 
  +testmd4_LDADD =  ../libaprutil.la @APR_LIBS@
   testmd4: $(testmd4_OBJECTS) $(testmd4_LDADD)
   	$(LINK) $(testmd4_OBJECTS) $(testmd4_LDADD) $(LIBS)
  
  
  
  1.15      +6 -9      apr-util/uri/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/uri/Makefile.in,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- Makefile.in	18 Jan 2002 17:57:41 -0000	1.14
  +++ Makefile.in	6 Feb 2002 12:42:51 -0000	1.15
  @@ -1,12 +1,9 @@
  -srcdir = @srcdir@
   VPATH = @srcdir@
   
  -top_builddir=@top_builddir@
  -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@ @APRUTIL_INCLUDES@
  +INCLUDES = @APR_INCLUDES@ @APRUTIL_INCLUDES@ @APRUTIL_PRIV_INCLUDES@ -I.
   
  -TARGETS = $(top_builddir)/include/private/uri_delims.h apr_uri.lo
  -CLEAN_TARGETS = gen_uri_delims $(top_builddir)/include/private/uri_delims.h
  +TARGETS = uri_delims.h apr_uri.lo
  +CLEAN_TARGETS = gen_uri_delims uri_delims.h
   
   # bring in rules.mk for standard functionality
   @INCLUDE_RULES@
  @@ -15,7 +12,7 @@
   gen_uri_delims: $(gen_uri_delims_OBJECTS)
   	$(LINK) $(EXTRA_LDFLAGS) $(gen_uri_delims_OBJECTS) $(EXTRA_LIBS)
   
  -apr_uri.lo: $(top_builddir)/include/private/uri_delims.h
  +apr_uri.lo: uri_delims.h apr_uri.c
   
  -$(top_builddir)/include/private/uri_delims.h: gen_uri_delims
  -	./gen_uri_delims > $(top_builddir)/include/private/uri_delims.h
  +uri_delims.h: gen_uri_delims
  +	./gen_uri_delims > uri_delims.h
  
  
  
  1.11      +1 -4      apr-util/xml/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/xml/Makefile.in,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Makefile.in	18 Jan 2002 17:57:42 -0000	1.10
  +++ Makefile.in	6 Feb 2002 12:42:51 -0000	1.11
  @@ -1,9 +1,6 @@
  -srcdir = @srcdir@
   VPATH = @srcdir@
   
  -top_builddir=@top_builddir@
  -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@ @APRUTIL_INCLUDES@
  +INCLUDES = @APR_INCLUDES@ @APRUTIL_INCLUDES@ @APRUTIL_PRIV_INCLUDES@
   
   TARGETS = apr_xml.lo
   
  
  
  

Mime
View raw message