Simplify "make check" makefile rules and remove most of the obsolete

[inkscape.git] / src / util / Makefile_insert

diff --git a/src/util/Makefile_insert b/src/util/Makefile_insert
index e4a89d046212c8070c0773bd190aac6d20d6e85e..c3ac0be0bafe4d8ebf60d84b5e7d696eef87b694 100644 (file)
--- a/src/util/Makefile_insert
+++ b/src/util/Makefile_insert
@@ -24,28 +24,21 @@ util_libinkutil_a_SOURCES = \
        util/units.cpp \
        util/units.h
 
-util_list_container_test_SOURCES = util/list-container-test.cpp
-util_list_container_test_LDADD = gc.o $(INKSCAPE_LIBS)
+# ######################
+# ### CxxTest stuff ####
+# ######################
 
-# Copy/paste from libnr
-util/test-util-main.cpp: util/test-util.cpp
-       $(top_srcdir)/cxxtest/cxxtestgen.pl --template=$(srcdir)/selfname.tpl -root -o util/test-util-main.cpp $(util_test_util_includes)
-
-util/test-util.cpp: $(util_test_util_includes)
-       $(top_srcdir)/cxxtest/cxxtestgen.pl --have-eh -part -o util/test-util.cpp $(util_test_util_includes)
-
-util_test_util_includes = \
+util_testsuites = \
        $(srcdir)/util/list-container-test.h
 
-util_libtest_util_a_SOURCES = \
-       util/test-util.cpp \
-       $(util_test_util_includes)
-
 util_test_util_SOURCES = \
-       util/test-util-main.cpp \
-       $(util_test_util_includes)
+       util/test-util.cpp \
+       $(util_testsuites)
 
 util_test_util_LDADD = \
-       util/libtest-util.a \
-       gc.o $(INKSCAPE_LIBS)
+       util/libtest-util.a     \
+       gc.o                    \
+       $(INKSCAPE_LIBS)
 
+util/test-util.cpp: $(util_testsuites) util/Makefile_insert $(CXXTEST_TEMPLATE)
+       $(CXXTESTGEN) -o util/test-util.cpp $(util_testsuites)