From ba5c156c45d0c84653e8a09ee1baa29dcbafe3ab Mon Sep 17 00:00:00 2001
From: Andreas Volz <lists@brachttal.net>
Date: Fri, 8 Feb 2008 19:41:57 +0000
Subject: [PATCH] fixed autotools build

---
 include/mapnik/Makefile.am      | 14 +++++++----
 plugins/input/shape/Makefile.am | 15 ++++++------
 src/Makefile.am                 | 42 +++++++++++++++++----------------
 3 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/include/mapnik/Makefile.am b/include/mapnik/Makefile.am
index 8ee2b2849..58b8f0751 100644
--- a/include/mapnik/Makefile.am
+++ b/include/mapnik/Makefile.am
@@ -8,6 +8,7 @@ endif
 
 libmapnik_HEADERS = \
 	agg_renderer.hpp\
+	arrow.hpp \
 	attribute.hpp \
 	attribute_collector.hpp \
 	attribute_descriptor.hpp \
@@ -15,7 +16,7 @@ libmapnik_HEADERS = \
 	color_factory.hpp \
 	comparison.hpp \
 	config.hpp \
-  config_error.hpp \
+	config_error.hpp \
 	coord.hpp \
 	coord_array.hpp \
 	css_color_parser.hpp \
@@ -24,7 +25,7 @@ libmapnik_HEADERS = \
 	datasource_cache.hpp \
 	distance.hpp \
 	ellipsoid.hpp \
-  enumeration.hpp \
+  	enumeration.hpp \
 	envelope.hpp \
 	expression.hpp \
 	factory.hpp \
@@ -52,30 +53,35 @@ libmapnik_HEADERS = \
 	image_reader.hpp \
 	image_util.hpp \
 	image_view.hpp \
+	jpeg_io.hpp \
 	label_collision_detector.hpp \
 	label_placement.hpp \
 	layer.hpp \
-  ${libxml2_inc} \
+  	${libxml2_inc} \
 	line_pattern_symbolizer.hpp \
 	line_symbolizer.hpp \
 	load_map.hpp \
 	local_datasource.hpp \
 	logical.hpp \
 	map.hpp \
+	markers_converter.hpp \
+	markers_symbolizer.hpp \
 	math_expr.hpp \
 	memory.hpp \
 	memory_datasource.hpp \
 	memory_featureset.hpp \
+	octree.hpp \
 	params.hpp \
 	placement_finder.hpp \
 	plugin.hpp \
+	png_io.hpp \
 	point_symbolizer.hpp \
 	polygon_pattern_symbolizer.hpp \
 	polygon_symbolizer.hpp \
 	pool.hpp \
 	projection.hpp \
 	proj_transform.hpp \
-  ptree_helpers.hpp \
+  	ptree_helpers.hpp \
 	quad_tree.hpp \
 	query.hpp \
 	raster.hpp \
diff --git a/plugins/input/shape/Makefile.am b/plugins/input/shape/Makefile.am
index e09abe298..58e335922 100644
--- a/plugins/input/shape/Makefile.am
+++ b/plugins/input/shape/Makefile.am
@@ -3,14 +3,13 @@ pkglib_LTLIBRARIES = \
 	shape.la
 
 shape_la_SOURCES = \
-	dbffile.cpp        \
-	dbf_test.cpp        \
-	shape.cpp        \
-	shape_featureset.cpp        \
-	shapefile.cpp        \
-	shape_index_featureset.cpp        \
-	shape_io.cpp        \
-	shp_index.cpp
+	dbffile.cpp \
+	dbf_test.cpp \
+	shape.cpp \
+	shape_featureset.cpp \
+	shapefile.cpp \
+	shape_index_featureset.cpp \
+	shape_io.cpp
 
 shape_la_CXXFLAGS = \
 	-I../../../include
diff --git a/src/Makefile.am b/src/Makefile.am
index 2730daa5e..6dc68f03b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,7 +20,8 @@ libxml2_src = \
 endif
 
 libmapnik_la_SOURCES = \
-	agg_renderer.cpp\
+	agg_renderer.cpp \
+	arrow.cpp \
 	datasource_cache.cpp \
 	distance.cpp \
 	envelope.cpp \
@@ -30,7 +31,7 @@ libmapnik_la_SOURCES = \
 	image_reader.cpp \
 	image_util.cpp \
 	layer.cpp \
-  ${libxml2_src} \
+  	${libxml2_src} \
 	line_pattern_symbolizer.cpp \
 	load_map.cpp \
 	map.cpp \
@@ -47,38 +48,39 @@ libmapnik_la_SOURCES = \
 	save_map.cpp \
 	scale_denominator.cpp \
 	shield_symbolizer.cpp \
-  stroke.cpp \
-  symbolizer.cpp \
+  	stroke.cpp \
+  	symbolizer.cpp \
 	text_symbolizer.cpp \
 	tiff_reader.cpp \
+	unicode.cpp \
 	wkb.cpp
   
 
 libmapnik_la_LIBADD = \
 	${PNG_LIBS} \
-  ${FREETYPE2_LIBS} \
-  ${AGG_LIBS} \
+  	${FREETYPE2_LIBS} \
+  	${AGG_LIBS} \
 	${BOOST_LDFLAGS} \
 	${BOOST_THREAD_LIB} \
 	${BOOST_REGEX_LIB} \
 	${BOOST_FILESYSTEM_LIB} \
-  ${JPEG_LIBS} \
-  ${TIFF_LIBS} \
-  ${PROJ_LIBS} \
-  ${LTDL_LIBS} \
-  ${LIBXML2_LIBS}
+  	${JPEG_LIBS} \
+  	${TIFF_LIBS} \
+  	${PROJ_LIBS} \
+  	${LTDL_LIBS} \
+  	${LIBXML2_LIBS}
 
 libmapnik_la_CXXFLAGS = \
-  -I../include        \
+  	-I../include        \
 	${PNG_CFLAGS} \
-  ${FREETYPE2_CFLAGS} \
-  ${AGG_CFLAGS} \
-  ${JPEG_CFLAGS} \
-  ${TIFF_CFLAGS} \
-  ${PROJ_CFLAGS} \
-  ${LTDL_CFLAGS} \
-  ${BOOST_CPPFLAGS} \
-  ${LIBXML2_CFLAGS}
+  	${FREETYPE2_CFLAGS} \
+  	${AGG_CFLAGS} \
+  	${JPEG_CFLAGS} \
+  	${TIFF_CFLAGS} \
+  	${PROJ_CFLAGS} \
+  	${LTDL_CFLAGS} \
+  	${BOOST_CPPFLAGS} \
+  	${LIBXML2_CFLAGS}