Removed samples data from dist.

Changed includedir.

diff --git a/configure.ac b/configure.ac
index 2577e5758e2d612b4881522baae9f4ba29d0e225..4f9cff1e0a1121c7df23f819caefcde4987634b6 100644 (file)
--- 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 e17fdd6c0032eeabbd9ea50dcb5fa1981b62cca2..04f45163961209b952f7354e3dbdc3901879287c 100644 (file)
--- 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 46c15ab2c8475608b3d0e7ff21bc9e66df898fda..b567572889a605c081064003ed086baf2778df0d 100644 (file)
--- 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 1a40d6aa5bc24e2426fe26205fa421d80f70187c..27d03314b3c8b1f45193d97b10d4a393cae5d5f7 100644 (file)
--- 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 (file)
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 c68e7a5ba7a280463a79782a2af66164f4e0b68f..090eb87d9692a9a56b7d64ec2546afc7dbcdb4e3 100644 (file)
--- 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>