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 624733a42f2efbf3b9e7183f3186f541ec33dc82..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       \
@@ -47,12 +51,15 @@ display_libspdisplay_a_SOURCES = \
        display/gnome-canvas-acetate.h  \
        display/guideline.cpp   \
        display/guideline.h     \
-       display/nr-gradient-gpl.cpp     \
-       display/nr-gradient-gpl.h       \
        display/nr-plain-stuff-gdk.cpp  \
        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   \
@@ -69,6 +76,10 @@ display_libspdisplay_a_SOURCES = \
        display/nr-filter.h             \
        display/nr-filter-blend.cpp     \
        display/nr-filter-blend.h       \
+       display/nr-filter-colormatrix.cpp       \
+       display/nr-filter-colormatrix.h \
+       display/nr-filter-component-transfer.cpp        \
+       display/nr-filter-component-transfer.h  \
        display/nr-filter-composite.h   \
        display/nr-filter-composite.cpp \
        display/nr-filter-convolve-matrix.cpp   \
@@ -77,12 +88,18 @@ display_libspdisplay_a_SOURCES = \
        display/nr-filter-diffuselighting.h       \
     display/nr-filter-displacement-map.cpp      \
     display/nr-filter-displacement-map.h        \
+       display/nr-filter-flood.cpp  \
+       display/nr-filter-flood.h    \
        display/nr-filter-gaussian.cpp  \
        display/nr-filter-gaussian.h    \
        display/nr-filter-getalpha.cpp  \
        display/nr-filter-getalpha.h    \
     display/nr-filter-image.cpp        \
     display/nr-filter-image.h  \
+       display/nr-filter-merge.cpp     \
+       display/nr-filter-merge.h       \
+       display/nr-filter-morphology.cpp        \
+       display/nr-filter-morphology.h  \
        display/nr-filter-offset.cpp    \
        display/nr-filter-offset.h      \
        display/nr-filter-primitive.cpp \
@@ -91,10 +108,14 @@ display_libspdisplay_a_SOURCES = \
        display/nr-filter-slot.h        \
        display/nr-filter-specularlighting.cpp     \
        display/nr-filter-specularlighting.h       \
+       display/nr-filter-tile.cpp      \
+       display/nr-filter-tile.h        \
        display/nr-filter-turbulence.cpp      \
        display/nr-filter-turbulence.h        \
        display/nr-filter-pixops.h      \
        display/nr-filter-types.h       \
+       display/nr-filter-units.h       \
+       display/nr-filter-units.cpp     \
        display/nr-filter-utils.h       \
        display/nr-filter-utils.cpp     \
        display/pixblock-scaler.cpp     \
@@ -107,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)