Partial fix for "make check" compilation failure.

diff --git a/src/Makefile.am b/src/Makefile.am
index c6b58bce8ce7cfd6e141eb7f2929dc0fed215047..b1df010747a3802879ac1e936de85eac7e137957 100644 (file)
--- 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 195ca26328ee2c38bd61c315a36fe2c5e8b7ddee..bf8128110b98bf088f6ea10eaa336b5e6f34c3c5 100644 (file)
--- 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 6a6c7bcd2edc91706ce2402e80f84060bf26eec1..0c59677fa2c9d633fc2dba58a7e6c9f8e63d68d0 100644 (file)
--- 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 295bf4bf3f6fe196fbdc759d437bf2702e60a122..ffe15ee9af9dec7eb03d8afbde7f7d7fc94715d6 100644 (file)
--- 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)