Merge from trunk

(bzr r9508.1.89)

2 files changed, 40 insertions, 19 deletions

diff --git a/src/libnrtype/CMakeLists.txt b/src/libnrtype/CMakeLists.txt
index 61ecb0091..835665761 100644
--- a/src/libnrtype/CMakeLists.txt
+++ b/src/libnrtype/CMakeLists.txt
@@ -1,19 +1,40 @@
-SET(libnrtype_SRC
-FontFactory.cpp
-FontInstance.cpp
-font-lister.cpp
-font-style-to-pos.cpp
-Layout-TNG.cpp
-Layout-TNG-Compute.cpp
-Layout-TNG-Input.cpp
-Layout-TNG-OutIter.cpp
-Layout-TNG-Output.cpp
-Layout-TNG-Scanline-Makers.cpp
-nr-type-pos-def.cpp
-nr-type-primitives.cpp
-RasterFont.cpp
-TextWrapper.cpp
+
+set(nrtype_SRC
+	FontFactory.cpp
+	FontInstance.cpp
+	font-lister.cpp
+	font-style-to-pos.cpp
+	Layout-TNG.cpp
+	Layout-TNG-Compute.cpp
+	Layout-TNG-Input.cpp
+	Layout-TNG-OutIter.cpp
+	Layout-TNG-Output.cpp
+	Layout-TNG-Scanline-Makers.cpp
+	nr-type-pos-def.cpp
+	nr-type-primitives.cpp
+	RasterFont.cpp
+	TextWrapper.cpp
+
+	FontFactory.h
+	Layout-TNG-Scanline-Maker.h
+	Layout-TNG.h
+	RasterFont.h
+	TextWrapper.h
+	boundary-type.h
+	font-glyph.h
+	font-instance.h
+	font-lister.h
+	font-style-to-pos.h
+	font-style.h
+	nr-type-pos-def.h
+	nr-type-primitives.h
+	nrtype-forward.h
+	one-box.h
+	one-glyph.h
+	one-para.h
+	raster-glyph.h
+	raster-position.h
+	text-boundary.h
 )
-ADD_LIBRARY(nrtype STATIC ${libnrtype_SRC})
-TARGET_LINK_LIBRARIES(nrtype
-nr ${INKSCAPE_LIBS})
+
+add_inkscape_lib(nrtype_LIB "${nrtype_SRC}")
diff --git a/src/libnrtype/Layout-TNG-Input.cpp b/src/libnrtype/Layout-TNG-Input.cpp
index d16c6457d..45bc0c89b 100644
--- a/src/libnrtype/Layout-TNG-Input.cpp
+++ b/src/libnrtype/Layout-TNG-Input.cpp
@@ -11,7 +11,7 @@
 
 #define PANGO_ENABLE_ENGINE
 
-#include <gtk/gtkversion.h>
+#include <gtk/gtk.h>
 #include "Layout-TNG.h"
 #include "style.h"
 #include "svg/svg-length.h"