diff options
| author | Kees Cook <kees@outflux.net> | 2007-01-13 06:38:02 +0000 |
|---|---|---|
| committer | keescook <keescook@users.sourceforge.net> | 2007-01-13 06:38:02 +0000 |
| commit | 3b6863e9de8a4c68a639ab71538af271bc9251c2 (patch) | |
| tree | 7c4efa4ac14599242af0a758167c22954103f38d | |
| parent | stub out heavy routines during svg tests (diff) | |
| download | inkscape-3b6863e9de8a4c68a639ab71538af271bc9251c2.tar.gz inkscape-3b6863e9de8a4c68a639ab71538af271bc9251c2.zip | |
full correction for rest of test builds
(bzr r2201)
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/svg/Makefile_insert | 8 | ||||
| -rw-r--r-- | src/xml/Makefile_insert | 14 |
3 files changed, 17 insertions, 6 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 92a2202a6..c5d9138b9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -104,6 +104,7 @@ noinst_LIBRARIES = \ check_LIBRARIES = \ libnr/libtest-nr.a \ svg/libtest-svg.a \ + svg/libtest-stubs.a \ xml/libtest-xml.a DISTCLEANFILES = \ diff --git a/src/svg/Makefile_insert b/src/svg/Makefile_insert index 334957bbf..410fe7ba0 100644 --- a/src/svg/Makefile_insert +++ b/src/svg/Makefile_insert @@ -45,14 +45,15 @@ svg/test-svg.cpp: $(svg_test_svg_includes) svg/Makefile_insert svg_test_svg_includes = \ $(srcdir)/svg/css-ostringstream-test.h \ $(srcdir)/svg/stringstream-test.h \ - $(srcdir)/svg/svg-color-test.h \ - $(srcdir)/svg/test-stubs.h + $(srcdir)/svg/svg-color-test.h svg_libtest_svg_a_SOURCES = \ svg/test-svg.cpp \ - svg/test-stubs.cpp \ $(svg_test_svg_includes) +svg_libtest_stubs_a_SOURCES = \ + svg/test-stubs.cpp svg/test-stubs.h + svg_test_svg_SOURCES = \ svg/test-svg-main.cpp \ $(svg_test_svg_includes) @@ -60,4 +61,5 @@ svg_test_svg_SOURCES = \ svg_test_svg_LDADD = \ svg/libspsvg.a \ svg/libtest-svg.a \ + svg/libtest-stubs.a \ $(INKSCAPE_LIBS) diff --git a/src/xml/Makefile_insert b/src/xml/Makefile_insert index 49f97e9be..41aa13dcb 100644 --- a/src/xml/Makefile_insert +++ b/src/xml/Makefile_insert @@ -75,12 +75,20 @@ xml_test_xml_LDADD = \ xml/libtest-xml.a \ xml/libspxml.a \ util/libinkutil.a \ - libinkpost.a \ + svg/libtest-stubs.a \ $(INKSCAPE_LIBS) -xml_repr_action_test_SOURCES = xml/repr-action-test.cpp -xml_repr_action_test_LDADD = xml/libspxml.a svg/libspsvg.a util/libinkutil.a libinkpost.a debug/libinkdebug.a $(INKSCAPE_LIBS) +xml_repr_action_test_SOURCES = \ + xml/repr-action-test.cpp +xml_repr_action_test_LDADD = \ + xml/libspxml.a \ + svg/libspsvg.a \ + svg/libtest-stubs.a \ + util/libinkutil.a \ + libinkpost.a \ + debug/libinkdebug.a \ + $(INKSCAPE_LIBS) xml_quote_test_SOURCES = xml/quote-test.cpp xml_quote_test_LDADD = $(INKSCAPE_LIBS) |