Code

Merge from trunk.
[inkscape.git] / src / Makefile_insert
index 1e5b1fea0e3e62092c5aa402146e9ae182d8e259..36c9de34fa25cdd3045a4923d9adb0255ddd144f 100644 (file)
@@ -1,8 +1,8 @@
 ## Makefile.am fragment, included by src/Makefile.am.
 
 ink_common_sources +=  \
-       algorithms/find-last-if.h                                       \
-       algorithms/longest-common-suffix.h                              \
+       util/find-last-if.h                                     \
+       util/longest-common-suffix.h                            \
        approx-equal.h remove-last.h                                    \
        arc-context.cpp arc-context.h                                   \
        attributes.cpp attributes.h                                     \
@@ -67,6 +67,7 @@ ink_common_sources += \
        gradient-chemistry.cpp gradient-chemistry.h                     \
        gradient-context.cpp gradient-context.h                         \
        gradient-drag.cpp gradient-drag.h                               \
+       graphlayout.cpp graphlayout.h                                   \
        guide-snapper.cpp guide-snapper.h                               \
        help.cpp help.h                                                 \
        helper-fns.h                                                    \
@@ -77,6 +78,8 @@ ink_common_sources += \
        ige-mac-menu.h ige-mac-menu.c                                   \
        ink-action.cpp                                                  \
        ink-action.h                                                    \
+       ink-comboboxentry-action.cpp                                    \
+       ink-comboboxentry-action.h                                      \
        inkscape.cpp inkscape.h inkscape-private.h                      \
        interface.cpp interface.h                                       \
        isinf.h                                                         \
@@ -117,6 +120,7 @@ ink_common_sources +=       \
        print.cpp print.h                                               \
        profile-manager.cpp profile-manager.h                           \
        proj_pt.cpp proj_pt.h                                           \
+       removeoverlap.cpp removeoverlap.h                               \
        rdf.cpp rdf.h                                                   \
        rect-context.cpp rect-context.h                                 \
        require-config.h                                                \
@@ -133,6 +137,7 @@ ink_common_sources +=       \
        shape-editor.cpp shape-editor.h                                 \
        shortcuts.cpp shortcuts.h                                       \
        snap.cpp snap.h                                                 \
+       snap-enums.h snap-candidate.h \
        snapped-curve.cpp snapped-curve.h                               \
        snapped-line.cpp snapped-line.h                                 \
        snapped-point.cpp snapped-point.h                               \