From 01e4ed7178aa8dca09487a8dd880f634350a1dd1 Mon Sep 17 00:00:00 2001
From: Andrea Zagli <azagli@libero.it>
Date: Sun, 5 Jul 2009 17:24:23 +0200
Subject: [PATCH] Removed samples data from dist. Changed includedir.

---
 configure.ac              |  1 -
 src/Makefile.am           |  4 +++-
 src/libgtkgis.h           | 13 ++++++++++++-
 tests/Makefile.am         |  2 +-
 tests/samples/Makefile.am | 17 -----------------
 tests/test1.gtkgis        |  4 ++--
 6 files changed, 18 insertions(+), 23 deletions(-)
 delete mode 100644 tests/samples/Makefile.am

diff --git a/configure.ac b/configure.ac
index 2577e57..4f9cff1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,6 +55,5 @@ AC_CONFIG_FILES([
   src/Makefile
   data/Makefile
   tests/Makefile
-  tests/samples/Makefile
 ])
 AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
index e17fdd6..04f4516 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,6 +9,8 @@ lib_LTLIBRARIES = libgtkgis.la
 
 libgtkgis_la_LDFLAGS = -no-undefined
 
+libgtkgisincludedir = $(includedir)/gtkgis
+
 libgtkgis_la_SOURCES = \
                        gtkgis.c \
                        layersgroup.c \
@@ -22,7 +24,7 @@ libgtkgis_la_SOURCES = \
                        geometrypolygon.c \
                        geometryraster.c
 
-include_HEADERS = \
+libgtkgisinclude_HEADERS = \
                   libgtkgis.h \
                   commons.h \
                   gtkgis.h \
diff --git a/src/libgtkgis.h b/src/libgtkgis.h
index 46c15ab..b567572 100644
--- a/src/libgtkgis.h
+++ b/src/libgtkgis.h
@@ -20,6 +20,17 @@
 #ifndef __LIBGTKGIS_H__
 #define __LIBGTKGIS_H__
 
-#include <gtkgis.h>
+#include <gtkgis/commons.h>
+#include <gtkgis/gtkgis.h>
+#include <gtkgis/layersgroup.h>
+#include <gtkgis/layer.h>
+#include <gtkgis/layersource.h>
+#include <gtkgis/layersourceshp.h>
+#include <gtkgis/layersourcepostgis.h>
+#include <gtkgis/geometry.h>
+#include <gtkgis/geometrypoint.h>
+#include <gtkgis/geometryline.h>
+#include <gtkgis/geometrypolygon.h>
+#include <gtkgis/geometryraster.h>
 
 #endif /* __LIBGTKGIS_H__ */
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1a40d6a..27d0331 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = samples
+SUBDIRS =
 
 LIBS = $(GTKGIS_LIBS) \
        $(GDAL_LIBS)
diff --git a/tests/samples/Makefile.am b/tests/samples/Makefile.am
deleted file mode 100644
index d09a97a..0000000
--- a/tests/samples/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-EXTRA_DIST = \
-             airports.dbf \
-             airports.prj \
-             airports.shp \
-             airports.shx \
-             alaska.dbf \
-             alaska.prj \
-             alaska.shp \
-             alaska.shx \
-             railroads.dbf \
-             railroads.prj \
-             railroads.shp \
-             railroads.shx \
-             rivers.dbf \
-             rivers.prj \
-             rivers.shp \
-             rivers.shx
diff --git a/tests/test1.gtkgis b/tests/test1.gtkgis
index c68e7a5..090eb87 100644
--- a/tests/test1.gtkgis
+++ b/tests/test1.gtkgis
@@ -6,11 +6,11 @@
 		</source>
 	</layer>
 
-	<!--<layer name="airports">
+	<layer name="airports">
 		<source>
 			<shape filename="tests/samples/airports.shp" />
 		</source>
-	</layer>-->
+	</layer>
 
 	<layer name="railroads">
 		<source>
-- 
2.49.0