summaryrefslogtreecommitdiffstats
path: root/src/util/Makefile_insert
diff options
context:
space:
mode:
authorKrzysztof Kosi??ski <tweenk.pl@gmail.com>2008-12-09 00:06:13 +0000
committertweenk <tweenk@users.sourceforge.net>2008-12-09 00:06:13 +0000
commited0c006e81c69fbed16181c512c55190d998892e (patch)
tree37e6c6d558eceb3e7b4ac9f5ac3aaac41b854863 /src/util/Makefile_insert
parentfix for Bug #234305 (paste into transformed groups) (diff)
downloadinkscape-ed0c006e81c69fbed16181c512c55190d998892e.tar.gz
inkscape-ed0c006e81c69fbed16181c512c55190d998892e.zip
Simplify "make check" makefile rules and remove most of the obsolete
utest-based tests. (bzr r6976)
Diffstat (limited to 'src/util/Makefile_insert')
-rw-r--r--src/util/Makefile_insert29
1 files changed, 11 insertions, 18 deletions
diff --git a/src/util/Makefile_insert b/src/util/Makefile_insert
index e4a89d046..c3ac0be0b 100644
--- 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)