diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/2geom/Makefile_insert | 231 | ||||
| -rw-r--r-- | src/Makefile.am | 14 | ||||
| -rw-r--r-- | src/Makefile_insert | 3 | ||||
| -rw-r--r-- | src/display/Makefile_insert | 3 | ||||
| -rw-r--r-- | src/extension/Makefile_insert | 1 | ||||
| -rw-r--r-- | src/extension/internal/Makefile_insert | 16 | ||||
| -rw-r--r-- | src/helper/Makefile_insert | 1 | ||||
| -rw-r--r-- | src/libgdl/Makefile_insert | 4 | ||||
| -rw-r--r-- | src/libnrtype/Makefile_insert | 1 | ||||
| -rw-r--r-- | src/livarot/Makefile_insert | 1 | ||||
| -rw-r--r-- | src/xml/Makefile_insert | 3 |
11 files changed, 142 insertions, 136 deletions
diff --git a/src/2geom/Makefile_insert b/src/2geom/Makefile_insert index e3b6fcdab..07e066df5 100644 --- a/src/2geom/Makefile_insert +++ b/src/2geom/Makefile_insert @@ -6,112 +6,129 @@ rm -f 2geom/lib2geom.a $(2geom_lib2geom_a_OBJECTS) 2geom_lib2geom_a_SOURCES = \ - 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/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/2geom.h \ + 2geom/affine.cpp \ + 2geom/affine.h \ + 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/choose.h \ + 2geom/circle-circle.cpp \ + 2geom/circle.cpp \ + 2geom/circle.h \ + 2geom/circulator.h \ + 2geom/CMakeLists.txt \ + 2geom/concepts.h \ + 2geom/conicsec.cpp \ + 2geom/conicsec.h \ + 2geom/conic_section_clipper_cr.h \ + 2geom/conic_section_clipper.h \ + 2geom/conic_section_clipper_impl.cpp \ + 2geom/conic_section_clipper_impl.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.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/linear.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.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/poly.cpp \ - 2geom/poly.h \ - 2geom/quadtree.cpp \ - 2geom/quadtree.h \ - 2geom/ray.h \ - 2geom/rect.cpp \ - 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/shape.cpp \ - 2geom/shape.h \ - 2geom/solve-bezier.cpp \ - 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.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.cpp \ - 2geom/utils.h + 2geom/curve.h \ + 2geom/curves.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/generic-interval.h \ + 2geom/generic-rect.h \ + 2geom/geom.cpp \ + 2geom/geom.h \ + 2geom/hvlinesegment.h \ + 2geom/interval.h \ + 2geom/int-interval.h \ + 2geom/int-point.h \ + 2geom/int-rect.h \ + 2geom/linear.h \ + 2geom/line.cpp \ + 2geom/line.h \ + 2geom/math-utils.h \ + 2geom/nearest-point.cpp \ + 2geom/nearest-point.h \ + 2geom/ord.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-ops.h \ + 2geom/poly.cpp \ + 2geom/poly.h \ + 2geom/quadtree.cpp \ + 2geom/quadtree.h \ + 2geom/ray.h \ + 2geom/rect.cpp \ + 2geom/rect.h \ + 2geom/recursive-bezier-intersection.cpp \ + 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/shape.cpp \ + 2geom/shape.h \ + 2geom/solve-bezier.cpp \ + 2geom/solve-bezier-one-d.cpp \ + 2geom/solve-bezier-parametric.cpp \ + 2geom/solver.h \ + 2geom/svg-elliptical-arc.cpp \ + 2geom/svg-elliptical-arc.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/toposweep.cpp \ + 2geom/toposweep.h \ + 2geom/transforms.cpp \ + 2geom/transforms.h \ + 2geom/utils.cpp \ + 2geom/utils.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/symmetric-matrix-fs.h \ + 2geom/numeric/symmetric-matrix-fs-operation.h \ + 2geom/numeric/symmetric-matrix-fs-trace.h \ + 2geom/numeric/vector.h diff --git a/src/Makefile.am b/src/Makefile.am index fc1065b34..46c655f9c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -16,9 +16,6 @@ bin_PROGRAMS = inkscape inkview # Libraries which should be compiled by "make" but not installed. # Use this only for libraries that are really standalone, rather than for # source tree subdirectories. -#if WITH_INKBOARD -#libpedro = pedro/libpedro.a -#endif if !WITH_EXT_GDL internal_GDL = libgdl/libgdl.a @@ -35,7 +32,6 @@ noinst_LIBRARIES = \ libvpsc/libvpsc.a \ livarot/libvarot.a \ 2geom/lib2geom.a \ - $(libpedro) \ libinkversion.a all_libs = \ @@ -109,11 +105,6 @@ win32ldflags = -lcomdlg32 -lmscms mwindows = -mwindows endif -if INKJAR -inkjar_dir = inkjar -inkjar_libs = inkjar/libinkjar.a -endif - # Include all partial makefiles from subdirectories include Makefile_insert include bind/Makefile_insert @@ -156,7 +147,6 @@ EXTRA_DIST += \ $(top_srcdir)/Doxyfile \ sp-skeleton.cpp sp-skeleton.h \ util/makefile.in \ - application/makefile.in \ bind/makefile.in \ debug/makefile.in \ dialogs/makefile.in \ @@ -171,11 +161,8 @@ EXTRA_DIST += \ io/makefile.in \ io/crystalegg.xml \ io/doc2html.xsl \ - pedro/makefile.in \ - jabber_whiteboard/makefile.in \ libgdl/makefile.in \ libcroco/makefile.in \ - libnr/makefile.in \ libnrtype/makefile.in \ libavoid/makefile.in \ livarot/makefile.in \ @@ -199,7 +186,6 @@ EXTRA_DIST += \ helper/sp-marshal.list \ show-preview.bmp \ winconsole.cpp \ - $(jabber_whiteboard_SOURCES) \ $(CXXTEST_TEMPLATE) # Extra files to remove when doing "make distclean" diff --git a/src/Makefile_insert b/src/Makefile_insert index 36e05270a..2d557158b 100644 --- a/src/Makefile_insert +++ b/src/Makefile_insert @@ -40,7 +40,7 @@ ink_common_sources += \ dir-util.cpp dir-util.h \ document.cpp document.h document-private.h \ document-subset.cpp document-subset.h \ - document-undo.cpp \ + document-undo.cpp document-undo.h \ doxygen-main.cpp \ draw-anchor.cpp draw-anchor.h \ draw-context.cpp draw-context.h \ @@ -61,7 +61,6 @@ ink_common_sources += \ filter-enums.cpp filter-enums.h \ fixes.cpp \ flood-context.cpp flood-context.h \ - forward.h \ gc-alloc.h \ gc-anchored.h gc-anchored.cpp \ gc-core.h \ diff --git a/src/display/Makefile_insert b/src/display/Makefile_insert index cf211108f..abbd89a68 100644 --- a/src/display/Makefile_insert +++ b/src/display/Makefile_insert @@ -47,7 +47,6 @@ ink_common_sources += \ display/guideline.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 \ @@ -107,6 +106,8 @@ ink_common_sources += \ display/sodipodi-ctrlrect.h \ display/sp-canvas.cpp \ display/sp-canvas.h \ + display/sp-canvas-item.h \ + display/sp-canvas-group.h \ display/sp-canvas-util.cpp \ display/sp-canvas-util.h \ display/sp-ctrlcurve.cpp \ diff --git a/src/extension/Makefile_insert b/src/extension/Makefile_insert index ffcee5f9a..4e75de13a 100644 --- a/src/extension/Makefile_insert +++ b/src/extension/Makefile_insert @@ -3,7 +3,6 @@ ink_common_sources += \ extension/extension.cpp \ extension/extension.h \ - extension/extension-forward.h \ extension/db.cpp \ extension/db.h \ extension/dependency.cpp \ diff --git a/src/extension/internal/Makefile_insert b/src/extension/internal/Makefile_insert index a0fda8e10..1ea6caca9 100644 --- a/src/extension/internal/Makefile_insert +++ b/src/extension/internal/Makefile_insert @@ -132,12 +132,24 @@ ink_common_sources += \ extension/internal/latex-pstricks.h \ extension/internal/latex-pstricks-out.cpp \ extension/internal/latex-pstricks-out.h \ + extension/internal/filter/bevels.h \ + extension/internal/filter/blurs.h \ + extension/internal/filter/bumps.h \ + extension/internal/filter/color.h \ + extension/internal/filter/distort.h \ + extension/internal/filter/filter.h \ + extension/internal/filter/image.h \ + extension/internal/filter/morphology.h \ + extension/internal/filter/overlays.h \ + extension/internal/filter/paint.h \ + extension/internal/filter/protrusions.h \ + extension/internal/filter/shadows.h \ + extension/internal/filter/textures.h \ + extension/internal/filter/transparency.h \ extension/internal/filter/filter-all.cpp \ extension/internal/filter/filter-file.cpp \ extension/internal/filter/filter.cpp \ extension/internal/filter/filter.h \ - extension/internal/filter/drop-shadow.h \ - extension/internal/filter/snow.h \ extension/internal/emf-win32-print.h \ extension/internal/emf-win32-print.cpp \ extension/internal/emf-win32-inout.h \ diff --git a/src/helper/Makefile_insert b/src/helper/Makefile_insert index 0efb5d6ce..2be40e0e0 100644 --- a/src/helper/Makefile_insert +++ b/src/helper/Makefile_insert @@ -12,7 +12,6 @@ ink_common_sources += \ helper/geom-nodetype.h \ helper/gnome-utils.cpp \ helper/gnome-utils.h \ - helper/helper-forward.h \ helper/png-write.cpp \ helper/png-write.h \ helper/sp-marshal.cpp \ diff --git a/src/libgdl/Makefile_insert b/src/libgdl/Makefile_insert index 788df0673..3f5228a20 100644 --- a/src/libgdl/Makefile_insert +++ b/src/libgdl/Makefile_insert @@ -3,7 +3,6 @@ if WITH_EXT_GDL EXTRA_DIST += \ - libgdl/gdl-tools.h \ libgdl/gdl-dock-object.h \ libgdl/gdl-dock-master.h \ libgdl/gdl-dock.h \ @@ -13,7 +12,6 @@ EXTRA_DIST += \ libgdl/gdl-dock-tablabel.h \ libgdl/gdl-dock-placeholder.h \ libgdl/gdl-dock-bar.h \ - libgdl/gdl-stock-icons.h \ libgdl/gdl-i18n.h \ libgdl/gdl-i18n.c \ libgdl/gdl-dock-object.c \ @@ -47,7 +45,6 @@ libgdl/clean: rm -f libgdl/libgdl.a $(libgdl_gdl_a_OBJECTS) libgdl_libgdl_a_SOURCES = \ - libgdl/gdl-tools.h \ libgdl/gdl-dock-object.h \ libgdl/gdl-dock-master.h \ libgdl/gdl-dock.h \ @@ -57,7 +54,6 @@ libgdl_libgdl_a_SOURCES = \ libgdl/gdl-dock-tablabel.h \ libgdl/gdl-dock-placeholder.h \ libgdl/gdl-dock-bar.h \ - libgdl/gdl-stock-icons.h \ libgdl/gdl-i18n.h \ libgdl/gdl-i18n.c \ libgdl/gdl-dock-object.c \ diff --git a/src/libnrtype/Makefile_insert b/src/libnrtype/Makefile_insert index 7cd99e1a8..0ce8f1fd5 100644 --- a/src/libnrtype/Makefile_insert +++ b/src/libnrtype/Makefile_insert @@ -11,7 +11,6 @@ ink_common_sources += \ libnrtype/nr-type-pos-def.h \ libnrtype/nr-type-primitives.cpp \ libnrtype/nr-type-primitives.h \ - libnrtype/nrtype-forward.h \ libnrtype/FontFactory.cpp \ libnrtype/FontFactory.h \ libnrtype/FontInstance.cpp \ diff --git a/src/livarot/Makefile_insert b/src/livarot/Makefile_insert index e4d88efd5..69078d073 100644 --- a/src/livarot/Makefile_insert +++ b/src/livarot/Makefile_insert @@ -37,6 +37,5 @@ livarot_libvarot_a_SOURCES = \ livarot/sweep-event.cpp \ livarot/sweep-event.h \ livarot/sweep-event-queue.h \ - livarot/livarot-forward.h \ livarot/path-description.h \ livarot/path-description.cpp diff --git a/src/xml/Makefile_insert b/src/xml/Makefile_insert index b10f2448b..da55d7f7e 100644 --- a/src/xml/Makefile_insert +++ b/src/xml/Makefile_insert @@ -40,8 +40,7 @@ ink_common_sources += \ xml/subtree.cpp \ xml/subtree.h \ xml/text-node.h \ - xml/invalid-operation-exception.h \ - xml/xml-forward.h + xml/invalid-operation-exception.h # ###################### # ### CxxTest stuff #### |