From: Andy Spencer <andy753421@gmail.com>
Date: Fri, 5 Feb 2010 10:54:50 +0000 (+0000)
Subject: Move data access to a subdirectory
X-Git-Tag: v0.4~90
X-Git-Url: http://pileus.org/git/?p=grits;a=commitdiff_plain;h=c6b75d03c13b03911e8bc4df46054caa1ace5a0a

Move data access to a subdirectory
---

diff --git a/configure.ac b/configure.ac
index 4d503a6..e8f0430 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,6 +21,7 @@ PKG_CHECK_MODULES(SOUP,  libsoup-2.4 >= 2.26)
 AC_CONFIG_FILES([
 	Makefile
 	src/Makefile
+	src/data/Makefile
 	src/objects/Makefile
 	src/plugins/Makefile
 	src/libgis.pc
diff --git a/src/Makefile.am b/src/Makefile.am
index 5e590b2..6e33bff 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = objects . plugins
+SUBDIRS = data objects . plugins
 
 AM_CFLAGS   = -Wall --std=gnu99 -I$(top_srcdir)/src
 AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(SOUP_CFLAGS)
@@ -17,8 +17,6 @@ gis_include_HEADERS = \
 	gis-opengl.h  \
 	gis-plugin.h  \
 	gis-util.h    \
-	gis-wms.h     \
-	gis-data.h    \
 	gpqueue.h     \
 	roam.h
 
@@ -36,15 +34,14 @@ libgis_la_SOURCES = gis.h \
 	gis-plugin.c  gis-plugin.h  \
 	gis-marshal.c gis-marshal.h \
 	gis-util.c    gis-util.h    \
-	gis-wms.c     gis-wms.h     \
-	gis-data.c    gis-data.h    \
 	roam.c        roam.h        \
 	gpqueue.c     gpqueue.h
 libgis_la_CPPFLAGS = $(AM_CPPFLAGS) \
 	-DPKGDATADIR="\"$(datadir)/gis\"" \
 	-DPLUGINSDIR="\"$(libdir)/gis\""
 libgis_la_LIBADD  = $(AM_LDADD) \
-	objects/libgis-objects.la
+	objects/libgis-objects.la \
+	data/libgis-data.la
 
 # Test programs
 bin_PROGRAMS = gis-demo tile-test
diff --git a/src/data/Makefile.am b/src/data/Makefile.am
new file mode 100644
index 0000000..15ebe47
--- /dev/null
+++ b/src/data/Makefile.am
@@ -0,0 +1,15 @@
+AM_CFLAGS  = -Wall --std=gnu99 -fPIC -I$(top_srcdir)/src
+AM_CFLAGS += $(GLIB_CFLAGS) $(SOUP_CFLAGS)
+
+gis_data_includedir = $(includedir)/gis/data
+gis_data_include_HEADERS = \
+	gis-data.h \
+	gis-wms.h
+
+noinst_LTLIBRARIES = libgis-data.la
+libgis_data_la_SOURCES = \
+	gis-data.c gis-data.h \
+	gis-wms.c  gis-wms.h
+libgis_data_la_LDFLAGS = -static
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/gis-data.c b/src/data/gis-data.c
similarity index 100%
rename from src/gis-data.c
rename to src/data/gis-data.c
diff --git a/src/gis-data.h b/src/data/gis-data.h
similarity index 100%
rename from src/gis-data.h
rename to src/data/gis-data.h
diff --git a/src/gis-wms.c b/src/data/gis-wms.c
similarity index 100%
rename from src/gis-wms.c
rename to src/data/gis-wms.c
diff --git a/src/gis-wms.h b/src/data/gis-wms.h
similarity index 100%
rename from src/gis-wms.h
rename to src/data/gis-wms.h
diff --git a/src/gis.h b/src/gis.h
index 59c2a56..9a4c2a7 100644
--- a/src/gis.h
+++ b/src/gis.h
@@ -24,16 +24,16 @@
 #include <gis-prefs.h>
 #include <gis-util.h>
 
+/* GIS data */
+#include <data/gis-data.h>
+#include <data/gis-wms.h>
+
 /* GIS objects */
 #include <objects/gis-object.h>
 #include <objects/gis-tile.h>
 #include <objects/gis-marker.h>
 #include <objects/gis-callback.h>
 
-/* GIS data */
-#include <gis-wms.h>
-#include <gis-data.h>
-
 /* Plugins */
 #include <gis-plugin.h>
 
diff --git a/src/tile-test.c b/src/tile-test.c
index 7953ec5..2151f24 100644
--- a/src/tile-test.c
+++ b/src/tile-test.c
@@ -18,8 +18,8 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
-#include "gis-wms.h"
 #include "gis-util.h"
+#include "data/gis-wms.h"
 #include "objects/gis-tile.h"
 
 struct CacheState {