From 1f59c39cbad9112d2c3fc06967f6e99a3d9c5a00 Mon Sep 17 00:00:00 2001
From: Andy Spencer <andy753421@gmail.com>
Date: Wed, 3 Feb 2010 12:39:42 +0000
Subject: [PATCH] Fix include folders

---
 src/Makefile.am         |  2 +-
 src/gis-opengl.c        |  6 +++---
 src/gis-viewer.h        |  4 ++--
 src/gis-wms.h           |  2 +-
 src/gis.h               | 22 +++++++++++-----------
 src/libgis.pc.in        |  2 +-
 src/objects/Makefile.am | 10 ++++++----
 src/plugins/Makefile.am |  2 +-
 src/tile-test.c         |  2 +-
 9 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 26b6856..5e590b2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = objects . plugins
 
-AM_CFLAGS   = -Wall --std=gnu99 -Iobjects
+AM_CFLAGS   = -Wall --std=gnu99 -I$(top_srcdir)/src
 AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(SOUP_CFLAGS)
 AM_LDADD    = $(GLIB_LIBS) $(GTK_LIBS) $(SOUP_LIBS)
 AM_LDFLAGS  = --as-needed -no-undefined
diff --git a/src/gis-opengl.c b/src/gis-opengl.c
index f0b89f0..1d62957 100644
--- a/src/gis-opengl.c
+++ b/src/gis-opengl.c
@@ -32,9 +32,9 @@
 #include "gis-util.h"
 #include "roam.h"
 
-#include "gis-object.h"
-#include "gis-marker.h"
-#include "gis-callback.h"
+#include "objects/gis-object.h"
+#include "objects/gis-marker.h"
+#include "objects/gis-callback.h"
 
 #define FOV_DIST   2000.0
 #define MPPX(dist) (4*dist/FOV_DIST)
diff --git a/src/gis-viewer.h b/src/gis-viewer.h
index 89b9583..5e84e43 100644
--- a/src/gis-viewer.h
+++ b/src/gis-viewer.h
@@ -40,10 +40,10 @@ typedef struct _GisViewerClass GisViewerClass;
 
 typedef gdouble (*GisHeightFunc)(gdouble lat, gdouble lon, gpointer user_data);
 
-#include "gis-tile.h"
 #include "gis-plugin.h"
 #include "gis-prefs.h"
-#include "gis-object.h"
+#include "objects/gis-object.h"
+#include "objects/gis-tile.h"
 
 struct _GisViewer {
 	GtkDrawingArea parent_instance;
diff --git a/src/gis-wms.h b/src/gis-wms.h
index fbd9cd4..2e35e65 100644
--- a/src/gis-wms.h
+++ b/src/gis-wms.h
@@ -21,7 +21,7 @@
 #include <glib.h>
 #include <libsoup/soup.h>
 
-#include "gis-tile.h"
+#include "objects/gis-tile.h"
 
 typedef struct _GisWms GisWms;
 
diff --git a/src/gis.h b/src/gis.h
index 462abbf..59c2a56 100644
--- a/src/gis.h
+++ b/src/gis.h
@@ -19,22 +19,22 @@
 #define __GIS_H__
 
 /* GIS Core */
-#include "gis-viewer.h"
-#include "gis-opengl.h"
-#include "gis-prefs.h"
-#include "gis-util.h"
+#include <gis-viewer.h>
+#include <gis-opengl.h>
+#include <gis-prefs.h>
+#include <gis-util.h>
 
 /* GIS objects */
-#include "gis-object.h"
-#include "gis-tile.h"
-#include "gis-marker.h"
-#include "gis-callback.h"
+#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"
+#include <gis-wms.h>
+#include <gis-data.h>
 
 /* Plugins */
-#include "gis-plugin.h"
+#include <gis-plugin.h>
 
 #endif
diff --git a/src/libgis.pc.in b/src/libgis.pc.in
index 031cb4a..859289e 100644
--- a/src/libgis.pc.in
+++ b/src/libgis.pc.in
@@ -8,4 +8,4 @@ Description: GIS Library for Gtk+ applications
 Version: @VERSION@
 Requires: gmodule-2.0 gtk+-2.0 gtkglext-1.0 libsoup-2.4
 Libs: -L${libdir} -lgis
-Cflags: -I${includedir}
+Cflags: -I${includedir}/gis
diff --git a/src/objects/Makefile.am b/src/objects/Makefile.am
index 9cf5b6a..73c68ed 100644
--- a/src/objects/Makefile.am
+++ b/src/objects/Makefile.am
@@ -1,9 +1,11 @@
-AM_CFLAGS  = -Wall --std=gnu99 -fPIC -I../
+AM_CFLAGS  = -Wall --std=gnu99 -fPIC -I$(top_srcdir)/src
 AM_CFLAGS += $(GLIB_CFLAGS) $(CAIRO_CFLAGS)
 
-gis_includedir = $(includedir)/gis
-gis_include_HEADERS = \
-	gis-object.h  \
+gis_objects_includedir = $(includedir)/gis/objects
+gis_objects_include_HEADERS = \
+	gis-object.h \
+	gis-marker.h \
+	gis-callback.h \
 	gis-tile.h
 
 noinst_LTLIBRARIES = libgis-objects.la
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index a531f8f..3595bbf 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -1,6 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-AM_CFLAGS   = -Wall --std=gnu99 -I../ -I../objects
+AM_CFLAGS   = -Wall --std=gnu99 -I$(top_srcdir)/src
 AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(SOUP_CFLAGS)
 AM_LDFLAGS  = -module -avoid-version -no-undefined
 LIBS        = $(top_srcdir)/src/libgis.la
diff --git a/src/tile-test.c b/src/tile-test.c
index ccac9f3..7953ec5 100644
--- a/src/tile-test.c
+++ b/src/tile-test.c
@@ -18,9 +18,9 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
-#include "gis-tile.h"
 #include "gis-wms.h"
 #include "gis-util.h"
+#include "objects/gis-tile.h"
 
 struct CacheState {
 	GtkWidget *image;
-- 
2.43.2