diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2008-12-08 00:11:20 +0000 |
|---|---|---|
| committer | tweenk <tweenk@users.sourceforge.net> | 2008-12-08 00:11:20 +0000 |
| commit | ffb6eee3a49ac19f4e36ea26f829c352c621a811 (patch) | |
| tree | f02cec82e6e167f2dbf35cfa40d338c96eb59b46 /src | |
| parent | Bug #167682 (resizing page must also resize viewBox) (diff) | |
| download | inkscape-ffb6eee3a49ac19f4e36ea26f829c352c621a811.tar.gz inkscape-ffb6eee3a49ac19f4e36ea26f829c352c621a811.zip | |
Partial fix for "make check" compilation failure.
(bzr r6969)
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/helper/Makefile_insert | 2 | ||||
| -rw-r--r-- | src/svg/Makefile_insert | 17 | ||||
| -rw-r--r-- | src/svg/css-ostringstream-test.h | 4 |
4 files changed, 6 insertions, 18 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index c6b58bce8..b1df01074 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -124,7 +124,6 @@ check_LIBRARIES = \ helper/libtest-helper.a \ libnr/libtest-nr.a \ svg/libtest-svg.a \ - svg/libtest-stubs.a \ util/libtest-util.a \ xml/libtest-xml.a diff --git a/src/helper/Makefile_insert b/src/helper/Makefile_insert index 195ca2632..bf8128110 100644 --- a/src/helper/Makefile_insert +++ b/src/helper/Makefile_insert @@ -56,7 +56,7 @@ helper/sp-marshal.cpp: helper/sp-marshal.list helper/sp-marshal.h then rm helper/tmp.sp-marshal.cpp; \ else mv helper/tmp.sp-marshal.cpp helper/sp-marshal.cpp; fi -helper/sp-marshal.cpp helper/sp-marshal.h: Makefile +helper/sp-marshal.cpp helper/sp-marshal.h: helper/sp-marshal.list helper_units_test_SOURCES = helper/units-test.cpp helper_units_test_LDADD = helper/libspchelp.a -lglib-2.0 diff --git a/src/svg/Makefile_insert b/src/svg/Makefile_insert index 6a6c7bcd2..0c59677fa 100644 --- a/src/svg/Makefile_insert +++ b/src/svg/Makefile_insert @@ -52,27 +52,12 @@ svg_test_svg_includes = \ svg_libtest_svg_a_SOURCES = \ svg/test-svg.cpp \ - preferences.cpp \ - sp-object.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) svg_test_svg_LDADD = \ - svg/libspsvg.a \ svg/libtest-svg.a \ - svg/libtest-stubs.a \ - 2geom/lib2geom.a \ - libnr/libnr.a \ - xml/libspxml.a \ - util/libinkutil.a \ - io/libio.a \ - libinkpost.a \ - debug/libinkdebug.a \ - libcroco/libcroco.a \ - $(INKSCAPE_LIBS) + $(all_libs) diff --git a/src/svg/css-ostringstream-test.h b/src/svg/css-ostringstream-test.h index 295bf4bf3..ffe15ee9a 100644 --- a/src/svg/css-ostringstream-test.h +++ b/src/svg/css-ostringstream-test.h @@ -1,6 +1,10 @@ #include <cxxtest/TestSuite.h> #include "svg/css-ostringstream.h" +// dummy functions to prevent link errors +int sp_main_gui(int argc, char const **argv) { return 0; } +int sp_main_console(int argc, char const **argv) { return 0; } + template<typename T> static void css_test_datum(T const x, std::string const &exp_str) |