merged with trunk so I can build again...

(bzr r10092.1.36)

1 files changed, 53 insertions, 59 deletions

diff --git a/src/display/Makefile_insert b/src/display/Makefile_insert
index 370e28d6d..1c7a21dae 100644
--- a/src/display/Makefile_insert
+++ b/src/display/Makefile_insert
@@ -4,80 +4,61 @@ display/canvas-arena.$(OBJEXT): helper/sp-marshal.h
 display/sp-canvas.$(OBJEXT): helper/sp-marshal.h
 
 ink_common_sources += \
-	display/nr-3dutils.h \
-	display/nr-3dutils.cpp \
-	display/nr-arena-forward.h	\
-	display/nr-arena.cpp	\
-	display/nr-arena.h	\
-	display/nr-arena-item.cpp	\
-	display/nr-arena-item.h	\
-	display/nr-arena-group.cpp	\
-	display/nr-arena-group.h	\
-	display/nr-arena-image.cpp	\
-	display/nr-arena-image.h	\
-	display/nr-arena-shape.cpp	\
-	display/nr-arena-shape.h	\
-	display/nr-arena-glyphs.cpp	\
-	display/nr-arena-glyphs.h	\
+	display/cairo-templates.h	\
+	display/cairo-utils.cpp	\
+	display/cairo-utils.h	\
 	display/canvas-arena.cpp	\
 	display/canvas-arena.h	\
+	display/canvas-axonomgrid.cpp	\
+	display/canvas-axonomgrid.h	\
 	display/canvas-bpath.cpp	\
 	display/canvas-bpath.h	\
 	display/canvas-grid.cpp	\
 	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/canvas-text.h	\
 	display/canvas-text.cpp	\
+	display/canvas-text.h	\
 	display/curve.cpp	\
 	display/curve.h	\
+	display/drawing.cpp \
+	display/drawing.h \
+	display/drawing-context.cpp \
+	display/drawing-context.h \
+	display/drawing-group.cpp \
+	display/drawing-group.h \
+	display/drawing-image.cpp \
+	display/drawing-image.h \
+	display/drawing-item.cpp \
+	display/drawing-item.h \
+	display/drawing-shape.cpp \
+	display/drawing-shape.h \
+	display/drawing-surface.cpp \
+	display/drawing-surface.h \
+	display/drawing-text.cpp \
+	display/drawing-text.h \
 	display/gnome-canvas-acetate.cpp	\
 	display/gnome-canvas-acetate.h	\
 	display/grayscale.cpp	\
 	display/grayscale.h	\
 	display/guideline.cpp	\
 	display/guideline.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	\
-	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.h             \
+	display/nr-3dutils.cpp \
+	display/nr-3dutils.h \
+	display/nr-arena-forward.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-composite.h	\
 	display/nr-filter-convolve-matrix.cpp	\
 	display/nr-filter-convolve-matrix.h	\
+	display/nr-filter.cpp           \
 	display/nr-filter-diffuselighting.cpp     \
 	display/nr-filter-diffuselighting.h       \
 	display/nr-filter-displacement-map.cpp      \
@@ -86,8 +67,7 @@ ink_common_sources += \
 	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.h             \
 	display/nr-filter-image.cpp	\
 	display/nr-filter-image.h	\
 	display/nr-filter-merge.cpp	\
@@ -106,21 +86,35 @@ ink_common_sources += \
 	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-units.h	\
 	display/nr-filter-utils.cpp     \
-	display/pixblock-scaler.cpp     \
-	display/pixblock-scaler.h       \
-	display/pixblock-transform.cpp  \
-	display/pixblock-transform.h    \
-	display/inkscape-cairo.cpp      \
-	display/inkscape-cairo.h		\
-	display/nr-light.h				\
+	display/nr-filter-utils.h       \
 	display/nr-light.cpp			\
-	display/nr-light-types.h
+	display/nr-light.h				\
+	display/nr-light-types.h	\
+	display/nr-style.cpp	\
+	display/nr-style.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	\
+	display/sodipodi-ctrlrect.h	\
+	display/sp-canvas.cpp	\
+	display/sp-canvas.h	\
+	display/sp-canvas-util.cpp	\
+	display/sp-canvas-util.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
 
 # ######################
 # ### CxxTest stuff ####