r17225@mini-emma: ted | 2007-12-10 20:22:27 -0800

 Adjusting line-snapper.cpp so that it doesn't include snapper-line.cpp such that it can be included normally in the Makefile_insert.  Also, adding in helper-fns.h to the included source files.

diff --git a/src/Makefile_insert b/src/Makefile_insert
index 3d5d2e55a3b8942aa62c2a807a84613ffca000be..0e9a417bb920ff141d0d937b011393cb3dd8200f 100644 (file)
--- a/src/Makefile_insert
+++ b/src/Makefile_insert
@@ -82,6 +82,7 @@ libinkpre_a_SOURCES = \
        gradient-context.cpp gradient-context.h \
        gradient-drag.cpp gradient-drag.h \
        help.cpp help.h \
+       helper-fns.h \
         icon-size.h \
        inkscape-stock.cpp inkscape-stock.h\
        inkscape.cpp inkscape.h inkscape-private.h      \
@@ -141,6 +142,7 @@ libinkpre_a_SOURCES =       \
        shape-editor.cpp shape-editor.h \
        shortcuts.cpp shortcuts.h       \
        snap.cpp snap.h \
+       snapped-line.cpp snapped-line.h \
        snapped-point.cpp snapped-point.h \
        snapper.cpp snapper.h \
        line-snapper.cpp line-snapper.h \

diff --git a/src/line-snapper.cpp b/src/line-snapper.cpp
index 446ec73e73deab0c57eafa6545f2b9533597f350..2fa08e1f1c4880b2430992764ed6895c74989df7 100644 (file)
--- a/src/line-snapper.cpp
+++ b/src/line-snapper.cpp
@@ -15,7 +15,7 @@
 #include "libnr/nr-point-fns.h"
 #include <2geom/geom.h>
 #include "line-snapper.h"
-#include "snapped-line.cpp"
+#include "snapped-line.h"
 #include <gtk/gtk.h>
 
 Inkscape::LineSnapper::LineSnapper(SPNamedView const *nv, NR::Coord const d) : Snapper(nv, d)