summaryrefslogtreecommitdiffstats
path: root/src/libnr/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/libnr/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/libnr/Makefile_insert')
-rw-r--r--src/libnr/Makefile_insert71
1 files changed, 19 insertions, 52 deletions
diff --git a/src/libnr/Makefile_insert b/src/libnr/Makefile_insert
index 21cce1ea2..f77475e6c 100644
--- a/src/libnr/Makefile_insert
+++ b/src/libnr/Makefile_insert
@@ -93,6 +93,7 @@ libnr_libnr_a_SOURCES = \
libnr/nr-values.h \
$(libnr_mmx_sources)
+# Ancient performance test (?)
libnr_testnr_SOURCES = \
libnr/testnr.cpp
@@ -100,63 +101,29 @@ libnr_testnr_LDADD = \
libnr/libnr.a \
-lglib-2.0
-
-libnr/test-nr-main.cpp: libnr/test-nr.cpp
- $(top_srcdir)/cxxtest/cxxtestgen.pl --template=$(srcdir)/selfname.tpl -root -o libnr/test-nr-main.cpp $(libnr_test_nr_includes)
-
-libnr/test-nr.cpp: $(libnr_test_nr_includes)
- $(top_srcdir)/cxxtest/cxxtestgen.pl --have-eh -part -o libnr/test-nr.cpp $(libnr_test_nr_includes)
-
-libnr_test_nr_includes = \
+# ######################
+# ### CxxTest stuff ####
+# ######################
+libnr_testsuites = \
+ $(srcdir)/libnr/in-svg-plane-test.h \
$(srcdir)/libnr/nr-compose-test.h \
- $(srcdir)/libnr/nr-types-test.h \
- $(srcdir)/libnr/nr-translate-test.h \
- $(srcdir)/libnr/nr-rotate-test.h \
- $(srcdir)/libnr/nr-scale-test.h \
+ $(srcdir)/libnr/nr-matrix-test.h \
$(srcdir)/libnr/nr-point-fns-test.h \
+ $(srcdir)/libnr/nr-rotate-test.h \
$(srcdir)/libnr/nr-rotate-fns-test.h \
- $(srcdir)/libnr/in-svg-plane-test.h \
- $(srcdir)/libnr/nr-matrix-test.h
-
-libnr_libtest_nr_a_SOURCES = \
- libnr/test-nr.cpp \
- libnr/nr-compose-reference.cpp \
- libnr/nr-compose-reference.h \
- $(libnr_test_nr_includes)
+ $(srcdir)/libnr/nr-scale-test.h \
+ $(srcdir)/libnr/nr-translate-test.h \
+ $(srcdir)/libnr/nr-types-test.h
libnr_test_nr_SOURCES = \
- libnr/test-nr-main.cpp \
- $(libnr_test_nr_includes)
+ libnr/test-nr.cpp \
+ $(libnr_testsuites)
-libnr_test_nr_LDADD = \
- libnr/libnr.a \
- libnr/libtest-nr.a \
- 2geom/lib2geom.a \
+libnr_test_nr_LDADD = \
+ libnr/libnr.a \
+ libnr/nr-compose-reference.o \
+ 2geom/lib2geom.a \
-lglib-2.0
-# -L/usr/X11R6/lib
-# -lX11
-
-libnr_in_svg_plane_test_SOURCES = libnr/in-svg-plane-test.cpp
-libnr_in_svg_plane_test_LDADD = libnr/libnr.a 2geom/lib2geom.a -lglib-2.0
-
-libnr_nr_types_test_SOURCES = libnr/nr-types-test.cpp
-libnr_nr_types_test_LDADD = libnr/libnr.a -lglib-2.0
-
-libnr_nr_point_fns_test_SOURCES = libnr/nr-point-fns-test.cpp
-libnr_nr_point_fns_test_LDADD = libnr/libnr.a -lglib-2.0
-
-libnr_nr_matrix_test_SOURCES = libnr/nr-matrix-test.cpp
-libnr_nr_matrix_test_LDADD = libnr/libnr.a -lglib-2.0
-
-libnr_nr_rotate_test_SOURCES = libnr/nr-rotate-test.cpp
-libnr_nr_rotate_test_LDADD = libnr/libnr.a -lglib-2.0
-
-libnr_nr_rotate_fns_test_SOURCES = libnr/nr-rotate-fns-test.cpp
-libnr_nr_rotate_fns_test_LDADD = libnr/libnr.a -lglib-2.0
-
-libnr_nr_scale_test_SOURCES = libnr/nr-scale-test.cpp
-libnr_nr_scale_test_LDADD = libnr/libnr.a -lglib-2.0
-
-libnr_nr_translate_test_SOURCES = libnr/nr-translate-test.cpp
-libnr_nr_translate_test_LDADD = libnr/libnr.a -lglib-2.0
+libnr/test-nr.cpp: $(libnr_testsuites) libnr/Makefile_insert $(CXXTEST_TEMPLATE)
+ $(CXXTESTGEN) -o libnr/test-nr.cpp $(libnr_testsuites)