Only build static libraries for subdirs than actually contain libraries,

rather than for every subdirectory.

diff --git a/src/Makefile.am b/src/Makefile.am
index 44b885ab0e428bd2ba4d45819c462cbcfc637a4e..dece3edcfe9e4c2fefdbece3159c6edf11a728a9 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,6 +13,21 @@
 # so perhaps 1.6 will work.
 AUTOMAKE_OPTIONS = 1.7 subdir-objects
 
+# Executables compiled by "make" and installed by "make install"
+bin_PROGRAMS = inkscape inkview
+
+# Add sources common for Inkscape and Inkview to this variable.
+ink_common_sources =
+# Add Inkscape-only sources here.
+inkscape_SOURCES =
+# Add Inkview-only sources here.
+inkview_SOURCES =
+
+# 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.
+noinst_LIBRARIES = $(inkscape_private_libs)
+
 INCLUDES =     \
        $(PERL_CFLAGS) $(PYTHON_CFLAGS) \
        $(FREETYPE_CFLAGS)      \
@@ -28,7 +43,10 @@ INCLUDES =   \
        -DPOTRACE=\"potrace\"   \
        $(INKSCAPE_CFLAGS) \
        -I$(top_srcdir)/cxxtest \
-       $(WIN32_CFLAGS)
+       $(WIN32_CFLAGS) \
+       -I$(srcdir)/bind/javainc \
+       -I$(srcdir)/bind/javainc/linux \
+       $(AM_CPPFLAGS)
 
 CXXTEST_TEMPLATE = $(srcdir)/cxxtest-template.tpl
 CXXTESTGENFLAGS = --root --have-eh --template=$(CXXTEST_TEMPLATE)
@@ -58,48 +76,20 @@ DISTCLEANFILES =    \
        helper/sp-marshal.h     \
        inkscape-version.cpp
 
+if WITH_INKBOARD
+libpedro = pedro/libpedro.a
+endif
+
 inkscape_private_libs =        \
-       libinkpre.a             \
-       application/libinkapp.a \
-       ui/dialog/libuidialog.a \
-       dialogs/libspdialogs.a  \
-       ui/cache/libuicache.a   \
-       jabber_whiteboard/libjabber_whiteboard.a \
-       pedro/libpedro.a        \
-       trace/libtrace.a        \
-       svg/libspsvg.a          \
-       filters/libfilters.a    \
-       widgets/libspwidgets.a  \
-       display/libspdisplay.a  \
-       helper/libspchelp.a     \
+       dom/libdom.a            \
        libcroco/libcroco.a     \
-       libnrtype/libnrtype.a   \
        libavoid/libavoid.a     \
-       livarot/libvarot.a      \
-       live_effects/liblive_effects.a  \
-       live_effects/parameter/liblpeparam.a    \
-       ui/view/libuiview.a     \
-       ui/libui.a              \
-       ui/widget/libuiwidget.a \
        libgdl/libgdl.a         \
-       graphlayout/libgraphlayout.a    \
-       removeoverlap/libremoveoverlap.a                \
        libcola/libcola.a       \
        libvpsc/libvpsc.a       \
-       extension/libextension.a        \
-       extension/implementation/libimplementation.a    \
-       extension/internal/libinternal.a        \
-       libnr/libnr.a           \
-       extension/script/libscript.a    \
-       bind/libbind.a  \
-       dom/libdom.a            \
-       xml/libspxml.a          \
+       livarot/libvarot.a      \
        2geom/lib2geom.a        \
-       util/libinkutil.a       \
-       io/libio.a              \
-       $(inkjar_libs)          \
-       libinkpost.a            \
-       debug/libinkdebug.a     \
+       $(libpedro)             \
        libinkversion.a
 
 all_libs =                     \
@@ -161,13 +151,6 @@ include util/Makefile_insert
 include trace/Makefile_insert
 include 2geom/Makefile_insert
 
-# Executables compiled by "make" and installed by "make install"
-bin_PROGRAMS = inkscape inkview
-
-# Libraries which should be compiled by "make" but not installed
-# Currently we use one library per source directory.
-noinst_LIBRARIES = $(inkscape_private_libs)
-
 # Extra files not mentioned as sources to include in the source tarball
 EXTRA_DIST =   \
        $(top_srcdir)/Doxyfile  \
@@ -225,10 +208,18 @@ EXTRA_DIST =      \
        traits/reference.h \
        $(jabber_whiteboard_SOURCES)
 
-EXTRA_PROGRAMS =       \
-       inkview         \
-       libnr/testnr
+# ################################################
+#
+#  B I N A R I E S
+#
+# ################################################
+
+inkscape_SOURCES += main.cpp $(ink_common_sources) $(win32_sources)
+inkscape_LDADD = $(all_libs)
+inkscape_LDFLAGS = --export-dynamic $(kdeldflags)
 
+inkview_SOURCES += inkview.cpp $(ink_common_sources) $(win32_sources)
+inkview_LDADD = $(all_libs)
 
 # #################################
 # ## TESTING STUFF (make check) ###
@@ -249,7 +240,7 @@ TESTS = $(check_PROGRAMS)
 
 # including the the testsuites here ensures that they get distributed
 cxxtests_SOURCES = cxxtests.cpp $(CXXTEST_TESTSUITES)
-cxxtests_LDADD = libnr/nr-compose-reference.o $(all_libs)
+cxxtests_LDADD = libnr/nr-compose-reference.o $(ink_common_sources)
 
 cxxtests.cpp: $(CXXTEST_TESTSUITES) $(CXXTEST_TEMPLATE)
        $(CXXTESTGEN) -o cxxtests.cpp $(CXXTEST_TESTSUITES)

diff --git a/src/Makefile_insert b/src/Makefile_insert
index e654ca13661bdda28121e0e85b09d2f3fef08cb2..360f69cc45ad8bbae941c5e36fafd8ab4a959fc3 100644 (file)
--- a/src/Makefile_insert
+++ b/src/Makefile_insert
@@ -17,274 +17,255 @@
 # or indirectly), so I don't think that putting it in a library will
 # suffice to get it linked in.  Windows devel please confirm.  -- pjrm.
 
-libinkpre_a_SOURCES =  \
-       algorithms/find-last-if.h       \
-       algorithms/longest-common-suffix.h      \
-       approx-equal.h remove-last.h    \
-       arc-context.cpp arc-context.h   \
-       attributes.cpp attributes.h     \
-       axis-manip.cpp axis-manip.h     \
-       bad-uri-exception.h     \
-       box3d.cpp box3d.h \
-       box3d-context.cpp box3d-context.h \
-       box3d-side.cpp box3d-side.h \
-       brokenimage.xpm \
-       color-rgba.h    \
-       color-profile.cpp color-profile.h       \
-       color-profile-fns.h     \
-       common-context.cpp common-context.h\
-       conditions.cpp conditions.h\
-       conn-avoid-ref.cpp conn-avoid-ref.h     \
-       connector-context.cpp connector-context.h       \
-       connection-pool.h \
+ink_common_sources +=  \
+       algorithms/find-last-if.h                                       \
+       algorithms/longest-common-suffix.h                              \
+       approx-equal.h remove-last.h                                    \
+       arc-context.cpp arc-context.h                                   \
+       attributes.cpp attributes.h                                     \
+       axis-manip.cpp axis-manip.h                                     \
+       bad-uri-exception.h                                             \
+       box3d-context.cpp box3d-context.h                               \
+       box3d.cpp box3d.h                                               \
+       box3d-side.cpp box3d-side.h                                     \
+       brokenimage.xpm                                                 \
+       color.cpp color.h                                               \
+       color-profile.cpp color-profile.h                               \
+       color-profile-fns.h                                             \
+       color-rgba.h                                                    \
+       common-context.cpp common-context.h                             \
+       composite-undo-stack-observer.cpp                               \
+       composite-undo-stack-observer.h                                 \
+       conditions.cpp conditions.h                                     \
+       conn-avoid-ref.cpp conn-avoid-ref.h                             \
+       connection-pool.h                                               \
+       connector-context.cpp connector-context.h                       \
        console-output-undo-observer.h console-output-undo-observer.cpp \
-       context-fns.cpp context-fns.h \
-       desktop-affine.h        \
-       desktop-events.cpp desktop-events.h     \
-       desktop-handles.cpp desktop-handles.h   \
-       desktop-style.cpp desktop-style.h       \
-       desktop.cpp desktop.h   \
-       device-manager.cpp      \
-       device-manager.h        \
-       document-undo.cpp       \
-       document.cpp document.h document-private.h      \
-       document-subset.cpp document-subset.h   \
-       doxygen-main.cpp \
-       draw-anchor.cpp \
-       draw-anchor.h   \
-       draw-context.cpp draw-context.h \
-       dropper-context.cpp dropper-context.h   \
-       dyna-draw-context.cpp dyna-draw-context.h       \
-       enums.h \
-       eraser-context.cpp eraser-context.h     \
-       event-context.cpp event-context.h       \
-       event-log.cpp event-log.h event.h      \
-       extract-uri.cpp extract-uri.h   \
-       file.cpp file.h \
-       filter-chemistry.cpp filter-chemistry.h \
-       filter-enums.cpp filter-enums.h \
-       flood-context.cpp flood-context.h       \
-       forward.h       \
-       gradient-context.cpp gradient-context.h \
-       gradient-drag.cpp gradient-drag.h \
-       help.cpp help.h \
-       helper-fns.h \
-       icon-size.h \
-       id-clash.cpp id-clash.h \
-       ige-mac-menu.h ige-mac-menu.c \
-       inkscape.cpp inkscape.h inkscape-private.h      \
-       interface.cpp interface.h       \
-       isinf.h \
-       isnormal.h \
-       knot-enums.h    \
-       knot-holder-entity.h knot-holder-entity.cpp     \
-       knot.cpp knot.h \
-       knotholder.cpp knotholder.h     \
-       layer-fns.cpp layer-fns.h       \
-       layer-manager.cpp layer-manager.h       \
-       line-geometry.cpp line-geometry.h       \
-       lpe-tool-context.cpp lpe-tool-context.h \
-       macros.h        \
-       main-cmdlineact.cpp main-cmdlineact.h \
-       media.cpp media.h       \
-       message-context.cpp message-context.h \
-       message-stack.cpp message-stack.h \
-       message.h \
-       mod360.cpp mod360.h     \
-       modifier-fns.h  \
-       node-context.cpp node-context.h \
-       nodepath.cpp nodepath.h \
-       object-edit.cpp object-edit.h   \
-       object-hierarchy.cpp object-hierarchy.h \
-       ui/context-menu.cpp \
-       ui/context-menu.h       \
-       path-chemistry.cpp path-chemistry.h     \
-       path-prefix.h   \
-       pen-context.cpp \
-       pen-context.h   \
-       pencil-context.cpp      \
-       pencil-context.h        \
-       persp3d.cpp persp3d.h   \
-       persp3d-reference.cpp persp3d-reference.h       \
-       perspective-line.cpp perspective-line.h \
-       preferences.cpp preferences.h \
-       preferences-skeleton.h  \
-       menus-skeleton.h        \
-       prefix.cpp      \
-       prefix.h        \
-       print.cpp print.h       \
-       profile-manager.cpp     \
-       profile-manager.h       \
-       proj_pt.cpp proj_pt.h   \
-       rect-context.cpp rect-context.h \
-       require-config.h \
-       rubberband.cpp rubberband.h     \
-       satisfied-guide-cns.cpp satisfied-guide-cns.h   \
-       selcue.cpp selcue.h \
-       select-context.cpp select-context.h     \
-       selection-chemistry.cpp selection-chemistry.h   \
-       selection-describer.cpp selection-describer.h   \
-       selection.cpp selection.h       \
-       seltrans-handles.cpp seltrans-handles.h \
-       seltrans.cpp seltrans.h \
-       shape-editor.cpp shape-editor.h \
-       shortcuts.cpp shortcuts.h       \
-       snap.cpp snap.h \
-       snap-preferences.cpp snap-preferences.h \
-       snapped-curve.cpp snapped-curve.h \
-       snapped-line.cpp snapped-line.h \
-       snapped-point.cpp snapped-point.h \
-       snapper.cpp snapper.h \
-       syseq.h \
-       transf_mat_3x4.cpp transf_mat_3x4.h     \
-       line-snapper.cpp line-snapper.h \
-       guide-snapper.cpp guide-snapper.h \
-       object-snapper.cpp object-snapper.h \
-       sp-anchor.cpp sp-anchor.h       \
-       sp-clippath.cpp sp-clippath.h   \
-       sp-conn-end-pair.cpp sp-conn-end-pair.h \
-       sp-conn-end.cpp sp-conn-end.h   \
-       sp-cursor.cpp sp-cursor.h       \
-       sp-defs.cpp sp-defs.h   \
-       sp-desc.cpp sp-desc.h   \
-       sp-ellipse.cpp sp-ellipse.h     \
-       sp-filter-fns.h \
-       sp-filter-primitive.cpp \
-       sp-filter-primitive.h   \
-       sp-filter-reference.cpp \
-       sp-filter-reference.h   \
-       sp-filter-units.h       \
-       sp-filter.cpp sp-filter.h number-opt-number.h   \
-       sp-flowdiv.h sp-flowdiv.cpp \
-       sp-flowregion.h sp-flowregion.cpp \
-       sp-flowtext.h sp-flowtext.cpp \
-        sp-font.cpp sp-font.h \
-        sp-font-face.cpp sp-font-face.h \
-        sp-glyph.cpp sp-glyph.h \
-        sp-missing-glyph.cpp sp-missing-glyph.h \
-        sp-glyph-kerning.cpp sp-glyph-kerning.h \
-       sp-gaussian-blur.cpp sp-gaussian-blur.h \
-       sp-gaussian-blur-fns.h  \
-       sp-gradient-fns.h       \
-       sp-gradient-reference.cpp       \
-       sp-gradient-reference.h \
-       sp-gradient-spread.h    \
-       sp-gradient-units.h     \
-       sp-gradient-vector.h    \
-       sp-gradient.cpp sp-gradient.h   \
-       sp-guide-attachment.h   \
-       sp-guide-constraint.h   \
-       sp-guide.cpp sp-guide.h \
-       sp-image.cpp sp-image.h \
-       sp-item-group.cpp sp-item-group.h       \
-       sp-item-notify-moveto.cpp sp-item-notify-moveto.h       \
+       context-fns.cpp context-fns.h                                   \
+       decimal-round.h                                                 \
+       desktop-affine.h                                                \
+       desktop.cpp desktop.h                                           \
+       desktop-events.cpp desktop-events.h                             \
+       desktop-handles.cpp desktop-handles.h                           \
+       desktop-style.cpp desktop-style.h                               \
+       device-manager.cpp device-manager.h                             \
+       dir-util.cpp dir-util.h                                         \
+       document.cpp document.h document-private.h                      \
+       document-subset.cpp document-subset.h                           \
+       document-undo.cpp                                               \
+       doxygen-main.cpp                                                \
+       draw-anchor.cpp draw-anchor.h                                   \
+       draw-context.cpp draw-context.h                                 \
+       dropper-context.cpp dropper-context.h                           \
+       dyna-draw-context.cpp dyna-draw-context.h                       \
+       ege-adjustment-action.cpp ege-adjustment-action.h               \
+       ege-color-prof-tracker.cpp ege-color-prof-tracker.h             \
+       ege-output-action.cpp ege-output-action.h                       \
+       ege-select-one-action.cpp ege-select-one-action.h               \
+       enums.h                                                         \
+       eraser-context.cpp eraser-context.h                             \
+       event-context.cpp event-context.h                               \
+       event-log.cpp event-log.h event.h                               \
+       extract-uri.cpp extract-uri.h                                   \
+       file.cpp file.h                                                 \
+       fill-or-stroke.h                                                \
+       filter-chemistry.cpp filter-chemistry.h                         \
+       filter-enums.cpp filter-enums.h                                 \
+       fixes.cpp                                                       \
+       flood-context.cpp flood-context.h                               \
+       forward.h                                                       \
+       gc-allocator.h                                                  \
+       gc-alloc.h                                                      \
+       gc-anchored.h gc-anchored.cpp                                   \
+       gc-core.h                                                       \
+       gc.cpp                                                          \
+       gc-finalized.h gc-finalized.cpp                                 \
+       gc-managed.h                                                    \
+       gc-soft-ptr.h                                                   \
+       gradient-chemistry.cpp gradient-chemistry.h                     \
+       gradient-context.cpp gradient-context.h                         \
+       gradient-drag.cpp gradient-drag.h                               \
+       guide-snapper.cpp guide-snapper.h                               \
+       help.cpp help.h                                                 \
+       helper-fns.h                                                    \
+       helper/pixbuf-ops.cpp                                           \
+       helper/pixbuf-ops.h                                             \
+       icon-size.h                                                     \
+       id-clash.cpp id-clash.h                                         \
+       ige-mac-menu.h ige-mac-menu.c                                   \
+       ink-action.cpp                                                  \
+       ink-action.h                                                    \
+       inkscape.cpp inkscape.h inkscape-private.h                      \
+       interface.cpp interface.h                                       \
+       isinf.h                                                         \
+       isnormal.h                                                      \
+       knot.cpp knot.h                                                 \
+       knot-enums.h                                                    \
+       knotholder.cpp knotholder.h                                     \
+       knot-holder-entity.h knot-holder-entity.cpp                     \
+       layer-fns.cpp layer-fns.h                                       \
+       layer-manager.cpp layer-manager.h                               \
+       line-geometry.cpp line-geometry.h                               \
+       line-snapper.cpp line-snapper.h                                 \
+       lpe-tool-context.cpp lpe-tool-context.h                         \
+       macros.h                                                        \
+       main-cmdlineact.cpp main-cmdlineact.h                           \
+       marker.cpp marker.h                                             \
+       media.cpp media.h                                               \
+       memeq.h                                                         \
+       menus-skeleton.h                                                \
+       message-context.cpp message-context.h                           \
+       message.h                                                       \
+       message-stack.cpp message-stack.h                               \
+       mod360.cpp mod360.h                                             \
+       modifier-fns.h                                                  \
+       node-context.cpp node-context.h                                 \
+       nodepath.cpp nodepath.h                                         \
+       object-edit.cpp object-edit.h                                   \
+       object-hierarchy.cpp object-hierarchy.h                         \
+       object-snapper.cpp object-snapper.h                             \
+       path-chemistry.cpp path-chemistry.h                             \
+       path-prefix.h                                                   \
+       pencil-context.cpp pencil-context.h                             \
+       pen-context.cpp pen-context.h                                   \
+       persp3d.cpp persp3d.h                                           \
+       persp3d-reference.cpp persp3d-reference.h                       \
+       perspective-line.cpp perspective-line.h                         \
+       preferences.cpp preferences.h                                   \
+       preferences-skeleton.h                                          \
+       prefix.cpp prefix.h                                             \
+       print.cpp print.h                                               \
+       profile-manager.cpp profile-manager.h                           \
+       proj_pt.cpp proj_pt.h                                           \
+       rect-context.cpp rect-context.h                                 \
+       require-config.h                                                \
+       round.h                                                         \
+       rubberband.cpp rubberband.h                                     \
+       satisfied-guide-cns.cpp satisfied-guide-cns.h                   \
+       selcue.cpp selcue.h                                             \
+       select-context.cpp select-context.h                             \
+       selection-chemistry.cpp selection-chemistry.h                   \
+       selection.cpp selection.h                                       \
+       selection-describer.cpp selection-describer.h                   \
+       seltrans.cpp seltrans.h                                         \
+       seltrans-handles.cpp seltrans-handles.h                         \
+       shape-editor.cpp shape-editor.h                                 \
+       shortcuts.cpp shortcuts.h                                       \
+       snap.cpp snap.h                                                 \
+       snapped-curve.cpp snapped-curve.h                               \
+       snapped-line.cpp snapped-line.h                                 \
+       snapped-point.cpp snapped-point.h                               \
+       snapper.cpp snapper.h                                           \
+       snap-preferences.cpp snap-preferences.h                         \
+       sp-anchor.cpp sp-anchor.h                                       \
+       sp-clippath.cpp sp-clippath.h                                   \
+       sp-conn-end.cpp sp-conn-end.h                                   \
+       sp-conn-end-pair.cpp sp-conn-end-pair.h                         \
+       sp-cursor.cpp sp-cursor.h                                       \
+       sp-defs.cpp sp-defs.h                                           \
+       sp-desc.cpp sp-desc.h                                           \
+       sp-ellipse.cpp sp-ellipse.h                                     \
+       sp-filter.cpp sp-filter.h number-opt-number.h                   \
+       sp-filter-fns.h                                                 \
+       sp-filter-primitive.cpp sp-filter-primitive.h                   \
+       sp-filter-reference.cpp sp-filter-reference.h                   \
+       sp-filter-units.h                                               \
+       sp-flowdiv.h sp-flowdiv.cpp                                     \
+       sp-flowregion.h sp-flowregion.cpp                               \
+       sp-flowtext.h sp-flowtext.cpp                                   \
+        sp-font.cpp sp-font.h                                          \
+        sp-font-face.cpp sp-font-face.h                                        \
+       sp-gaussian-blur.cpp sp-gaussian-blur.h                         \
+       sp-gaussian-blur-fns.h                                          \
+        sp-glyph.cpp sp-glyph.h                                                \
+        sp-glyph-kerning.cpp sp-glyph-kerning.h                                \
+       sp-gradient.cpp sp-gradient.h                                   \
+       sp-gradient-fns.h                                               \
+       sp-gradient-reference.cpp sp-gradient-reference.h               \
+       sp-gradient-spread.h                                            \
+       sp-gradient-units.h                                             \
+       sp-gradient-vector.h                                            \
+       sp-guide-attachment.h                                           \
+       sp-guide-constraint.h                                           \
+       sp-guide.cpp sp-guide.h                                         \
+       sp-image.cpp sp-image.h                                         \
+       spiral-context.cpp spiral-context.h                             \
+       sp-item.cpp sp-item.h                                           \
+       sp-item-group.cpp sp-item-group.h                               \
+       sp-item-notify-moveto.cpp sp-item-notify-moveto.h               \
        sp-item-rm-unsatisfied-cns.cpp sp-item-rm-unsatisfied-cns.h     \
-       sp-item-transform.cpp sp-item-transform.h       \
-       sp-item-update-cns.cpp sp-item-update-cns.h     \
-       sp-item.cpp sp-item.h   \
-       sp-line.cpp sp-line.h   \
-       sp-linear-gradient-fns.h        \
-       sp-linear-gradient.h    \
-       sp-lpe-item.cpp sp-lpe-item.h   \
-       sp-marker-loc.h \
-       marker.cpp marker.h     \
-       sp-mask.cpp sp-mask.h   \
-       sp-metadata.cpp sp-metadata.h   \
-       sp-metric.h     \
-       sp-metrics.cpp sp-metrics.h     \
-       sp-namedview.cpp sp-namedview.h \
+       sp-item-transform.cpp sp-item-transform.h                       \
+       sp-item-update-cns.cpp sp-item-update-cns.h                     \
+       sp-linear-gradient-fns.h                                        \
+       sp-linear-gradient.h                                            \
+       sp-line.cpp sp-line.h                                           \
+       splivarot.cpp splivarot.h                                       \
+       sp-lpe-item.cpp sp-lpe-item.h                                   \
+       sp-marker-loc.h                                                 \
+       sp-mask.cpp sp-mask.h                                           \
+       sp-metadata.cpp sp-metadata.h                                   \
+       sp-metric.h                                                     \
+       sp-metrics.cpp sp-metrics.h                                     \
+        sp-missing-glyph.cpp sp-missing-glyph.h \
+       sp-namedview.cpp sp-namedview.h         \
+       sp-object.cpp sp-object.h               \
        sp-object-group.cpp sp-object-group.h   \
        sp-object-repr.cpp sp-object-repr.h     \
-       sp-object.cpp sp-object.h       \
-       sp-offset.cpp sp-offset.h       \
+       sp-offset.cpp sp-offset.h               \
        sp-paint-server.cpp sp-paint-server.h   \
-       sp-path.cpp sp-path.h   \
-       sp-pattern.cpp sp-pattern.h     \
-       sp-polygon.cpp sp-polygon.h     \
-       sp-polyline.cpp sp-polyline.h   \
-       sp-radial-gradient-fns.h        \
-       sp-radial-gradient.h    \
-       sp-rect.cpp sp-rect.h   \
-       sp-root.cpp sp-root.h   \
-       sp-script.cpp sp-script.h       \
-       sp-shape.cpp sp-shape.h \
-       sp-spiral.cpp sp-spiral.h       \
-       sp-star.cpp sp-star.h   \
-       sp-stop-fns.h   \
-       sp-stop.h       \
-       sp-string.cpp sp-string.h       \
-       sp-symbol.cpp sp-symbol.h       \
-       sp-switch.cpp sp-switch.h\
-       sp-text.cpp sp-text.h   \
-       sp-textpath.h   \
-       sp-title.cpp sp-title.h \
-       sp-tref-reference.cpp sp-tref-reference.h \
-       sp-tref.cpp sp-tref.h \
-       sp-tspan.cpp sp-tspan.h \
-       sp-use-reference.cpp sp-use-reference.h \
-       sp-use.cpp sp-use.h     \
-       spiral-context.cpp spiral-context.h     \
-       splivarot.cpp splivarot.h       \
-       star-context.cpp star-context.h \
-       style.cpp style.h       \
+       sp-path.cpp sp-path.h                   \
+       sp-pattern.cpp sp-pattern.h             \
+       sp-polygon.cpp sp-polygon.h             \
+       sp-polyline.cpp sp-polyline.h           \
+       sp-radial-gradient-fns.h                \
+       sp-radial-gradient.h                    \
+       sp-rect.cpp sp-rect.h                   \
+       sp-root.cpp sp-root.h                   \
+       sp-script.cpp sp-script.h               \
+       sp-shape.cpp sp-shape.h                 \
+       sp-spiral.cpp sp-spiral.h               \
+       sp-star.cpp sp-star.h                   \
+       sp-stop-fns.h                           \
+       sp-stop.h                               \
+       sp-string.cpp sp-string.h               \
        sp-style-elem.cpp sp-style-elem.h       \
-       svg-profile.h \
-       svg-view.cpp svg-view.h \
+       sp-switch.cpp sp-switch.h               \
+       sp-symbol.cpp sp-symbol.h               \
+       sp-text.cpp sp-text.h                   \
+       sp-textpath.h                           \
+       sp-title.cpp sp-title.h                 \
+       sp-tref.cpp sp-tref.h                   \
+       sp-tref-reference.cpp sp-tref-reference.h                       \
+       sp-tspan.cpp sp-tspan.h                 \
+       sp-use.cpp sp-use.h                     \
+       sp-use-reference.cpp sp-use-reference.h \
+       star-context.cpp star-context.h         \
+       streq.h                                 \
+       strneq.h                                \
+       style.cpp style.h                       \
+       svg-profile.h                           \
+       svg-view.cpp svg-view.h                 \
        svg-view-widget.cpp svg-view-widget.h   \
+       syseq.h                                 \
        text-chemistry.cpp text-chemistry.h     \
-       text-context.cpp text-context.h \
-       text-editing.cpp text-editing.h \
-       text-tag-attributes.h   \
-       tools-switch.cpp tools-switch.h\
-       tweak-context.h tweak-context.cpp \
-       unicoderange.cpp unicoderange.h \
+       text-context.cpp text-context.h         \
+       text-editing.cpp text-editing.h         \
+       text-tag-attributes.h                   \
+       tools-switch.cpp tools-switch.h         \
+       transf_mat_3x4.cpp transf_mat_3x4.h     \
+       tweak-context.h tweak-context.cpp       \
+       ui/context-menu.cpp                     \
+       ui/context-menu.h                       \
+       undo-stack-observer.h                   \
+       unicoderange.cpp unicoderange.h         \
+       unit-constants.h                        \
+       uri.cpp uri.h                           \
        uri-references.cpp uri-references.h     \
        vanishing-point.cpp vanishing-point.h   \
-       verbs.cpp verbs.h       \
-       version.cpp version.h   \
+       verbs.cpp verbs.h                       \
+       version.cpp version.h                   \
        zoom-context.cpp zoom-context.h
 
-# libinkpost.a: Any object file that needs to be near the end of the link line.
-# gradient-chemistry.o is called by some things in display/.
-libinkpost_a_SOURCES = \
-       color.cpp color.h       \
-       decimal-round.h \
-       dir-util.cpp dir-util.h \
-       ege-adjustment-action.cpp       \
-       ege-adjustment-action.h \
-       ege-color-prof-tracker.cpp      \
-       ege-color-prof-tracker.h        \
-       ege-output-action.cpp   \
-       ege-output-action.h     \
-       ege-select-one-action.cpp       \
-       ege-select-one-action.h \
-       fill-or-stroke.h        \
-       filter-chemistry.cpp filter-chemistry.h \
-       filter-enums.cpp filter-enums.h \
-       fixes.cpp \
-       gc-alloc.h      \
-       gc-anchored.h gc-anchored.cpp   \
-       gc-core.h       \
-       gc-finalized.h gc-finalized.cpp \
-       gc-managed.h    \
-       gc-soft-ptr.h   \
-       gc-allocator.h  \
-       gc.cpp  \
-       gradient-chemistry.cpp gradient-chemistry.h     \
-       ink-action.cpp  \
-       ink-action.h    \
-       memeq.h \
-       round.h \
-       streq.h \
-       strneq.h        \
-       composite-undo-stack-observer.h \
-       composite-undo-stack-observer.cpp \
-       undo-stack-observer.h \
-       unit-constants.h        \
-       uri.cpp uri.h   \
-       helper/pixbuf-ops.cpp   \
-       helper/pixbuf-ops.h
-
 # Additional dependencies
 
 desktop.$(OBJEXT): helper/sp-marshal.h
@@ -295,21 +276,6 @@ selection.$(OBJEXT): helper/sp-marshal.h
 sp-object.$(OBJEXT): helper/sp-marshal.h
 view.$(OBJEXT): helper/sp-marshal.h
 
-
-# ################################################
-#
-#  B I N A R I E S
-#
-# ################################################
-
-
-inkscape_SOURCES = main.cpp $(win32_sources)
-inkscape_LDADD = $(all_libs)
-inkscape_LDFLAGS = --export-dynamic $(kdeldflags)
-
-inkview_SOURCES = inkview.cpp $(win32_sources)
-inkview_LDADD = $(all_libs)
-
 libinkversion_a_SOURCES = inkscape-version.cpp inkscape-version.h
 
 if USE_SVN_VERSION

diff --git a/src/application/Makefile_insert b/src/application/Makefile_insert
index 9a5306ec72a2c07ee8fc5b85a0c96fd0e5dd649b..d3afa2307c89bd33bbb34dd09b56f6fd65a38231 100644 (file)
--- a/src/application/Makefile_insert
+++ b/src/application/Makefile_insert
@@ -1,11 +1,6 @@
 ## Makefile.am fragment sourced by src/Makefile.am.
 
-application/all: application/libinkapp.a
-
-application/clean:
-       rm -f application/libinkapp.a $(application_libinkapp_a_OBJECTS)
-
-application_libinkapp_a_SOURCES = \
+ink_common_sources += \
        application/editor.cpp          \
        application/editor.h            \
        application/application.cpp     \

diff --git a/src/bind/Makefile_insert b/src/bind/Makefile_insert
index c121f963137be92de678cd2318dd278179cd253c..e91ff47f53b947b817398d6a4ce51d6777258223 100644 (file)
--- a/src/bind/Makefile_insert
+++ b/src/bind/Makefile_insert
@@ -1,15 +1,6 @@
 ## Makefile.am fragment sourced by src/Makefile.am.
 
-bind/all: bind/libbind.a
-
-bind/clean:
-       rm -f bind/libbind.a
-       rm -f $(bind_libbind_a_OBJECTS)
-
-bind_libbind_a_CPPFLAGS = -I$(srcdir)/bind/javainc \
-       -I$(srcdir)/bind/javainc/linux $(AM_CPPFLAGS)
-
-bind_libbind_a_SOURCES =            \
+ink_common_sources +=       \
        bind/javabind.h              \
        bind/javabind-private.h      \
        bind/javabind.cpp            \

diff --git a/src/debug/Makefile_insert b/src/debug/Makefile_insert
index 699ceac848ce0897bbdb149c9c9fa8fe69d5663f..47cc2b7048dfd1b903c07c2dc73bcb1551c560be 100644 (file)
--- a/src/debug/Makefile_insert
+++ b/src/debug/Makefile_insert
@@ -1,10 +1,6 @@
+## Makefile.am fragment sourced by src/Makefile.am.
 
-debug/all: debug/libinkdebug.a
-
-debug/clean:
-       rm -f debug/libinkdebug.a $(debug_libinkdebug_a_OBJECTS)
-
-debug_libinkdebug_a_SOURCES = \
+ink_common_sources += \
        debug/demangle.cpp debug/demangle.h \
        debug/event.h \
        debug/event-tracker.h \

diff --git a/src/dialogs/Makefile_insert b/src/dialogs/Makefile_insert
index 1b3358506a5e19cf9cc8e425da712742fa791f4d..f7404a8b2146e7c50bdd0a2f48eb7ddc54169c7c 100644 (file)
--- a/src/dialogs/Makefile_insert
+++ b/src/dialogs/Makefile_insert
@@ -1,19 +1,6 @@
 ## Makefile.am fragment sourced by src/Makefile.am.
-#
-# Several object property dialogs
-# Author: Lauris Kaplinski <lauris@ximian.com>
-#
-# Here should be things, that use only xml interface, not objects themselves
-# Currently we still have selection_changed functions, but these will be
-# replaced by selection 'changed' signal handlers
-#
 
-dialogs/all: dialogs/libspdialogs.a
-
-dialogs/clean:
-       rm -f dialogs/libspdialogs.a $(dialogs_libspdialogs_a_OBJECTS)
-
-dialogs_libspdialogs_a_SOURCES =       \
+ink_common_sources +=  \
        dialogs/clonetiler.cpp          \
        dialogs/clonetiler.h            \
        dialogs/dialog-events.cpp       \
@@ -51,7 +38,7 @@ dialogs_libspdialogs_a_SOURCES =      \
        dialogs/sp-attribute-widget.cpp \
        dialogs/sp-attribute-widget.h   \
        dialogs/spellcheck.cpp          \
-       dialogs/spellcheck.h                    \
+       dialogs/spellcheck.h            \
        dialogs/stroke-style.cpp        \
        dialogs/stroke-style.h          \
        dialogs/swatches.cpp            \
@@ -62,11 +49,3 @@ dialogs_libspdialogs_a_SOURCES =     \
        dialogs/unclump.h               \
        dialogs/xml-tree.cpp            \
        dialogs/xml-tree.h
-
-#      dialogs/sp-widget.c     \
-#      dialogs/sp-widget.h     \
-#      dialogs/gradient-vector.c       \
-#      dialogs/gradient-vector.h       \
-#      dialogs/gradient-selector.c     \
-#      dialogs/gradient-selector.h
-

diff --git a/src/display/Makefile_insert b/src/display/Makefile_insert
index 06d8c29ef1683f93f8b50379b5d8cd0fb5106d4c..ef8310a013317bb19ecd9160501878498b0bc386 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      \
@@ -86,16 +75,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        \

diff --git a/src/dom/Makefile_insert b/src/dom/Makefile_insert
index 28edddcfad6f49c6f22d457dfed0ba07f50ba3c0..d74d30137d51b5d8cf3c747799a9899bb39a9d18 100644 (file)
--- a/src/dom/Makefile_insert
+++ b/src/dom/Makefile_insert
@@ -12,20 +12,20 @@ dom_libdom_a_SOURCES =       \
        dom/dom.h                \
        dom/domimpl.cpp          \
        dom/domimpl.h            \
-    dom/domptr.cpp           \
-    dom/domptr.h             \
-    dom/domstring.cpp        \
-    dom/domstring.h          \
-    dom/events.h             \
-    dom/ls.h                 \
-    dom/lsimpl.cpp           \
-    dom/lsimpl.h             \
-    dom/prop-css2.cpp        \
-    dom/prop-css.cpp         \
-    dom/prop-svg.cpp         \
-    dom/smil.h               \
-    dom/smilimpl.cpp         \
-    dom/smilimpl.h           \
+       dom/domptr.cpp           \
+       dom/domptr.h             \
+       dom/domstring.cpp        \
+       dom/domstring.h          \
+       dom/events.h             \
+       dom/ls.h                 \
+       dom/lsimpl.cpp           \
+       dom/lsimpl.h             \
+       dom/prop-css2.cpp        \
+       dom/prop-css.cpp         \
+       dom/prop-svg.cpp         \
+       dom/smil.h               \
+       dom/smilimpl.cpp         \
+       dom/smilimpl.h           \
        dom/stylesheets.h        \
        dom/svg2.h               \
        dom/svg.h                \
@@ -48,31 +48,31 @@ dom_libdom_a_SOURCES =       \
        dom/xpathimpl.h          \
        dom/xpathparser.cpp      \
        dom/xpathparser.h        \
-    dom/xpathtoken.h         \
-    dom/xpathtoken.cpp       \
+       dom/xpathtoken.h         \
+       dom/xpathtoken.cpp       \
        dom/io/base64stream.cpp  \
        dom/io/base64stream.h    \
        dom/io/bufferstream.cpp  \
        dom/io/bufferstream.h    \
-    dom/io/domstream.cpp     \
-    dom/io/domstream.h       \
-    dom/io/httpclient.h      \
-    dom/io/gzipstream.cpp    \
-    dom/io/gzipstream.h      \
-    dom/io/socket.cpp        \
-    dom/io/socket.h          \
-    dom/io/gzipstream.cpp    \
-    dom/io/gzipstream.h      \
-    dom/io/stringstream.cpp  \
+       dom/io/domstream.cpp     \
+       dom/io/domstream.h       \
+       dom/io/httpclient.h      \
+       dom/io/gzipstream.cpp    \
+       dom/io/gzipstream.h      \
+       dom/io/socket.cpp        \
+       dom/io/socket.h          \
+       dom/io/gzipstream.cpp    \
+       dom/io/gzipstream.h      \
+       dom/io/stringstream.cpp  \
        dom/io/stringstream.h    \
        dom/io/uristream.cpp     \
        dom/io/uristream.h       \
-    dom/odf/odfdocument.cpp  \
-    dom/odf/odfdocument.h    \
-    dom/util/digest.h        \
-    dom/util/digest.cpp      \
-    dom/util/thread.h        \
-    dom/util/thread.cpp      \
-    dom/util/ziptool.h       \
-    dom/util/ziptool.cpp
+       dom/odf/odfdocument.cpp  \
+       dom/odf/odfdocument.h    \
+       dom/util/digest.h        \
+       dom/util/digest.cpp      \
+       dom/util/thread.h        \
+       dom/util/thread.cpp      \
+       dom/util/ziptool.h       \
+       dom/util/ziptool.cpp
 

diff --git a/src/extension/Makefile_insert b/src/extension/Makefile_insert
index bb0dc9cefbd880b8f02e79fdf6c95852f983d67c..1965dfa9aa86aeedd21c698e5695ebe2de109891 100644 (file)
--- a/src/extension/Makefile_insert
+++ b/src/extension/Makefile_insert
@@ -1,11 +1,6 @@
 ## Makefile.am fragment sourced by src/Makefile.am.
 
-extension/all: extension/libextension.a extension/implementation/all extension/internal/all
-
-extension/clean: extension/implementation/clean extension/internal/clean
-       rm -f extension/libextension.a $(extension_libextension_a_OBJECTS)
-
-extension_libextension_a_SOURCES =     \
+ink_common_sources +=  \
        extension/extension.cpp \
        extension/extension.h   \
        extension/extension-forward.h   \
@@ -45,7 +40,6 @@ extension_libextension_a_SOURCES =    \
        extension/system.h \
        extension/timer.cpp \
        extension/timer.h \
-       \
        extension/input.h \
        extension/input.cpp \
        extension/output.h \

diff --git a/src/extension/implementation/Makefile_insert b/src/extension/implementation/Makefile_insert
index 0600c05f20d9206e99e04884fe1e86d0437698a8..1b9080f1a8ba9b90e8ba17ff7ab2e192cee6f975 100644 (file)
--- a/src/extension/implementation/Makefile_insert
+++ b/src/extension/implementation/Makefile_insert
@@ -1,12 +1,6 @@
 ## Makefile.am fragment sourced by src/Makefile.am.
 
-extension/implementation/all: extension/implementation/libimplementation.a
-
-extension/implementation/clean:
-       rm -f extension/implementation/libimplementation.a      \
-               $(extension_implementation_libimplementation_a_OBJECTS)
-
-extension_implementation_libimplementation_a_SOURCES = \
+ink_common_sources +=  \
        extension/implementation/implementation.cpp     \
        extension/implementation/implementation.h \
        extension/implementation/script.cpp     \

diff --git a/src/extension/internal/Makefile_insert b/src/extension/internal/Makefile_insert
index 6620a1228fafc7e4c2243c3c511ed46e89155b06..d2ba9b3eb6c3e4c3f2e8395c9bd20f0e5d37948a 100644 (file)
--- a/src/extension/internal/Makefile_insert
+++ b/src/extension/internal/Makefile_insert
@@ -1,19 +1,14 @@
 ## Makefile.am fragment sourced by src/Makefile.am.
 
-extension/internal/all: extension/internal/libinternal.a
-
-extension/internal/clean:
-       rm -f extension/internal/libinternal.a $(extension_internal_libinternal_OBJECTS)
-
 if WITH_LIBWPG
-extension_internal_libwpg = \
+ink_common_sources += \
        extension/internal/wpg-input.cpp        \
        extension/internal/wpg-input.h
 
 endif
 
 if USE_IMAGE_MAGICK
-extension_internal_image_magick_sources =                      \
+ink_common_sources +=                  \
        extension/internal/bitmap/imagemagick.cpp               \
        extension/internal/bitmap/imagemagick.h                 \
        extension/internal/bitmap/adaptiveThreshold.cpp         \
@@ -86,7 +81,7 @@ extension_internal_image_magick_sources =                     \
        extension/internal/bitmap/wave.h
 endif
 
-extension_internal_libinternal_a_SOURCES =     \
+ink_common_sources +=  \
        extension/internal/bluredge.h   \
        extension/internal/bluredge.cpp \
        extension/internal/clear-n_.h   \
@@ -128,8 +123,6 @@ extension_internal_libinternal_a_SOURCES =  \
        extension/internal/latex-pstricks.h     \
        extension/internal/latex-pstricks-out.cpp       \
        extension/internal/latex-pstricks-out.h \
-       $(extension_internal_libwpg) \
-       $(extension_internal_image_magick_sources) \
        extension/internal/filter/filter-all.cpp \
        extension/internal/filter/filter-file.cpp \
        extension/internal/filter/filter.cpp \
@@ -142,4 +135,3 @@ extension_internal_libinternal_a_SOURCES =  \
        extension/internal/emf-win32-print.cpp \
        extension/internal/emf-win32-inout.h \
        extension/internal/emf-win32-inout.cpp 
-

diff --git a/src/extension/script/Makefile_insert b/src/extension/script/Makefile_insert
index e9edddee3d21581fc3845811052039a9fc4a26ec..c0bd91e81fb4f3cce674ae7731d262bda55e25f4 100644 (file)
--- a/src/extension/script/Makefile_insert
+++ b/src/extension/script/Makefile_insert
@@ -1,13 +1,6 @@
 ## Makefile.am fragment sourced by src/Makefile.am.
 
-extension/script/all: extension/script/libscript.a
-
-extension/script/clean:
-       rm -f extension/script/libscript.a
-       rm -f $(extension_script_libscript_a_OBJECTS)
-
-
-extension_script_libscript_a_SOURCES = \
+ink_common_sources +=  \
        extension/script/InkscapeScript.h \
        extension/script/InkscapeScript.cpp
 

diff --git a/src/filters/Makefile_insert b/src/filters/Makefile_insert
index babc72e935e7877061e6c4d8bb31229e9407f9d4..dde7cdb6843bbcb8e316a8052124672a960e2a9f 100644 (file)
--- a/src/filters/Makefile_insert
+++ b/src/filters/Makefile_insert
@@ -1,11 +1,6 @@
 ## Makefile.am fragment sourced by src/Makefile.am.
 
-filters/all: filters/libfilters.a
-
-filters/clean: 
-       rm -f extension/libfilters.a $(extension_libextension_a_OBJECTS)
-
-filters_libfilters_a_SOURCES = \
+ink_common_sources +=  \
        filters/blend.cpp                                                       \
        filters/blend-fns.h                                             \
        filters/blend.h                                                 \

diff --git a/src/graphlayout/Makefile_insert b/src/graphlayout/Makefile_insert
index fc490743d9dc4f9e8ad20e31d2994832569ce806..790c951aee9e5e907e22fa0cb1fb57b402c36416 100644 (file)
--- a/src/graphlayout/Makefile_insert
+++ b/src/graphlayout/Makefile_insert
@@ -1,10 +1,5 @@
 ## Makefile.am fragment sourced by src/Makefile.am.
 
-graphlayout/all: graphlayout/libgraphlayout.a
-
-graphlayout/clean:
-       rm -f graphlayout/libgraphlayout.a $(graphlayout_libgraphlayout_a_OBJECTS)
-
-graphlayout_libgraphlayout_a_SOURCES = \
+ink_common_sources +=  \
        graphlayout/graphlayout.cpp     \
        graphlayout/graphlayout.h

diff --git a/src/helper/Makefile_insert b/src/helper/Makefile_insert
index cabd9b6adf6d89370603201e33c8e0d7b7c314a5..2ccec8d16bb10c50053b702edbf8f04b10136fef 100644 (file)
--- a/src/helper/Makefile_insert
+++ b/src/helper/Makefile_insert
@@ -1,19 +1,8 @@
 ## Makefile.am fragment sourced by src/Makefile.am.
 
-#
-# Miscellaneous unsystematized and temporary helper utilities
-#
-# libspchelp - canvas utilities, specific canvas items
-#
-
-helper/all: helper/libspchelp.a
-
-helper/clean:
-       rm -f helper/libspchelp.a $(helper_libspchelp_a_OBJECTS)
-
 helper/unit-menu.$(OBJEXT): helper/sp-marshal.h
 
-helper_libspchelp_a_SOURCES =  \
+ink_common_sources +=  \
        helper/action.cpp       \
        helper/action.h \
        helper/geom.cpp \

diff --git a/src/inkjar/Makefile_insert b/src/inkjar/Makefile_insert
index 0376015fad120ff74f7be8458bb5382eccb4cc2b..ef4f1fd193c5a38adc0e8f982bceb66eaa3d62fe 100644 (file)
--- a/src/inkjar/Makefile_insert
+++ b/src/inkjar/Makefile_insert
@@ -1,10 +1,5 @@
 ## Makefile.am fragment sourced by src/Makefile.am.
 
-inkjar/all: inkjar/libinkjar.a
-
-inkjar/clean:
-       rm -f inkjar/libinkjar.a $(inkjar_libinkjar_OBJECTS)
-
-inkjar_libinkjar_a_SOURCES =   \
+ink_common_sources +=  \
        inkjar/jar.cpp  \
        inkjar/jar.h

diff --git a/src/io/Makefile_insert b/src/io/Makefile_insert
index f575b6e8ded84880b1c3a295f7e4b8de7456339f..2696e933454dbfa14df53278cc390b182071341e 100644 (file)
--- a/src/io/Makefile_insert
+++ b/src/io/Makefile_insert
@@ -1,11 +1,6 @@
 ## Makefile.am fragment sourced by src/Makefile.am.
 
-io/all: io/libio.a
-
-io/clean:
-       rm -f io/libio.a $(io_libio_a_OBJECTS)
-
-io_libio_a_SOURCES = \
+ink_common_sources += \
        io/base64stream.h \
        io/base64stream.cpp \
        io/ftos.cpp \

diff --git a/src/jabber_whiteboard/Makefile_insert b/src/jabber_whiteboard/Makefile_insert
index a638377e8b9cb0ba2415356e8d69f9fb70a55242..f1bff891713165bacc6cbc05c42dd30ea2875756 100644 (file)
--- a/src/jabber_whiteboard/Makefile_insert
+++ b/src/jabber_whiteboard/Makefile_insert
@@ -3,12 +3,8 @@
 # Jabber whiteboard communication and Inkscape listener components
 # Author: David Yip <yipdw@rose-hulman.edu>
 
-jabber_whiteboard/all: jabber_whiteboard/libjabber_whiteboard.a
-
-jabber_whiteboard/clean:
-       rm -f jabber_whiteboard/libjabber_whiteboard.a $(jabber_whiteboard_libjabber_whiteboard_a_OBJECTS)
-
-jabber_whiteboard_SOURCES = \
+if WITH_INKBOARD
+temp_whiteboard_files = \
        jabber_whiteboard/defines.cpp \
        jabber_whiteboard/defines.h \
        jabber_whiteboard/empty.cpp \
@@ -39,13 +35,9 @@ jabber_whiteboard_SOURCES = \
        jabber_whiteboard/session-manager.h \
        jabber_whiteboard/tracker-node.h \
        jabber_whiteboard/pedrogui.cpp \
-       jabber_whiteboard/pedrogui.h 
-
-
-if WITH_INKBOARD
-temp_whiteboard_files = $(jabber_whiteboard_SOURCES)
+       jabber_whiteboard/pedrogui.h
 endif
 
-jabber_whiteboard_libjabber_whiteboard_a_SOURCES = \
+ink_common_sources += \
        jabber_whiteboard/empty.cpp \
        $(temp_whiteboard_files)

diff --git a/src/libnr/Makefile_insert b/src/libnr/Makefile_insert
index 67af7a61884e71f8641ec931fde51fe0880d45fd..0b90236b804263d23514492f182a44f816945a32 100644 (file)
--- a/src/libnr/Makefile_insert
+++ b/src/libnr/Makefile_insert
@@ -1,10 +1,5 @@
 ## Makefile.am fragment sourced by src/Makefile.am.
 
-libnr/all: libnr/libnr.a
-
-libnr/clean:
-       rm -f libnr/libnr.a libnr/libtest-nr.a $(libnr_libnr_a_OBJECTS) $(libnr_libtest_nr_a_OBJECTS)
-
 if USE_MMX
 libnr_mmx_sources =    \
        libnr/have_mmx.S        \
@@ -14,7 +9,7 @@ libnr_mmx_sources =    \
        libnr/nr_mmx_R8G8B8_R8G8B8_R8G8B8A8_P.S
 endif
 
-libnr_libnr_a_SOURCES =        \
+ink_common_sources +=  \
        libnr/in-svg-plane.h    \
        libnr/nr-blit.cpp       \
        libnr/nr-blit.h \
@@ -94,12 +89,13 @@ libnr_libnr_a_SOURCES =     \
        $(libnr_mmx_sources)
 
 # Ancient performance test (?)
-libnr_testnr_SOURCES = \
-       libnr/testnr.cpp
+# Won't work anymore.
+#libnr_testnr_SOURCES =        \
+#      libnr/testnr.cpp
 
-libnr_testnr_LDADD =   \
-       libnr/libnr.a   \
-       -lglib-2.0
+#libnr_testnr_LDADD =  \
+#      libnr/libnr.a   \
+#      -lglib-2.0
 
 # ######################
 # ### CxxTest stuff ####

diff --git a/src/libnrtype/Makefile_insert b/src/libnrtype/Makefile_insert
index a5f6d199f5befead141ab2aa54767dbfdd306723..8f45dc94dea145d70a48e790df33a16a3f2f960b 100644 (file)
--- a/src/libnrtype/Makefile_insert
+++ b/src/libnrtype/Makefile_insert
@@ -1,11 +1,6 @@
 ## Makefile.am fragment sourced by src/Makefile.am.
 
-libnrtype/all: libnrtype/libnrtype.a
-
-libnrtype/clean:
-       rm -f libnrtype/libnrtype.a $(libnrtype_libnrtype_a_OBJECTS)
-
-libnrtype_libnrtype_a_SOURCES =        \
+ink_common_sources +=  \
        libnrtype/boundary-type.h       \
        libnrtype/font-style-to-pos.cpp \
        libnrtype/font-style-to-pos.h   \
@@ -40,5 +35,3 @@ libnrtype_libnrtype_a_SOURCES =       \
        libnrtype/Layout-TNG-Scanline-Makers.cpp \
        libnrtype/Layout-TNG.cpp \
        libnrtype/Layout-TNG.h
-       
-

diff --git a/src/live_effects/Makefile_insert b/src/live_effects/Makefile_insert
index 3d2e34322eebb12966d99807ecc4da834c3a1435..8831bb135a85c0119ecb15bea688c5b27a333fe8 100644 (file)
--- a/src/live_effects/Makefile_insert
+++ b/src/live_effects/Makefile_insert
@@ -1,11 +1,6 @@
 ## Makefile.am fragment sourced by src/Makefile.am.
 
-live_effects/all: live_effects/liblive_effects.a live_effects/parameter/all
-
-live_effects/clean:
-       rm -f live_effects/liblive_effects.a $(live_effects_liblive_effects_a_OBJECTS)
-
-live_effects_liblive_effects_a_SOURCES = \
+ink_common_sources += \
        live_effects/effect.cpp \
        live_effects/effect.h   \
        live_effects/effect-enum.h      \

diff --git a/src/live_effects/parameter/Makefile_insert b/src/live_effects/parameter/Makefile_insert
index 3832e24cbfe68e9baa13c9d5f77f1a3203781dfd..74b166e8b152c1f6ffdcda3179200ab298b365d1 100644 (file)
--- a/src/live_effects/parameter/Makefile_insert
+++ b/src/live_effects/parameter/Makefile_insert
@@ -1,11 +1,6 @@
 ## Makefile.am fragment sourced by src/Makefile.am.
 
-live_effects/parameter/all: live_effects/parameter/liblpeparam.a
-
-live_effects/parameter/clean:
-       rm -f live_effects/parameter/liblpeparam.a $(live_effects_parameter_liblpeparam_a_OBJECTS)
-
-live_effects_parameter_liblpeparam_a_SOURCES = \
+ink_common_sources += \
        live_effects/parameter/parameter.cpp    \
        live_effects/parameter/parameter.h      \
        live_effects/parameter/array.cpp        \

diff --git a/src/removeoverlap/Makefile_insert b/src/removeoverlap/Makefile_insert
index 9df2ca2e334ed9aa6b75613399017dfcdb845635..d5e90ec02a53d5903f72fe5a7bd9a39dccbb80e0 100644 (file)
--- a/src/removeoverlap/Makefile_insert
+++ b/src/removeoverlap/Makefile_insert
@@ -1,10 +1,5 @@
 ## Makefile.am fragment sourced by src/Makefile.am.
 
-removeoverlap/all: removeoverlap/libremoveoverlap.a
-
-removeoverlap/clean:
-       rm -f removeoverlap/libremoveoverlap.a $(removeoverlap_libremoveoverlap_a_OBJECTS)
-
-removeoverlap_libremoveoverlap_a_SOURCES =     \
+ink_common_sources +=  \
        removeoverlap/removeoverlap.cpp \
        removeoverlap/removeoverlap.h

diff --git a/src/svg/Makefile_insert b/src/svg/Makefile_insert
index b4558ce96cc8aa231f4fe6eab445c1f8b4bb7901..b1400052b0fc0fbfc053f106a343af973878ae0c 100644 (file)
--- a/src/svg/Makefile_insert
+++ b/src/svg/Makefile_insert
@@ -1,19 +1,6 @@
 ## Makefile.am fragment sourced by src/Makefile.am.
 
-#
-# Sodipodi svg wrapper
-# Author: Lauris Kaplinski <lauris@ariman.ee>
-# Most code is actually written by Raph Levien
-#
-# Implements svg interpretation of xml tree
-#
-
-svg/all: svg/libspsvg.a
-
-svg/clean:
-       rm -f svg/libspsvg.a $(svg_libspsvg_a_OBJECTS)
-
-svg_libspsvg_a_SOURCES =       \
+ink_common_sources +=  \
        svg/css-ostringstream.h \
        svg/css-ostringstream.cpp       \
        svg/itos.cpp    \

diff --git a/src/trace/Makefile_insert b/src/trace/Makefile_insert
index 5ef59b3c3b9293fdff96bd2b2815d30062784934..21ec4ac0c565d17c5856582a32751d4c3e8ebeab 100644 (file)
--- a/src/trace/Makefile_insert
+++ b/src/trace/Makefile_insert
@@ -1,11 +1,6 @@
 ## Makefile.am fragment sourced by src/Makefile.am.
 
-trace/all: trace/libtrace.a
-
-trace/clean:
-       rm -f trace/libtrace.a $(trace_libtrace_a_OBJECTS)
-
-trace_libtrace_a_SOURCES =                 \
+ink_common_sources +=              \
        trace/pool.h                        \
        trace/trace.h                       \
        trace/trace.cpp                     \

diff --git a/src/ui/Makefile_insert b/src/ui/Makefile_insert
index 94c003584db034f6dd01625e38600a4b4572983c..e91c22025a9dcf45bb3ff3019d40c57d5303f1c4 100644 (file)
--- a/src/ui/Makefile_insert
+++ b/src/ui/Makefile_insert
@@ -1,13 +1,9 @@
 ## Makefile.am fragment sourced by src/Makefile.am.
 
-ui/all: ui/libui.a ui/view/all ui/widget/all ui/dialog/all ui/cache/all
-
-ui/clean: ui/widget/clean ui/dialog/clean ui/cache/clean
-       rm -f ui/libui.a $(ui_libui_a_OBJECTS)
-
-ui_libui_a_SOURCES =           \
+ink_common_sources +=          \
        ui/clipboard.cpp \
        ui/clipboard.h \
+       ui/icon-names.h \
        ui/previewable.h        \
        ui/previewfillable.h    \
        ui/previewholder.cpp    \

diff --git a/src/ui/cache/Makefile_insert b/src/ui/cache/Makefile_insert
index cb82280a89a4a8860dac4a47b85029fc82a8e845..c648777f86c282f6ee7e2d28f4beb5d7dc3915f5 100644 (file)
--- a/src/ui/cache/Makefile_insert
+++ b/src/ui/cache/Makefile_insert
@@ -1,11 +1,6 @@
 ## Makefile.am fragment sourced by src/Makefile.am.
 
-ui/cache/all: ui/cache/libuicache.a
-
-ui/cache/clean:
-       rm -f ui/cache/libuicache.a $(ui_libuicache_a_OBJECTS)
-
-ui_cache_libuicache_a_SOURCES =        \
+ink_common_sources +=  \
        ui/cache/svg_preview_cache.h    \
        ui/cache/svg_preview_cache.cpp
 

diff --git a/src/ui/dialog/Makefile_insert b/src/ui/dialog/Makefile_insert
index 1901189464ba8f7aacbcddca20f92d45a8735b01..bf3b6baeb2d17f5b0305acce5bf98650602d9f4d 100644 (file)
--- a/src/ui/dialog/Makefile_insert
+++ b/src/ui/dialog/Makefile_insert
@@ -1,11 +1,6 @@
 ## Makefile.am fragment sourced by src/Makefile.am.
 
-ui/dialog/all: ui/dialog/libuidialog.a
-
-ui/dialog/clean:
-       rm -f ui/dialog/libuidialog.a $(ui_libuidialog_a_OBJECTS)
-
-ui_dialog_libuidialog_a_SOURCES =              \
+ink_common_sources +=          \
        ui/dialog/aboutbox.cpp                  \
        ui/dialog/aboutbox.h                    \
        ui/dialog/align-and-distribute.cpp      \

diff --git a/src/ui/view/Makefile_insert b/src/ui/view/Makefile_insert
index bca346b762da1204c2303b5224e1ca0038f11623..812ce21ca8eba209cf366ab477460782d8ed6eb9 100644 (file)
--- a/src/ui/view/Makefile_insert
+++ b/src/ui/view/Makefile_insert
@@ -1,11 +1,6 @@
 ## Makefile.am fragment sourced by src/Makefile.am.
 
-ui/view/all: ui/view/libuiview.a
-
-ui/view/clean:
-       rm -f ui/view/libuiview.a $(ui_libuiview_a_OBJECTS)
-
-ui_view_libuiview_a_SOURCES =          \
+ink_common_sources +=          \
        ui/view/edit.h                  \
        ui/view/edit.cpp                \
        ui/view/edit-widget.h           \

diff --git a/src/ui/widget/Makefile_insert b/src/ui/widget/Makefile_insert
index a1af8a161e690e9d5f183dedfb349e86dedd3477..9b4048ea927b56ab347bef6d434679e07b64684b 100644 (file)
--- a/src/ui/widget/Makefile_insert
+++ b/src/ui/widget/Makefile_insert
@@ -1,11 +1,6 @@
 ## Makefile.am fragment sourced by src/Makefile.am.
 
-ui/widget/all: ui/widget/libuiwidget.a
-
-ui/widget/clean:
-       rm -f ui/widget/libuiwidget.a $(ui_libuiwidget_a_OBJECTS)
-
-ui_widget_libuiwidget_a_SOURCES =      \
+ink_common_sources +=  \
        ui/widget/attr-widget.h \
        ui/widget/button.h      \
        ui/widget/button.cpp    \

diff --git a/src/util/Makefile_insert b/src/util/Makefile_insert
index a21cdc6eb20c2072263bbcba589138b5280631fa..b76a4dcdb49787f87af028268899e0918ba30371 100644 (file)
--- a/src/util/Makefile_insert
+++ b/src/util/Makefile_insert
@@ -1,10 +1,6 @@
+## Makefile.am fragment sourced by src/Makefile.am.
 
-util/all: util/libinkutil.a
-
-util/clean:
-       rm -f util/libinkutil.a $(util_libinkutil_a_OBJECTS)
-
-util_libinkutil_a_SOURCES = \
+ink_common_sources += \
        util/compose.hpp        \
        util/ucompose.hpp       \
        util/enums.h \

diff --git a/src/widgets/Makefile_insert b/src/widgets/Makefile_insert
index fdebe8d20eec7f1e49992a1ac36f72050c60ffb7..32a8a71e5310acd2d0746424cf9995eb2fe5eb0c 100644 (file)
--- a/src/widgets/Makefile_insert
+++ b/src/widgets/Makefile_insert
@@ -1,40 +1,28 @@
 ## Makefile.am fragment sourced by src/Makefile.am.
 
-#
-# Widgets for inkscape
-# Author: Lauris Kaplinski <lauris@ximian.com>
-#
-
-widgets/all: widgets/libspwidgets.a
-
-widgets/clean:
-       rm -f widgets/libspwidgets.a $(widgets_libspwidgets_a_OBJECTS)
-
-widgets_libspwidgets_a_SOURCES =       \
+ink_common_sources +=  \
        widgets/button.cpp              \
        widgets/button.h                \
        widgets/calligraphic-profile-rename.cpp \
        widgets/calligraphic-profile-rename.h   \
        widgets/dash-selector.cpp       \
        widgets/dash-selector.h         \
-       widgets/dash-selector.cpp       \
-       widgets/dash-selector.h         \
        widgets/desktop-widget.cpp      \
        widgets/desktop-widget.h        \
        widgets/font-selector.cpp       \
        widgets/font-selector.h         \
-       widgets/gradient-toolbar.cpp    \
-       widgets/gradient-toolbar.h      \
        widgets/gradient-image.cpp      \
        widgets/gradient-image.h        \
        widgets/gradient-selector.cpp   \
        widgets/gradient-selector.h     \
+       widgets/gradient-toolbar.cpp    \
+       widgets/gradient-toolbar.h      \
        widgets/gradient-vector.cpp     \
        widgets/gradient-vector.h       \
        widgets/icon.cpp                \
        widgets/icon.h                  \
-       widgets/layer-selector.h        \
        widgets/layer-selector.cpp      \
+       widgets/layer-selector.h        \
        widgets/paint-selector.cpp      \
        widgets/paint-selector.h        \
        widgets/ruler.cpp               \
@@ -57,22 +45,22 @@ widgets_libspwidgets_a_SOURCES =    \
        widgets/sp-color-selector.h     \
        widgets/sp-color-slider.cpp     \
        widgets/sp-color-slider.h       \
-       widgets/sp-color-wheel-selector.cpp     \
-       widgets/sp-color-wheel-selector.h       \
        widgets/sp-color-wheel.cpp      \
        widgets/sp-color-wheel.h        \
+       widgets/sp-color-wheel-selector.cpp     \
+       widgets/sp-color-wheel-selector.h       \
+       widgets/spinbutton-events.cpp   \
+       widgets/spinbutton-events.h     \
        widgets/sp-widget.cpp           \
        widgets/sp-widget.h             \
+       widgets/spw-utilities.cpp       \
+       widgets/spw-utilities.h         \
        widgets/sp-xmlview-attr-list.cpp        \
        widgets/sp-xmlview-attr-list.h  \
        widgets/sp-xmlview-content.cpp  \
        widgets/sp-xmlview-content.h    \
        widgets/sp-xmlview-tree.cpp     \
        widgets/sp-xmlview-tree.h       \
-       widgets/spinbutton-events.cpp   \
-       widgets/spinbutton-events.h     \
-       widgets/spw-utilities.cpp       \
-       widgets/spw-utilities.h         \
        widgets/toolbox.cpp             \
        widgets/toolbox.h               \
        widgets/widget-sizes.h

diff --git a/src/xml/Makefile_insert b/src/xml/Makefile_insert
index d135b786e2683917aa05ee1d7e6f20eec73bbf1c..f585f140749cd0e109afd2075b5ecfb8bf5a0aad 100644 (file)
--- a/src/xml/Makefile_insert
+++ b/src/xml/Makefile_insert
@@ -1,19 +1,6 @@
 ## Makefile.am fragment sourced by src/Makefile.am.
 
-#
-# Sodipodi xml wrapper
-# Author: Lauris Kaplinski <lauris@ariman.ee>
-#
-# Implements xml backbone of inkscape document. In future will be
-# repaced with (wrapper of?) DOM
-#
-
-xml/all: xml/libspxml.a
-
-xml/clean:
-       rm -f xml/libspxml.a xml/libtest-xml.a $(xml_libspxml_a_OBJECTS) $(xml_libtest_xml_a_OBJECTS)
-
-xml_libspxml_a_SOURCES =       \
+ink_common_sources +=  \
        algorithms/find-if-before.h     \
        xml/comment-node.h \
        xml/composite-node-observer.cpp xml/composite-node-observer.h \