* src/Makefile_insert, src/Makefile.am, src/svg/Makefile_insert,

      src/xml/Makefile_insert, src/libnr/Makefile_insert:
      Add "$(srcdir)/" to some things so that "make check" works in
      the case that the build directory is somewhere other than the
      source directory.

diff --git a/ChangeLog b/ChangeLog
index 615203404a570a37a5f73a86081bce5286feece2..dcc9e1e829de181c14b2f4e693100d573faba8fb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2006-07-13  Michael Wybrow  <mjwybrow@users.sourceforge.net>
 
+       * src/Makefile_insert, src/Makefile.am, src/svg/Makefile_insert,
+         src/xml/Makefile_insert, src/libnr/Makefile_insert:
+         Add "$(srcdir)/" to some things so that "make check" works in 
+         the case that the build directory is somewhere other than the
+         source directory.
+
        * src/sp-conn-end-pair.cpp, src/connector-context.cpp,
          src/document.cpp, src/libavoid/*:
          Update libavoid with upstream fixes, optimisations and new features.

diff --git a/src/Makefile.am b/src/Makefile.am
index f69bb9bf142b3ac9aee7b28999c96d82cca0a581..2a0e10c8fbbe2c7654cb0971ec25cfa1967958b5 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -226,7 +226,7 @@ test-all.cpp: \
                $(svg_test_svg_includes)        \
                $(xml_test_xml_includes)        \
                $(test_all_includes)
-       $(top_srcdir)/cxxtest/cxxtestgen.pl --template=selfname.tpl -root -o test-all.cpp       \
+       $(top_srcdir)/cxxtest/cxxtestgen.pl --template=$(srcdir)/selfname.tpl -root -o test-all.cpp     \
                $(libnr_test_nr_includes)       \
                $(svg_test_svg_includes)        \
                $(xml_test_xml_includes)        \

diff --git a/src/Makefile_insert b/src/Makefile_insert
index b136a55e6012c6c61bd85dd831b8a86e4bf87b19..e096ef5e4304500dc61dc531cc8061a64d2e1c30 100644 (file)
--- a/src/Makefile_insert
+++ b/src/Makefile_insert
@@ -342,17 +342,17 @@ inkscape_version.h: ../configure.ac
        echo '#define INKSCAPE_VERSION "$(VERSION)"' > inkscape_version.h
 
 test_all_includes = \
-               attributes-test.h       \
-               color-profile-test.h    \
-                MultiPrinter.h  \
-                TRPIFormatter.h \
-                PylogFormatter.h \
-               dir-util-test.h \
-               extract-uri-test.h      \
-               mod360-test.h   \
-               round-test.h    \
-               sp-gradient-test.h      \
-               sp-style-elem-test.h    \
-               style-test.h    \
-                test-helpers.h  \
-               verbs-test.h
+               $(srcdir)/attributes-test.h     \
+               $(srcdir)/color-profile-test.h  \
+               $(srcdir)/MultiPrinter.h  \
+               $(srcdir)/TRPIFormatter.h \
+               $(srcdir)/PylogFormatter.h \
+               $(srcdir)/dir-util-test.h       \
+               $(srcdir)/extract-uri-test.h    \
+               $(srcdir)/mod360-test.h \
+               $(srcdir)/round-test.h  \
+               $(srcdir)/sp-gradient-test.h    \
+               $(srcdir)/sp-style-elem-test.h  \
+               $(srcdir)/style-test.h  \
+               $(srcdir)/test-helpers.h  \
+               $(srcdir)/verbs-test.h

diff --git a/src/libnr/Makefile_insert b/src/libnr/Makefile_insert
index 004a221be1f2f2437ea0bdc37995031b0235d9cd..72e5b56e7668cbc0e47bbe770d8522b953ec3baa 100644 (file)
--- a/src/libnr/Makefile_insert
+++ b/src/libnr/Makefile_insert
@@ -111,7 +111,7 @@ libnr_testnr_LDADD =        \
 
 
 libnr/test-nr-main.cpp: libnr/test-nr.cpp
-       $(top_srcdir)/cxxtest/cxxtestgen.pl --template=selfname.tpl -root -o libnr/test-nr-main.cpp $(libnr_test_nr_includes)
+       $(top_srcdir)/cxxtest/cxxtestgen.pl --template=$(srcdir)/selfname.tpl -root -o libnr/test-nr-main.cpp $(libnr_test_nr_includes)
 
 libnr/test-nr.cpp: $(libnr_test_nr_includes)
        $(top_srcdir)/cxxtest/cxxtestgen.pl -part -o libnr/test-nr.cpp $(libnr_test_nr_includes)

diff --git a/src/svg/Makefile_insert b/src/svg/Makefile_insert
index 089bc875f848d434aa792fb79c4bd481d3974319..40af90e65f1fc0d3f08c9eb6290109b1d04d2db9 100644 (file)
--- a/src/svg/Makefile_insert
+++ b/src/svg/Makefile_insert
@@ -37,7 +37,7 @@ svg_libspsvg_a_SOURCES =      \
 # This CxxTest stuff is adapted blindly from libnr/Makefile_insert.
 # It would be nice to reduce the amount of boilerplate / copy&paste here.
 svg/test-svg-main.cpp: svg/test-svg.cpp
-       $(top_srcdir)/cxxtest/cxxtestgen.pl --template=selfname.tpl -root -o svg/test-svg-main.cpp $(svg_test_svg_includes)
+       $(top_srcdir)/cxxtest/cxxtestgen.pl --template=$(srcdir)/selfname.tpl -root -o svg/test-svg-main.cpp $(svg_test_svg_includes)
 
 svg/test-svg.cpp: $(svg_test_svg_includes) svg/Makefile_insert
        $(top_srcdir)/cxxtest/cxxtestgen.pl -part -o svg/test-svg.cpp $(svg_test_svg_includes)