Merge from trunk

(bzr r9508.1.89)

2 files changed, 37 insertions, 19 deletions

diff --git a/src/libavoid/CMakeLists.txt b/src/libavoid/CMakeLists.txt
index 3f408074c..de067833b 100644
--- a/src/libavoid/CMakeLists.txt
+++ b/src/libavoid/CMakeLists.txt
@@ -1,19 +1,37 @@
-SET(libavoid_SRC
-connector.cpp
-geometry.cpp
-graph.cpp
-makepath.cpp
-polyutil.cpp
-region.cpp
-router.cpp
-shape.cpp
-static.cpp
-timer.cpp
-vertices.cpp
-visibility.cpp
-orthogonal.cpp
-vpsc.cpp
+
+set(libavoid_SRC
+	connector.cpp
+	geometry.cpp
+	geomtypes.cpp
+	graph.cpp
+	makepath.cpp
+	orthogonal.cpp
+	router.cpp
+	shape.cpp
+	timer.cpp
+	vertices.cpp
+	viscluster.cpp
+	visibility.cpp
+	vpsc.cpp
+
+	# -------
+	# Headers
+	assertions.h
+	connector.h
+	debug.h
+	geometry.h
+	geomtypes.h
+	graph.h
+	libavoid.h
+	makepath.h
+	orthogonal.h
+	router.h
+	shape.h
+	timer.h
+	vertices.h
+	viscluster.h
+	visibility.h
+	vpsc.h
 )
-ADD_LIBRARY(avoid STATIC ${libavoid_SRC})
-TARGET_LINK_LIBRARIES(avoid
-${INKSCAPE_LIBS})
\ No newline at end of file
+
+add_inkscape_lib(avoid_LIB "${libavoid_SRC}")
diff --git a/src/libavoid/orthogonal.cpp b/src/libavoid/orthogonal.cpp
index 4a7b0af2d..e0a30b246 100644
--- a/src/libavoid/orthogonal.cpp
+++ b/src/libavoid/orthogonal.cpp
@@ -1731,7 +1731,7 @@ static void buildOrthogonalChannelInfo(Router *router,
         Polygon& displayRoute = (*curr)->displayRoute();
         // Determine all line segments that we are interested in shifting.
         // We don't consider the first or last segment of a path.
-        for (size_t i = 1; i < displayRoute.size(); ++i)
+        for (size_t i = 1; i < displayRoute.size()-1; ++i)
         {
             if (displayRoute.ps[i - 1][dim] == displayRoute.ps[i][dim])
             {