[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Patch for Automake as promised

From: Kevin Pilch-Bisson <kevin_at_pilch-bisson.net>
Date: 2001-01-24 20:00:47 CET

Hi all, the following is my promised patch for aupporting vpath builds.
Note that since some people seem to be in a commit frenzy, it may not
work. I think it will but if not, let me know and I will update,
re-create it and send it tomorrow morning.

Modified: (almost) all Makefile.am, configure.in some test scripts.
Log: Fixed build support for vpath builds, as well as adding useful
variables to configure.in for use in Makefiles.

Index: Makefile.am
===================================================================
RCS file: /cvs/subversion/Makefile.am,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile.am
--- Makefile.am 2000/12/22 21:25:38 1.14
+++ Makefile.am 2001/01/24 18:47:00
@@ -12,6 +12,12 @@ SUBDIRS = apr expat-lite neon subversion
 
 ACLOCAL = @ACLOCAL@ -I ac-helpers
 
+## Note, we have to add these in so that they get included in the distribution
+EXTRA_DIST = ac-helpers/berkeley-db.m4 ac-helpers/config.guess \
+ ac-helpers/config.sub ac-helpers/install-sh ac-helpers/ltconfig \
+ ac-helpers/ltmain.sh ac-helpers/missing ac-helpers/mkinstalldirs \
+ ac-helpers/svn-apache.m4 ac-helpers/svn-macros.m4
+
 ## Use Karl's script to create a Changelog from CVS.
 
 log: changelog
Index: configure.in
===================================================================
RCS file: /cvs/subversion/configure.in,v
retrieving revision 1.45
diff -u -p -r1.45 configure.in
--- configure.in 2001/01/10 00:08:00 1.45
+++ configure.in 2001/01/24 18:47:00
@@ -8,6 +8,9 @@ dnl First line is *required*; sanity-ch
 AC_INIT(subversion/include/svn_types.h)
 AC_CONFIG_AUX_DIR(ac-helpers)
 
+dnl $MKDIR is required for configuring apr and neon in a vpath build
+MKDIR=mkdir
+
 dnl Generate config.nice early (before the args are munged)
 SVN_CONFIG_NICE(config.nice)
 
@@ -59,6 +62,71 @@ dnl Set module library lists for libtool
 
 SVN_APR_LIBS="`pwd`/apr/libapr.la $LIBTOOL_LIBS"
 AC_SUBST(SVN_APR_LIBS)
+
+dnl Add some useful variables for Makefile.am's
+abs_builddir=`pwd`
+abs_srcdir=`cd $srcdir; pwd`
+SVN_APR_INCLUDES=-I\$\(top_srcdir\)/apr/include
+if test "$abs_srcdir" != "$abs_builddir"; then
+ SVN_APR_INCLUDES="-I\$(top_builddir)/apr/include $SVN_APR_INCLUDES"
+fi
+AC_SUBST(SVN_APR_INCLUDES)
+
+SVN_EXPAT_INCLUDES=-I\$\(top_srcdir\)/expat-lite
+AC_SUBST(SVN_EXPAT_INCLUDES)
+SVN_EXPAT_LIBS=\$\(top_builddir\)/expat-lite/libexpat.la
+AC_SUBST(SVN_EXPAT_LIBS)
+
+SVN_NEON_INCLUDES=-I\$\(top_srcdir\)/neon/src
+AC_SUBST(SVN_NEON_INCLUDES)
+SVN_NEON_LIBS=\$\(top_builddir\)/neon/libneon.la
+AC_SUBST(SVN_NEON_LIBS)
+
+SVN_INCLUDES=-I\$\(top_srcdir\)/subversion/include
+AC_SUBST(SVN_INCLUDES)
+
+SVN_CLIENT_INCLUDES=-I\$\(top_srcdir\)/subversion/client
+AC_SUBST(SVN_CLIENT_INCLUDES)
+
+SVN_LIBSVN_CLIENT_INCLUDES=-I\$\(top_srcdir\)/subversion/libsvn_client
+AC_SUBST(SVN_LIBSVN_CLIENT_INCLUDES)
+SVN_LIBSVN_CLIENT_LIBS=\$\(top_builddir\)/subversion/libsvn_client/libsvn_client.la
+AC_SUBST(SVN_LIBSVN_CLIENT_LIBS)
+
+SVN_LIBSVN_DELTA_INCLUDES=-I\$\(top_srcdir\)/subversion/libsvn_delta
+AC_SUBST(SVN_LIBSVN_DELTA_INCLUDES)
+SVN_LIBSVN_DELTA_LIBS=\$\(top_builddir\)/subversion/libsvn_delta/libsvn_delta.la
+AC_SUBST(SVN_LIBSVN_DELTA_LIBS)
+
+SVN_LIBSVN_FS_INCLUDES=-I\$\(top_srcdir\)/subversion/libsvn_fs
+AC_SUBST(SVN_LIBSVN_FS_INCLUDES)
+SVN_LIBSVN_FS_LIBS=\$\(top_builddir\)/subversion/libsvn_fs/libsvn_fs.la
+AC_SUBST(SVN_LIBSVN_FS_LIBS)
+
+SVN_LIBSVN_RA_DAV_INCLUDES=-I\$\(top_srcdir\)/subversion/libsvn_ra_dav
+AC_SUBST(SVN_LIBSVN_RA_DAV_INCLUDES)
+SVN_LIBSVN_RA_DAV_LIBS=\$\(top_builddir\)/subversion/libsvn_ra_dav/libsvn_ra_dav.la
+AC_SUBST(SVN_LIBSVN_RA_DAV_LIBS)
+
+SVN_LIBSVN_SUBR_INCLUDES=-I\$\(top_srcdir\)/subversion/libsvn_subr
+AC_SUBST(SVN_LIBSVN_SUBR_INCLUDES)
+SVN_LIBSVN_SUBR_LIBS=\$\(top_builddir\)/subversion/libsvn_subr/libsvn_subr.la
+AC_SUBST(SVN_LIBSVN_SUBR_LIBS)
+
+SVN_LIBSVN_WC_INCLUDES=-I\$\(top_srcdir\)/subversion/libsvn_wc
+AC_SUBST(SVN_LIBSVN_WC_INCLUDES)
+SVN_LIBSVN_WC_LIBS=\$\(top_builddir\)/subversion/libsvn_wc/libsvn_wc.la
+AC_SUBST(SVN_LIBSVN_WC_LIBS)
+
+SVN_MOD_DAV_SVN_INCLUDES=-I\$\(top_srcdir\)/subversion/mod_dav_svn
+AC_SUBST(SVN_MOD_DAV_SVN_INCLUDES)
+
+SVN_TESTS_COMMON_INCLUDES=-I\$\(top_srcdir\)/subversion/tests-common
+AC_SUBST(SVN_TESTS_COMMON_INCLUDES)
+SVN_TESTS_COMMON_MAIN_LIBS=\$\(top_builddir\)/subversion/tests-common/libsvn_tests_main.la
+AC_SUBST(SVN_TESTS_COMMON_MAIN_LIBS)
+SVN_TESTS_COMMON_EDITOR_LIBS=\$\(top_builddir\)/subversion/tests-common/libsvn_test_editor.la
+AC_SUBST(SVN_TESTS_COMMON_EDITOR_LIBS)
 
 
 dnl Check for programs ---------------------
Index: expat-lite/Makefile.am
===================================================================
RCS file: /cvs/subversion/expat-lite/Makefile.am,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile.am
--- expat-lite/Makefile.am 2000/11/04 02:44:12 1.2
+++ expat-lite/Makefile.am 2001/01/24 18:47:00
@@ -8,7 +8,14 @@
 lib_LTLIBRARIES = libexpat.la
 
 ## Sources needed to build each library (names canonicalized)
-libexpat_la_SOURCES = hashtable.c xmlparse.c xmlrole.c xmltok.c
+libexpat_la_SOURCES = asciitab.h hashtable.c hashtable.h iasciitab.h \
+ latin1tab.h nametab.h utf8tab.h xmldef.h xmlparse.c \
+ xmlparse.h xmlrole.c xmlrole.h xmltok.c xmltok.h \
+ xmltok_impl.h
+
+## This is needed because they are included into xmltok.c, but shouldn't be
+## put in libexpat_la_SOURCES, since it should not be compiled directly
+EXTRA_DIST = xmltok_impl.c xmltok_ns.c
 
 ### still need to set up the byte-order. see xmldef.h
 CFLAGS = -DXML_NS
Index: subversion/Makefile.am
===================================================================
RCS file: /cvs/subversion/subversion/Makefile.am,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile.am
--- subversion/Makefile.am 2000/10/24 19:45:25 1.16
+++ subversion/Makefile.am 2001/01/24 18:47:01
@@ -16,16 +16,18 @@ SUBDIRS = tests-common \
 ## Include these extra files when building `dist' target
 
 EXTRA_DIST = LICENSE \
- include/svn_types.h \
- include/svn_string.h \
- include/svn_hash.h \
- include/svn_error.h \
- include/svn_parse.h \
+ include/svn_base64.h \
+ include/svn_client.h \
              include/svn_delta.h \
+ include/svn_error.h \
              include/svn_fs.h \
- include/svn_wc.h \
- include/svn_client.h \
+ include/svn_hash.h \
              include/svn_io.h \
              include/svn_path.h \
+ include/svn_quoprint.h \
              include/svn_ra.h \
+ include/svn_string.h \
+ include/svn_test.h \
+ include/svn_types.h \
+ include/svn_wc.h \
              include/svn_xml.h
Index: subversion/client/Makefile.am
===================================================================
RCS file: /cvs/subversion/subversion/client/Makefile.am,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile.am
--- subversion/client/Makefile.am 2001/01/10 00:08:00 1.16
+++ subversion/client/Makefile.am 2001/01/24 18:47:01
@@ -5,20 +5,15 @@ svn_SOURCES = main.c status.c props.c
               add-cmd.c commit-cmd.c checkout-cmd.c \
               proplist-cmd.c delete-cmd.c status-cmd.c \
               update-cmd.c propget-cmd.c propset-cmd.c \
- trace-update.c trace-commit.c
+ trace-update.c trace-commit.c cl.h
 
 ## Flags needed when compiling:
-INCLUDES = -I. -I../include -I../../apr/include -I../../expat-lite
+INCLUDES = @SVN_INCLUDES@ @SVN_APR_INCLUDES@ @SVN_EXPAT_INCLUDES@
 
 ## Libraries this binary depends upon:
-svn_LDADD = ../libsvn_client/libsvn_client.la \
- ../libsvn_wc/libsvn_wc.la \
- ../libsvn_delta/libsvn_delta.la \
- ../libsvn_subr/libsvn_subr.la \
- ../tests-common/libsvn_test_editor.la \
- @SVN_APR_LIBS@ \
- ../../expat-lite/libexpat.la
-
+svn_LDADD = @SVN_LIBSVN_CLIENT_LIBS@ @SVN_LIBSVN_WC_LIBS@ \
+ @SVN_LIBSVN_DELTA_LIBS@ @SVN_LIBSVN_SUBR_LIBS@ \
+ @SVN_TESTS_COMMON_EDITOR_LIBS@ @SVN_APR_LIBS@ @SVN_EXPAT_LIBS@
 
 ## Make libtool be quiet
 LIBTOOL = @LIBTOOL@ --silent
Index: subversion/client/tests/Makefile.am
===================================================================
RCS file: /cvs/subversion/subversion/client/tests/Makefile.am,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile.am
--- subversion/client/tests/Makefile.am 2000/11/27 19:12:29 1.2
+++ subversion/client/tests/Makefile.am 2001/01/24 18:47:01
@@ -1,3 +1,8 @@
+## Note, pass them the source xml directory, since they can't find it in VPATH
+## builds
 check:
- sh ./svn-test.sh
- sh ./svn-test2.sh
+ sh @srcdir@/svn-test.sh @top_srcdir@/subversion/tests-common/xml
+ sh @srcdir@/svn-test2.sh @top_srcdir@/subversion/tests-common/xml
+
+## We need to include these in the distribution
+EXTRA_DIST = svn-test.sh svn-test2.sh
Index: subversion/client/tests/svn-test.sh
===================================================================
RCS file: /cvs/subversion/subversion/client/tests/svn-test.sh,v
retrieving revision 1.28
diff -u -p -r1.28 svn-test.sh
--- subversion/client/tests/svn-test.sh 2000/12/06 19:43:30 1.28
+++ subversion/client/tests/svn-test.sh 2001/01/24 18:47:01
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 SVN_PROG=../svn
+XML_DIR=$1
 TEST_DIR_1=t1
 TEST_DIR_2=t2
 COMMIT_RESULTFILE_NAME=commit
@@ -26,7 +27,7 @@ echo
 echo "Checking out ${TEST_DIR_1}."
 ${SVN_PROG} checkout \
       --target-dir ${TEST_DIR_1} \
- --xml-file ../../tests-common/xml/co1-inline.xml \
+ --xml-file $XML_DIR/co1-inline.xml \
       --revision 1 \
       --ancestor-path ${ANCESTOR_PATH}
 
Index: subversion/client/tests/svn-test2.sh
===================================================================
RCS file: /cvs/subversion/subversion/client/tests/svn-test2.sh,v
retrieving revision 1.11
diff -u -p -r1.11 svn-test2.sh
--- subversion/client/tests/svn-test2.sh 2001/01/04 02:42:59 1.11
+++ subversion/client/tests/svn-test2.sh 2001/01/24 18:47:01
@@ -3,6 +3,7 @@
 # Testing merging and conflict resolution.
 
 SVN_PROG=../svn
+XML_DIR=$1
 TEST_DIR_1=t1
 TEST_DIR_2=t2
 COMMIT_RESULTFILE_NAME=commit2
@@ -32,7 +33,7 @@ echo
 echo "Checking out ${TEST_DIR_1}."
 ${SVN_PROG} checkout \
       --target-dir ${TEST_DIR_1} \
- --xml-file ../../tests-common/xml/co1-inline.xml \
+ --xml-file $XML_DIR/co1-inline.xml \
       --revision 1 \
       --ancestor-path ${ANCESTOR_PATH}
 
@@ -40,13 +41,13 @@ check_status 1
 
 ### Give t1/iota some file-properties via update.
 echo "Updating t1/iota with properties. (up2.xml)"
-${SVN_PROG} update --xml-file ../../tests-common/xml/up2.xml \
+${SVN_PROG} update --xml-file $XML_DIR/up2.xml \
                    --revision 17 ${TEST_DIR_1}
 check_status 2
 
 ### Give t1/A some dir-properties via update.
 echo "Updating t1/A/ with properties. (up5.xml)"
-${SVN_PROG} update --xml-file ../../tests-common/xml/up5.xml \
+${SVN_PROG} update --xml-file $XML_DIR/up5.xml \
                    --revision 18 ${TEST_DIR_1}
 check_status 3
 
@@ -83,13 +84,13 @@ check_status 8
 
 ### Update again. This update should create conflicting properties.
 echo "Updating with (conflicting) properties. (up-props.xml)"
-${SVN_PROG} update --xml-file ../../tests-common/xml/up-props.xml \
+${SVN_PROG} update --xml-file $XML_DIR/up-props.xml \
                    --revision 20 ${TEST_DIR_1}
 check_status 9
 
 ### Update again. This update should create conflicting text.
 echo "Updating with (conflicting) text. (pipatch.xml)"
-${SVN_PROG} update --xml-file ../../tests-common/xml/pipatch.xml \
+${SVN_PROG} update --xml-file $XML_DIR/pipatch.xml \
                    --revision 21 ${TEST_DIR_1}
 check_status 10
 
Index: subversion/libsvn_client/Makefile.am
===================================================================
RCS file: /cvs/subversion/subversion/libsvn_client/Makefile.am,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile.am
--- subversion/libsvn_client/Makefile.am 2000/12/14 18:48:15 1.9
+++ subversion/libsvn_client/Makefile.am 2001/01/24 18:47:01
@@ -11,13 +11,11 @@ lib_LTLIBRARIES = libsvn_client.la
 libsvn_client_la_SOURCES = checkout.c update.c apply_edits.c \
                            add.c delete.c \
                            commit.c status.c \
- ra_loader.c
+ ra_loader.c client.h
 
 ## Build flags ---------
 
-## These should be variables, no? (from autoconf?)
-INCLUDES = -I../include -I../../apr/include -I../../expat-lite
-
+INCLUDES = @SVN_INCLUDES@ @SVN_APR_INCLUDES@ @SVN_EXPAT_INCLUDES@
 
 ## Put `tests' after `.' when we have a tests directory.
 SUBDIRS = .
Index: subversion/libsvn_delta/Makefile.am
===================================================================
RCS file: /cvs/subversion/subversion/libsvn_delta/Makefile.am,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile.am
--- subversion/libsvn_delta/Makefile.am 2000/10/26 20:02:25 1.14
+++ subversion/libsvn_delta/Makefile.am 2001/01/24 18:47:01
@@ -9,13 +9,11 @@ lib_LTLIBRARIES = libsvn_delta.la
 
 ## Sources needed to build each library (names canonicalized)
 libsvn_delta_la_SOURCES = xml_parse.c xml_output.c text_delta.c vdelta.c \
- svndiff.c compose_editors.c
+ svndiff.c compose_editors.c delta.h
 
 ## Build flags ---------
 
-## These should be variables, no? (from autoconf?)
-INCLUDES = -I../include -I../../apr/include -I../../expat-lite
-
+INCLUDES = @SVN_INCLUDES@ @SVN_APR_INCLUDES@ @SVN_EXPAT_INCLUDES@
 
 ## Build *this* directory first, *then* the test subdirectory!
 SUBDIRS = . tests
Index: subversion/libsvn_delta/tests/Makefile.am
===================================================================
RCS file: /cvs/subversion/subversion/libsvn_delta/tests/Makefile.am,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile.am
--- subversion/libsvn_delta/tests/Makefile.am 2001/01/10 00:08:00 1.13
+++ subversion/libsvn_delta/tests/Makefile.am 2001/01/24 18:47:01
@@ -9,35 +9,23 @@ xml_output_test_SOURCES = xml-output-tes
 svndiff_test_SOURCES = svndiff-test.c
 
 ## Flags needed when compiling:
-INCLUDES = -I../../include -I../../../apr/include -I../../../expat-lite
+INCLUDES = @SVN_INCLUDES@ @SVN_APR_INCLUDES@ @SVN_EXPAT_INCLUDES@
 
 ## Libraries this binary depends upon:
-deltaparse_test_LDADD = ../libsvn_delta.la \
- ../../tests-common/libsvn_test_editor.la \
- ../../libsvn_subr/libsvn_subr.la \
- @SVN_APR_LIBS@ \
- ../../../expat-lite/libexpat.la
+deltaparse_test_LDADD = @SVN_LIBSVN_DELTA_LIBS@ @SVN_TESTS_COMMON_EDITOR_LIBS@ \
+ @SVN_LIBSVN_SUBR_LIBS@ @SVN_APR_LIBS@ @SVN_EXPAT_LIBS@
 
-vdelta_test_LDADD = ../libsvn_delta.la \
- ../../libsvn_subr/libsvn_subr.la \
- @SVN_APR_LIBS@ \
- ../../../expat-lite/libexpat.la
+vdelta_test_LDADD = @SVN_LIBSVN_DELTA_LIBS@ @SVN_LIBSVN_SUBR_LIBS@ \
+ @SVN_APR_LIBS@ @SVN_EXPAT_LIBS@
 
-random_test_LDADD = ../libsvn_delta.la \
- ../../libsvn_subr/libsvn_subr.la \
- @SVN_APR_LIBS@ \
- ../../../expat-lite/libexpat.la
+random_test_LDADD = @SVN_LIBSVN_DELTA_LIBS@ @SVN_LIBSVN_SUBR_LIBS@ \
+ @SVN_APR_LIBS@ @SVN_EXPAT_LIBS@
 
-xml_output_test_LDADD = ../libsvn_delta.la \
- ../../libsvn_subr/libsvn_subr.la \
- @SVN_APR_LIBS@ \
- ../../../expat-lite/libexpat.la
+xml_output_test_LDADD = @SVN_LIBSVN_DELTA_LIBS@ @SVN_LIBSVN_SUBR_LIBS@ \
+ @SVN_APR_LIBS@ @SVN_EXPAT_LIBS@
 
-svndiff_test_LDADD = ../libsvn_delta.la \
- ../../libsvn_subr/libsvn_subr.la \
- @SVN_APR_LIBS@ \
- ../../../expat-lite/libexpat.la
-
+svndiff_test_LDADD = @SVN_LIBSVN_DELTA_LIBS@ @SVN_LIBSVN_SUBR_LIBS@ \
+ @SVN_APR_LIBS@ @SVN_EXPAT_LIBS@
 
 ## Make libtool be quiet
 LIBTOOL = @LIBTOOL@ --silent
Index: subversion/libsvn_fs/Makefile.am
===================================================================
RCS file: /cvs/subversion/subversion/libsvn_fs/Makefile.am,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile.am
--- subversion/libsvn_fs/Makefile.am 2000/12/17 00:11:56 1.22
+++ subversion/libsvn_fs/Makefile.am 2001/01/24 18:47:01
@@ -4,33 +4,52 @@
 lib_LTLIBRARIES = libsvn_fs.la
 libsvn_fs_la_SOURCES = \
                         clones-table.c \
+ clones-table.h \
                         convert-size.c \
+ convert-size.h \
                         dag.c \
+ dag.h \
                         dbt.c \
+ dbt.h \
                         err.c \
+ err.h \
                         fs.c \
+ fs.h \
                         id.c \
+ id.h \
+ node-rev.h \
+ node.h \
                         nodes-table.c \
+ nodes-table.h \
                         rev-table.c \
+ rev-table.h \
                         skel.c \
+ skel.h \
                         trail.c \
+ trail.h \
                         tree.c \
+ tree.h \
                         txn.c \
+ txn.h \
                         txn-table.c \
- validate.c
+ txn-table.h \
+ validate.c \
+ validate.h
 
 # Set aside for the moment:
 # delta.c \
 # dir.c \
 # file.c \
+# file.h \
 # node.c \
 # rep.c \
-# revision.c
+# revision.c \
+# revision.h
 
 libsvn_fs_la_LIBADD = -ldb
 
 
-INCLUDES = -I../include -I../../apr/include -I../../expat-lite
+INCLUDES = @SVN_INCLUDES@ @SVN_APR_INCLUDES@ @SVN_EXPAT_INCLUDES@
 
 ## Build *this* directory first, *then* the test subdirectory!
 SUBDIRS = . tests
Index: subversion/libsvn_fs/tests/Makefile.am
===================================================================
RCS file: /cvs/subversion/subversion/libsvn_fs/tests/Makefile.am,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile.am
--- subversion/libsvn_fs/tests/Makefile.am 2001/01/10 00:08:01 1.8
+++ subversion/libsvn_fs/tests/Makefile.am 2001/01/24 18:47:01
@@ -1,12 +1,8 @@
 noinst_PROGRAMS = skel-test fs-test
 
-COMMON_LIBS = \
- ../libsvn_fs.la \
- ../../tests-common/libsvn_tests_main.la \
- ../../libsvn_subr/libsvn_subr.la \
- @SVN_APR_LIBS@ \
- ../../../expat-lite/libexpat.la \
- -ldb
+COMMON_LIBS = @SVN_LIBSVN_FS_LIBS@ @SVN_TESTS_COMMON_MAIN_LIBS@ @SVN_TESTS_COMMON_EDITOR_LIBS@ \
+ @SVN_LIBSVN_SUBR_LIBS@ @SVN_APR_LIBS@ @SVN_EXPAT_LIBS@ -ldb
+ ## Shouldn't -ldb be added automatically by the autoconf script?
 
 # Tests for the `skeleton' library.
 skel_test_SOURCES = skel-test.c
@@ -16,10 +12,13 @@ skel_test_LDADD = ${COMMON_LIBS}
 fs_test_SOURCES = fs-test.c
 fs_test_LDADD = ${COMMON_LIBS}
 
-INCLUDES = -I .. -I ../../include -I ../../../apr/include
+INCLUDES = @SVN_LIBSVN_FS_INCLUDES@ @SVN_INCLUDES@ @SVN_APR_INCLUDES@
 
 ## Make libtool be quiet
 LIBTOOL = @LIBTOOL@ --silent
 
 check:
- sh ./run-fs-tests.sh
+ sh @srcdir@/run-fs-tests.sh
+
+## Need to include the test script in the distribution
+EXTRA_DIST = run-fs-tests.sh
Index: subversion/libsvn_ra_dav/Makefile.am
===================================================================
RCS file: /cvs/subversion/subversion/libsvn_ra_dav/Makefile.am,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile.am
--- subversion/libsvn_ra_dav/Makefile.am 2000/09/11 09:21:50 1.4
+++ subversion/libsvn_ra_dav/Makefile.am 2001/01/24 18:47:01
@@ -3,9 +3,9 @@
 
 lib_LTLIBRARIES = libsvn_ra_dav.la
 
-libsvn_ra_dav_la_SOURCES = session.c fetch.c commit.c
+libsvn_ra_dav_la_SOURCES = session.c fetch.c commit.c ra_dav.h
 
-INCLUDES = -I../include -I../../apr/include -I../../neon/src
+INCLUDES = @SVN_INCLUDES@ @SVN_APR_INCLUDES@ @SVN_NEON_INCLUDES@
 
 SUBDIRS = . tests
 
Index: subversion/libsvn_ra_dav/tests/Makefile.am
===================================================================
RCS file: /cvs/subversion/subversion/libsvn_ra_dav/tests/Makefile.am,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile.am
--- subversion/libsvn_ra_dav/tests/Makefile.am 2001/01/10 00:08:01 1.13
+++ subversion/libsvn_ra_dav/tests/Makefile.am 2001/01/24 18:47:01
@@ -6,26 +6,17 @@ ra_dav_test_SOURCES = ra-dav-test.c
 ra_commit_SOURCES = ra-commit.c
 
 ## Flags needed when compiling:
-INCLUDES = -I../../include -I../../../apr/include
+INCLUDES = @SVN_INCLUDES@ @SVN_APR_INCLUDES@
 
 ## Libraries this binary depends upon:
-ra_dav_test_LDADD = ../libsvn_ra_dav.la \
- ../../libsvn_wc/libsvn_wc.la \
- ../../libsvn_subr/libsvn_subr.la \
- ../../libsvn_delta/libsvn_delta.la \
- ../../../expat-lite/libexpat.la \
- ../../../neon/libneon.la \
- @SVN_APR_LIBS@
+ra_dav_test_LDADD = @SVN_LIBSVN_RA_DAV_LIBS@ @SVN_LIBSVN_WC_LIBS@ \
+ @SVN_LIBSVN_SUBR_LIBS@ @SVN_LIBSVN_DELTA_LIBS@ \
+ @SVN_EXPAT_LIBS@ @SVN_NEON_LIBS@ @SVN_APR_LIBS@
 
 ## Libraries this binary depends upon:
-ra_commit_LDADD = ../libsvn_ra_dav.la \
- ../../libsvn_wc/libsvn_wc.la \
- ../../libsvn_subr/libsvn_subr.la \
- ../../libsvn_delta/libsvn_delta.la \
- ../../../expat-lite/libexpat.la \
- ../../../neon/libneon.la \
- @SVN_APR_LIBS@
-
+ra_commit_LDADD = @SVN_LIBSVN_RA_DAV_LIBS@ @SVN_LIBSVN_WC_LIBS@ \
+ @SVN_LIBSVN_SUBR_LIBS@ @SVN_LIBSVN_DELTA_LIBS@ \
+ @SVN_EXPAT_LIBS@ @SVN_NEON_LIBS@ @SVN_APR_LIBS@
 
 ## Make libtool be quiet
 LIBTOOL = @LIBTOOL@ --silent
Index: subversion/libsvn_subr/Makefile.am
===================================================================
RCS file: /cvs/subversion/subversion/libsvn_subr/Makefile.am,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile.am
--- subversion/libsvn_subr/Makefile.am 2000/12/26 23:28:30 1.13
+++ subversion/libsvn_subr/Makefile.am 2001/01/24 18:47:01
@@ -14,13 +14,10 @@ libsvn_subr_la_SOURCES = svn_string.c sv
 
 ## Build flags ---------
 
-## These should be variables, no? (from autoconf?)
-INCLUDES = -I../include -I../../apr/include -I../../expat-lite
+INCLUDES = @SVN_INCLUDES@ @SVN_APR_INCLUDES@ @SVN_EXPAT_INCLUDES@
 
-
 ## Build *this* directory first, *then* the test subdirectory!
 SUBDIRS = . tests
-
 
 ## Make libtool be quiet
 LIBTOOL = @LIBTOOL@ --silent
Index: subversion/libsvn_subr/tests/Makefile.am
===================================================================
RCS file: /cvs/subversion/subversion/libsvn_subr/tests/Makefile.am,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile.am
--- subversion/libsvn_subr/tests/Makefile.am 2001/01/10 00:08:01 1.12
+++ subversion/libsvn_subr/tests/Makefile.am 2001/01/24 18:47:01
@@ -5,19 +5,16 @@ hashdump_test_SOURCES = hashdump-test.c
 stringtest_SOURCES = stringtest.c
 
 ## Flags needed when compiling:
-INCLUDES = -I../../include -I../../../apr/include
+INCLUDES = @SVN_INCLUDES@ @SVN_APR_INCLUDES@
 
 ## Libraries this binary depends upon:
-hashdump_test_LDADD = ../../tests-common/libsvn_tests_main.la \
- ../libsvn_subr.la \
- @SVN_APR_LIBS@ \
- ../../../expat-lite/libexpat.la
+hashdump_test_LDADD = @SVN_LIBSVN_SUBR_LIBS@ @SVN_TESTS_COMMON_MAIN_LIBS@ \
+ @SVN_TESTS_COMMON_EDITOR_LIBS@ \
+ @SVN_APR_LIBS@ @SVN_EXPAT_LIBS@
 
-stringtest_LDADD = ../../tests-common/libsvn_tests_main.la \
- ../libsvn_subr.la \
- @SVN_APR_LIBS@ \
- ../../../expat-lite/libexpat.la
-
+stringtest_LDADD = @SVN_LIBSVN_SUBR_LIBS@ @SVN_TESTS_COMMON_MAIN_LIBS@ \
+ @SVN_TESTS_COMMON_EDITOR_LIBS@ \
+ @SVN_APR_LIBS@ @SVN_EXPAT_LIBS@
 
 ## Make libtool be quiet
 LIBTOOL = @LIBTOOL@ --silent
Index: subversion/libsvn_wc/Makefile.am
===================================================================
RCS file: /cvs/subversion/subversion/libsvn_wc/Makefile.am,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile.am
--- subversion/libsvn_wc/Makefile.am 2000/11/12 21:29:35 1.24
+++ subversion/libsvn_wc/Makefile.am 2001/01/24 18:47:01
@@ -8,22 +8,16 @@
 lib_LTLIBRARIES = libsvn_wc.la
 
 ## Sources needed to build each library (names canonicalized)
-libsvn_wc_la_SOURCES = get_editor.c \
- adm_files.c adm_ops.c \
- lock.c util.c questions.c \
- log.c local_changes.c \
- entries.c status.c \
- adm_crawler.c props.c
+libsvn_wc_la_SOURCES = adm_crawler.c adm_files.c adm_ops.c entries.c \
+ get_editor.c local_changes.c lock.c log.c props.c \
+ questions.c status.c util.c wc.h
 
 ## Build flags ---------
 
-## These should be variables, no? (from autoconf?)
-INCLUDES = -I../include -I../../apr/include -I../../expat-lite -I../../
+INCLUDES = @SVN_INCLUDES@ @SVN_APR_INCLUDES@ @SVN_EXPAT_INCLUDES@
 
-
 ## Build *this* directory first, *then* the test subdirectory!
 SUBDIRS = . tests
-
 
 ## Make libtool be quiet
 LIBTOOL = @LIBTOOL@ --silent
Index: subversion/libsvn_wc/tests/Makefile.am
===================================================================
RCS file: /cvs/subversion/subversion/libsvn_wc/tests/Makefile.am,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile.am
--- subversion/libsvn_wc/tests/Makefile.am 2001/01/10 00:08:01 1.13
+++ subversion/libsvn_wc/tests/Makefile.am 2001/01/24 18:47:01
@@ -5,27 +5,22 @@ noinst_PROGRAMS = checkout-test commit-t
 checkout_test_SOURCES = checkout-test.c
 commit_test_SOURCES = commit-test.c
 
-
 ## Flags needed when compiling:
-INCLUDES = -I../../include -I../../../apr/include -I../../../expat-lite
+INCLUDES = @SVN_INCLUDES@ @SVN_APR_INCLUDES@ @SVN_EXPAT_INCLUDES@
 
 ## Libraries this binary depends upon:
-checkout_test_LDADD = ../libsvn_wc.la \
- ../../libsvn_delta/libsvn_delta.la \
- ../../libsvn_subr/libsvn_subr.la \
- @SVN_APR_LIBS@ \
- ../../../expat-lite/libexpat.la
+checkout_test_LDADD = @SVN_LIBSVN_WC_LIBS@ @SVN_LIBSVN_DELTA_LIBS@ \
+ @SVN_LIBSVN_SUBR_LIBS@ @SVN_APR_LIBS@ @SVN_EXPAT_LIBS@
 
-commit_test_LDADD = ../libsvn_wc.la \
- ../../libsvn_delta/libsvn_delta.la \
- ../../tests-common/libsvn_test_editor.la \
- ../../libsvn_subr/libsvn_subr.la \
- @SVN_APR_LIBS@ \
- ../../../expat-lite/libexpat.la
+commit_test_LDADD = @SVN_LIBSVN_WC_LIBS@ @SVN_LIBSVN_DELTA_LIBS@ \
+ @SVN_TESTS_COMMON_EDITOR_LIBS@ @SVN_LIBSVN_SUBR_LIBS@ \
+ @SVN_APR_LIBS@ @SVN_EXPAT_LIBS@
 
 ## Make libtool be quiet
 LIBTOOL = @LIBTOOL@ --silent
 
 ## Automatic test scripts to run for `make check`
-
 TESTS = checkout-test.sh
+
+## For some reason, we need to include this in the distribution
+EXTRA_DIST = checkout-test.sh
Index: subversion/libsvn_wc/tests/checkout-test.sh
===================================================================
RCS file: /cvs/subversion/subversion/libsvn_wc/tests/checkout-test.sh,v
retrieving revision 1.9
diff -u -p -r1.9 checkout-test.sh
--- subversion/libsvn_wc/tests/checkout-test.sh 2000/10/17 17:43:19 1.9
+++ subversion/libsvn_wc/tests/checkout-test.sh 2001/01/24 18:47:01
@@ -2,7 +2,7 @@
 
 # Make sure checkout-test binary exists
 
-TEST_DELTA=../../tests-common/xml/co1-inline.xml
+TEST_DELTA=$srcdir/../../tests-common/xml/co1-inline.xml
 
 if [ ! -x ./checkout-test ]; then
     echo "Error: can't find checkout-test executable"
Index: subversion/mod_dav_svn/Makefile.am
===================================================================
RCS file: /cvs/subversion/subversion/mod_dav_svn/Makefile.am,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile.am
--- subversion/mod_dav_svn/Makefile.am 2000/12/19 12:26:17 1.9
+++ subversion/mod_dav_svn/Makefile.am 2001/01/24 18:47:01
@@ -7,19 +7,19 @@
 
 lib_LTLIBRARIES = libmod_dav_svn.la
 
-libmod_dav_svn_la_SOURCES = mod_dav_svn.c deadprops.c liveprops.c repos.c \
- version.c util.c
+libmod_dav_svn_la_SOURCES = dav_svn.h deadprops.c liveprops.c mod_dav_svn.c \
+ repos.c util.c version.c
 
 ### this is a hack, but we can't pass libsvn_fs.la (et al) to libtool when
 ### shared libs are being built. libtool barfs on us. we need to upgrade
 ### to libtool 1.4 when it gets released
-libmod_dav_svn_la_LIBADD = -L../libsvn_fs/.libs -lsvn_fs \
- -L../libsvn_subr/.libs -lsvn_subr
+libmod_dav_svn_la_LIBADD = -L$(top_builddir)/subversion/libsvn_fs/.libs -lsvn_fs \
+ -L$(top_builddir)/subversion/libsvn_subr/.libs -lsvn_subr
 
 ## we don't need the .so version stuff for an Apache module, so avoid them
 LDFLAGS = -avoid-version
 
-INCLUDES = -I../include $(APACHE_INCLUDES) -I../../apr/include
+INCLUDES = @SVN_INCLUDES@ $(APACHE_INCLUDES) @SVN_APR_INCLUDES@
 
 SUBDIRS = . tests
 
Index: subversion/tests-common/Makefile.am
===================================================================
RCS file: /cvs/subversion/subversion/tests-common/Makefile.am,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile.am
--- subversion/tests-common/Makefile.am 2000/10/25 15:58:08 1.7
+++ subversion/tests-common/Makefile.am 2001/01/24 18:47:02
@@ -5,8 +5,13 @@ libsvn_tests_main_la_SOURCES = svn_tests
 libsvn_test_editor_la_SOURCES = svn_test_editor.c
 
 ## Flags needed when compiling:
-INCLUDES = -I../../apr/include -I../include
+INCLUDES = @SVN_INCLUDES@ @SVN_APR_INCLUDES@
 
+## Need to include these for performing tests.
+EXTRA_DIST = xml/README xml/co1-inline.xml xml/co1-postfix.xml xml/co1.txt \
+ xml/pipatch.xml xml/up-props.xml xml/up1a-inline.xml \
+ xml/up1a-postfix.xml xml/up1b-inline.xml xml/up1b-postfix.xml \
+ xml/up2.xml xml/up3.xml xml/up5.xml
 
 ## Make libtool be quiet
 LIBTOOL = @LIBTOOL@ --silent

-- 
>~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Kevin Pilch-Bisson
kevin@pilch-bisson.net
http://www.pilch-bisson.net

  • application/pgp-signature attachment: stored
Received on Sat Oct 21 14:36:19 2006

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.