Split SPCanvasItem and SPCanvasGroup to individual .h files. Removed forward header.

[inkscape.git] / src / display / Makefile_insert

diff --git a/src/display/Makefile_insert b/src/display/Makefile_insert
index 5c7fd892eb7149a6660fe75ba77f3828c919a836..b50a71033a269cf34c337e20480c03a6859b4b33 100644 (file)
--- a/src/display/Makefile_insert
+++ b/src/display/Makefile_insert
@@ -1,20 +1,9 @@
 ## Makefile.am fragment sourced by src/Makefile.am.
-#
-# Sodipodi GnomeCanvas objects
-# Author: Lauris Kaplinski <lauris@ariman.ee>
-#
-# Here are major objects, used for displaying things
-#
-
-display/all: display/libspdisplay.a
-
-display/clean:
-       rm -f display/libspdisplay.a $(display_libspdisplay_a_OBJECTS)
 
 display/canvas-arena.$(OBJEXT): helper/sp-marshal.h
 display/sp-canvas.$(OBJEXT): helper/sp-marshal.h
 
-display_libspdisplay_a_SOURCES = \
+ink_common_sources += \
        display/nr-3dutils.h \
        display/nr-3dutils.cpp \
        display/nr-arena-forward.h      \
@@ -32,8 +21,6 @@ display_libspdisplay_a_SOURCES = \
        display/nr-arena-glyphs.h       \
        display/canvas-arena.cpp        \
        display/canvas-arena.h  \
-       display/bezier-utils.cpp        \
-       display/bezier-utils.h  \
        display/canvas-bpath.cpp        \
        display/canvas-bpath.h  \
        display/canvas-grid.cpp \
@@ -44,9 +31,10 @@ display_libspdisplay_a_SOURCES = \
        display/canvas-temporary-item.h \
        display/canvas-temporary-item-list.cpp  \
        display/canvas-temporary-item-list.h    \
+       display/canvas-text.h   \
+       display/canvas-text.cpp \
        display/curve.cpp       \
        display/curve.h \
-       display/display-forward.h       \
        display/gnome-canvas-acetate.cpp        \
        display/gnome-canvas-acetate.h  \
        display/guideline.cpp   \
@@ -64,12 +52,16 @@ display_libspdisplay_a_SOURCES = \
        display/sodipodi-ctrl.h \
        display/sodipodi-ctrlrect.cpp   \
        display/sodipodi-ctrlrect.h     \
+       display/sp-canvas-group.h       \
+       display/sp-canvas-item.h        \
        display/sp-canvas-util.cpp      \
        display/sp-canvas-util.h        \
        display/sp-canvas.cpp   \
        display/sp-canvas.h     \
        display/sp-ctrlline.cpp \
        display/sp-ctrlline.h \
+       display/sp-ctrlpoint.cpp        \
+       display/sp-ctrlpoint.h \
        display/sp-ctrlquadr.cpp \
        display/sp-ctrlquadr.h \
        display/nr-filter.cpp           \
@@ -86,16 +78,16 @@ display_libspdisplay_a_SOURCES = \
        display/nr-filter-convolve-matrix.h     \
        display/nr-filter-diffuselighting.cpp     \
        display/nr-filter-diffuselighting.h       \
-    display/nr-filter-displacement-map.cpp      \
-    display/nr-filter-displacement-map.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-image.cpp     \
+       display/nr-filter-image.h       \
        display/nr-filter-merge.cpp     \
        display/nr-filter-merge.h       \
        display/nr-filter-morphology.cpp        \
@@ -128,5 +120,8 @@ 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 ####
+# ######################
+CXXTEST_TESTSUITES += \
+       $(srcdir)/display/curve-test.h