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

[inkscape.git] / src / display / Makefile_insert

diff --git a/src/display/Makefile_insert b/src/display/Makefile_insert
index 4994434d73e4158a42fdda4bcef670e45639d0fe..e6877ccfb61dc20fa9b2de946ce7fc20da45b1bb 100644 (file)
--- a/src/display/Makefile_insert
+++ b/src/display/Makefile_insert
@@ -40,6 +40,10 @@ display_libspdisplay_a_SOURCES = \
        display/canvas-grid.h   \
        display/canvas-axonomgrid.cpp   \
        display/canvas-axonomgrid.h     \
+       display/canvas-temporary-item.cpp       \
+       display/canvas-temporary-item.h \
+       display/canvas-temporary-item-list.cpp  \
+       display/canvas-temporary-item-list.h    \
        display/curve.cpp       \
        display/curve.h \
        display/display-forward.h       \
@@ -51,6 +55,11 @@ display_libspdisplay_a_SOURCES = \
        display/nr-plain-stuff-gdk.h    \
        display/nr-plain-stuff.cpp      \
        display/nr-plain-stuff.h        \
+       display/nr-svgfonts.cpp         \
+       display/nr-svgfonts.h           \
+       display/rendermode.h            \
+       display/snap-indicator.cpp      \
+       display/snap-indicator.h        \
        display/sodipodi-ctrl.cpp       \
        display/sodipodi-ctrl.h \
        display/sodipodi-ctrlrect.cpp   \
@@ -119,5 +128,22 @@ display_libspdisplay_a_SOURCES = \
        display/nr-light.cpp                    \
        display/nr-light-types.h
 
-display_bezier_utils_test_SOURCES = display/bezier-utils-test.cpp
-display_bezier_utils_test_LDADD = libnr/libnr.a -lglib-2.0
+# ######################
+# ### CxxTest stuff ####
+# ######################
+ddislay_testsuites = \
+       $(srcdir)/display/bezier-utils-test.h \
+       $(srcdir)/display/curve-test.h
+
+display_test_display_SOURCES = \
+       display/test-display-main.cpp \
+       $(display_test_display_includes)
+
+display_test_display_LDADD = \
+       libnr/libnr.a \
+       display/libtest-display.a \
+       $(inkscape_private_libs) \
+       $(INKSCAPE_LIBS)
+
+display/test-display.cpp: $(dislay_testsuites) display/Makefile_insert $(CXXTEST_TEMPLATE)
+       $(CXXTESTGEN) -o display/test-display.cpp $(dislay_testsuites)