index 9ac9fd9cf2e45598765aa882567a155ffcac4cd2..b50a71033a269cf34c337e20480c03a6859b4b33 100644 (file)
## 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 \
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 \
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 \
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 \
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 \
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
-
-# Copy/paste from libnr
-display/test-display-main.cpp: display/test-display.cpp
- $(top_srcdir)/cxxtest/cxxtestgen.pl --template=$(srcdir)/selfname.tpl -root -o display/test-display-main.cpp $(display_test_display_includes)
-
-display/test-display.cpp: $(display_test_display_includes)
- $(top_srcdir)/cxxtest/cxxtestgen.pl --have-eh -part -o display/test-display.cpp $(display_test_display_includes)
-
-display_test_display_includes = \
- $(srcdir)/display/bezier-utils-test.h \
+# ######################
+# ### CxxTest stuff ####
+# ######################
+CXXTEST_TESTSUITES += \
$(srcdir)/display/curve-test.h
-
-display_libtest_display_a_SOURCES = \
- display/test-display.cpp \
- $(display_test_display_includes)
-
-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)
-