Merge from trunk

(bzr r9508.1.73)

1 files changed, 57 insertions, 56 deletions

diff --git a/src/2geom/Makefile_insert b/src/2geom/Makefile_insert
index 7ded3a637..4f7c3b6ef 100644
--- a/src/2geom/Makefile_insert
+++ b/src/2geom/Makefile_insert
@@ -6,109 +6,110 @@
 	rm -f 2geom/lib2geom.a $(2geom_lib2geom_a_OBJECTS)
 
 2geom_lib2geom_a_SOURCES = \
-	2geom/basic-intersection.cpp	\
-	2geom/bezier-clipping.cpp	\
-	2geom/utils.cpp	\
-	2geom/bezier-utils.cpp	\
-	2geom/circle-circle.cpp	\
-	2geom/circle.cpp	\
-	2geom/circle.h	\
-	2geom/conjugate_gradient.cpp	\
-	2geom/convex-cover.cpp	\
-	2geom/crossing.cpp	\
-	2geom/curve-helpers.cpp	\
-	2geom/d2-sbasis.cpp	\
-	2geom/ellipse.cpp	\
-	2geom/elliptical-arc.cpp	\
-	2geom/geom.cpp	\
-	2geom/line.cpp	\
-	2geom/matrix.cpp	\
-	2geom/nearest-point.cpp	\
-	2geom/path-intersection.cpp	\
-	2geom/path.cpp	\
-	2geom/pathvector.cpp	\
-	2geom/piecewise.cpp	\
-	2geom/point.cpp	\
-	2geom/poly.cpp	\
-	2geom/quadtree.cpp	\
-	2geom/region.cpp	\
-	2geom/sbasis-2d.cpp	\
-	2geom/sbasis-geometric.cpp	\
-	2geom/sbasis-math.cpp	\
-	2geom/sbasis-poly.cpp	\
-	2geom/sbasis-roots.cpp	\
-	2geom/sbasis-to-bezier.cpp	\
-	2geom/sbasis.cpp	\
-	2geom/shape.cpp	\
-	2geom/solve-bezier-one-d.cpp	\
-	2geom/solve-bezier-parametric.cpp	\
-	2geom/svg-elliptical-arc.cpp	\
-	2geom/svg-path-parser.cpp	\
-	2geom/svg-path.cpp	\
-	2geom/sweep.cpp	\
-	2geom/transforms.cpp	\
+	2geom/affine.h	\
+	2geom/affine.cpp	\
 	2geom/angle.h	\
+	2geom/basic-intersection.cpp	\
 	2geom/basic-intersection.h	\
+	2geom/bezier-clipping.cpp	\
+	2geom/bezier-curve.cpp	\
 	2geom/bezier-curve.h	\
+	2geom/bezier.h	\
 	2geom/bezier-to-sbasis.h	\
+	2geom/bezier-utils.cpp	\
 	2geom/bezier-utils.h	\
-	2geom/bezier.h	\
 	2geom/choose.h	\
+	2geom/circle-circle.cpp	\
+	2geom/circle.cpp	\
+	2geom/circle.h	\
 	2geom/circulator.h	\
 	2geom/concepts.h	\
+	2geom/conjugate_gradient.cpp	\
 	2geom/conjugate_gradient.h	\
+	2geom/convex-cover.cpp	\
 	2geom/convex-cover.h	\
 	2geom/coord.h	\
+	2geom/crossing.cpp	\
 	2geom/crossing.h	\
+	2geom/curve.cpp \
 	2geom/curve.h	\
 	2geom/curves.h	\
-	2geom/d2-sbasis.h	\
 	2geom/d2.h	\
+	2geom/d2-sbasis.cpp	\
+	2geom/d2-sbasis.h	\
+	2geom/ellipse.cpp	\
 	2geom/ellipse.h	\
+	2geom/elliptical-arc.cpp	\
 	2geom/elliptical-arc.h	\
 	2geom/exception.h	\
 	2geom/forward.h	\
+	2geom/geom.cpp	\
 	2geom/geom.h	\
 	2geom/hvlinesegment.h	\
 	2geom/interval.h	\
 	2geom/isnan.h	\
-	2geom/line.h	\
 	2geom/linear.h	\
-	2geom/matrix.h	\
+	2geom/line.cpp	\
+	2geom/line.h	\
+	2geom/nearest-point.cpp	\
 	2geom/nearest-point.h	\
+	2geom/numeric/fitting-model.h	\
+	2geom/numeric/fitting-tool.h	\
+	2geom/numeric/linear_system.h	\
+	2geom/numeric/matrix.cpp	\
+	2geom/numeric/matrix.h	\
+	2geom/numeric/vector.h	\
 	2geom/ord.h	\
-	2geom/path-intersection.h	\
+	2geom/path.cpp	\
 	2geom/path.h	\
+	2geom/path-intersection.cpp	\
+	2geom/path-intersection.h	\
+	2geom/pathvector.cpp	\
 	2geom/pathvector.h	\
+	2geom/piecewise.cpp	\
 	2geom/piecewise.h	\
+	2geom/point.cpp	\
+	2geom/point.h	\
 	2geom/point-l.h	\
 	2geom/point-ops.h	\
-	2geom/point.h	\
+	2geom/poly.cpp	\
 	2geom/poly.h	\
+	2geom/quadtree.cpp	\
 	2geom/quadtree.h	\
 	2geom/ray.h	\
 	2geom/rect.h	\
+	2geom/region.cpp	\
 	2geom/region.h	\
+	2geom/sbasis-2d.cpp	\
 	2geom/sbasis-2d.h	\
+	2geom/sbasis.cpp	\
 	2geom/sbasis-curve.h	\
+	2geom/sbasis-geometric.cpp	\
 	2geom/sbasis-geometric.h	\
+	2geom/sbasis.h	\
+	2geom/sbasis-math.cpp	\
 	2geom/sbasis-math.h	\
+	2geom/sbasis-poly.cpp	\
 	2geom/sbasis-poly.h	\
+	2geom/sbasis-roots.cpp	\
+	2geom/sbasis-to-bezier.cpp	\
 	2geom/sbasis-to-bezier.h	\
-	2geom/sbasis.h	\
+	2geom/shape.cpp	\
 	2geom/shape.h	\
+	2geom/solve-bezier-one-d.cpp	\
+	2geom/solve-bezier-parametric.cpp	\
 	2geom/solver.h	\
 	2geom/sturm.h	\
+	2geom/svg-elliptical-arc.cpp	\
 	2geom/svg-elliptical-arc.h	\
-	2geom/svg-path-parser.h	\
+	2geom/svg-path.cpp	\
 	2geom/svg-path.h	\
+	2geom/svg-path-parser.cpp	\
+	2geom/svg-path-parser.h	\
+	2geom/sweep.cpp	\
 	2geom/sweep.h	\
+	2geom/transforms.cpp	\
 	2geom/transforms.h	\
-	2geom/utils.h	\
-	2geom/numeric/matrix.cpp	\
-	2geom/numeric/fitting-model.h	\
-	2geom/numeric/fitting-tool.h	\
-	2geom/numeric/linear_system.h	\
-	2geom/numeric/matrix.h	\
-	2geom/numeric/vector.h
+	2geom/utils.cpp	\
+	2geom/utils.h