Code

Corrected initialization order.
[inkscape.git] / src / Makefile_insert
index c4f196dd5cd82e754a178c31ee96ad459bc569f7..4bef3dc5634734af4c314931eb15b33b8bf17017 100644 (file)
@@ -49,6 +49,7 @@ libinkpre_a_SOURCES = \
        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       \
@@ -72,6 +73,7 @@ libinkpre_a_SOURCES = \
        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   \
@@ -79,26 +81,27 @@ libinkpre_a_SOURCES =       \
        filter-chemistry.cpp filter-chemistry.h \
        filter-enums.cpp filter-enums.h \
        flood-context.cpp flood-context.h       \
-       fontsize-expansion.cpp fontsize-expansion.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-stock.cpp inkscape-stock.h\
        inkscape.cpp inkscape.h inkscape-private.h      \
        interface.cpp interface.h       \
-       isnan.h isinf.h \
+       isinf.h \
        isnormal.h \
        knot-enums.h    \
-       knot-holder-entity.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       \
@@ -127,8 +130,6 @@ libinkpre_a_SOURCES =       \
        menus-skeleton.h        \
        prefix.cpp      \
        prefix.h        \
-       prefs-utils.cpp \
-       prefs-utils.h   \
        print.cpp print.h       \
        profile-manager.cpp     \
        profile-manager.h       \
@@ -147,6 +148,8 @@ libinkpre_a_SOURCES =       \
        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 \
@@ -161,42 +164,8 @@ libinkpre_a_SOURCES =      \
        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-feblend.cpp sp-feblend.h     \
-       sp-feblend-fns.h        \
-       sp-fecolormatrix.cpp sp-fecolormatrix.h \
-       sp-fecolormatrix-fns.h  \
-       sp-fecomponenttransfer.cpp sp-fecomponenttransfer.h     \
-       sp-fecomponenttransfer-funcnode.cpp sp-fecomponenttransfer-funcnode.h   \
-       sp-fecomponenttransfer-fns.h    \
-       sp-fecomposite.cpp sp-fecomposite.h     \
-       sp-fecomposite-fns.h    \
-       sp-feconvolvematrix.cpp sp-feconvolvematrix.h   \
-       sp-feconvolvematrix-fns.h       \
-       sp-fediffuselighting.cpp sp-fediffuselighting.h \
-       sp-fediffuselighting-fns.h      \
-       sp-fedisplacementmap.cpp sp-fedisplacementmap.h \
-       sp-fedisplacementmap-fns.h      \
-       sp-fedistantlight.cpp sp-fedistantlight.h \
-       sp-feflood.cpp sp-feflood.h     \
-       sp-feflood-fns.h        \
-       sp-feimage.cpp sp-feimage.h     \
-       sp-feimage-fns.h        \
-       sp-femerge.cpp sp-femerge.h     \
-       sp-femerge-fns.h        \
-       sp-femergenode.cpp sp-femergenode.h \
-       sp-femorphology.cpp sp-femorphology.h   \
-       sp-femorphology-fns.h   \
-       sp-feoffset.cpp sp-feoffset.h   \
-       sp-feoffset-fns.h       \
-       sp-fepointlight.cpp sp-fepointlight.h \
-       sp-fespecularlighting.cpp sp-fespecularlighting.h       \
-       sp-fespecularlighting-fns.h     \
-       sp-fespotlight.cpp sp-fespotlight.h \
-       sp-fetile.cpp sp-fetile.h       \
-       sp-fetile-fns.h \
-       sp-feturbulence.cpp sp-feturbulence.h   \
-       sp-feturbulence-fns.h   \
        sp-filter-fns.h \
        sp-filter-primitive.cpp \
        sp-filter-primitive.h   \
@@ -208,8 +177,10 @@ libinkpre_a_SOURCES =      \
        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       \
@@ -253,6 +224,7 @@ libinkpre_a_SOURCES =       \
        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   \
@@ -263,6 +235,7 @@ libinkpre_a_SOURCES =       \
        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 \
@@ -271,10 +244,6 @@ libinkpre_a_SOURCES =      \
        spiral-context.cpp spiral-context.h     \
        splivarot.cpp splivarot.h       \
        star-context.cpp star-context.h \
-       streams-gzip.h streams-gzip.cpp \
-       streams-handles.h streams-handles.cpp   \
-       streams-jar.h streams-jar.cpp   \
-       streams-zlib.h streams-zlib.cpp \
        style.cpp style.h       \
        sp-style-elem.cpp sp-style-elem.h       \
        svg-profile.h \
@@ -286,6 +255,7 @@ libinkpre_a_SOURCES =       \
        text-tag-attributes.h   \
        tools-switch.cpp tools-switch.h\
        tweak-context.h tweak-context.cpp \
+       unicoderange.cpp unicoderange.h \
        uri-references.cpp uri-references.h     \
        vanishing-point.cpp vanishing-point.h   \
        verbs.cpp verbs.h       \
@@ -320,6 +290,7 @@ libinkpost_a_SOURCES =      \
        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  \
@@ -346,12 +317,12 @@ inkscape_private_libs =   \
        pedro/libpedro.a        \
        trace/libtrace.a        \
        svg/libspsvg.a          \
+       filters/libfilters.a    \
        widgets/libspwidgets.a  \
        display/libspdisplay.a  \
        helper/libspchelp.a     \
        libcroco/libcroco.a     \
        libnrtype/libnrtype.a   \
-       libnr/libnr.a           \
        libavoid/libavoid.a     \
        livarot/libvarot.a      \
        live_effects/liblive_effects.a  \
@@ -367,6 +338,7 @@ inkscape_private_libs =     \
        extension/libextension.a        \
        extension/implementation/libimplementation.a    \
        extension/internal/libinternal.a        \
+       libnr/libnr.a           \
        extension/script/libscript.a    \
        bind/libbind.a  \
        dom/libdom.a            \
@@ -427,12 +399,12 @@ style_test_LDADD = $(all_libs)
 inkscape_version.h: ../configure.ac
        echo '#define INKSCAPE_VERSION "$(VERSION)"' > inkscape_version.h
 
-test_all_includes = \
-               $(srcdir)/attributes-test.h     \
-               $(srcdir)/color-profile-test.h  \
+test_src_includes = \
                $(srcdir)/MultiPrinter.h  \
                $(srcdir)/TRPIFormatter.h \
                $(srcdir)/PylogFormatter.h \
+               $(srcdir)/attributes-test.h     \
+               $(srcdir)/color-profile-test.h  \
                $(srcdir)/dir-util-test.h       \
                $(srcdir)/extract-uri-test.h    \
                $(srcdir)/mod360-test.h \