Move data access to a subdirectory

diff --git a/configure.ac b/configure.ac
index 4d503a6b9b286f53bf7978718251bc1d7617753c..e8f0430465e69418b3d1c01f7ba5143a133c2bd9 100644 (file)
--- 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 5e590b2fd281f2f7580d73897f2c345e83d908af..6e33bff95030a8dfdd159d0ebc95a5113e958e7a 100644 (file)
--- 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 (file)
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 59c2a566a3978473ceea38696a2f5d38d9139bc7..9a4c2a78534799091a4a4808a025f6f7614e927d 100644 (file)
--- 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 7953ec51ee75792be7d64f71929630689934402d..2151f243058d7c2645545adaba6ddb91bc046157 100644 (file)
--- 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 {