Fix include folders

diff --git a/src/Makefile.am b/src/Makefile.am
index 26b68566abe1bb4e18f53958c341b5c7e593b5a5..5e590b2fd281f2f7580d73897f2c345e83d908af 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = objects . plugins
 
 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
 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 f0b89f03145735f42b4a759dcd1dc933b1a0e8c4..1d629574644e8d93a7bafd1768f07b4f6e62083c 100644 (file)
--- a/src/gis-opengl.c
+++ b/src/gis-opengl.c
@@ -32,9 +32,9 @@
 #include "gis-util.h"
 #include "roam.h"
 
 #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)
 
 #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 89b95835121fe5a6cce61eb39e0b1645c5f4777e..5e84e439157fb991656f76a0a03d4d98d74a5eca 100644 (file)
--- 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);
 
 
 typedef gdouble (*GisHeightFunc)(gdouble lat, gdouble lon, gpointer user_data);
 

-#include "gis-tile.h"

 #include "gis-plugin.h"
 #include "gis-prefs.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;
 
 struct _GisViewer {
        GtkDrawingArea parent_instance;

diff --git a/src/gis-wms.h b/src/gis-wms.h
index fbd9cd4947a7f5f1c53e512f0deb088301258a7b..2e35e65b3ff99357e6723f4f9d58f70e6dca884c 100644 (file)
--- a/src/gis-wms.h
+++ b/src/gis-wms.h
@@ -21,7 +21,7 @@
 #include <glib.h>
 #include <libsoup/soup.h>
 
 #include <glib.h>
 #include <libsoup/soup.h>
 

-#include "gis-tile.h"
+#include "objects/gis-tile.h"

 
 typedef struct _GisWms GisWms;
 
 
 typedef struct _GisWms GisWms;
 

diff --git a/src/gis.h b/src/gis.h
index 462abbfcfca133948eb332b93c7585ebe9d02767..59c2a566a3978473ceea38696a2f5d38d9139bc7 100644 (file)
--- a/src/gis.h
+++ b/src/gis.h
@@ -19,22 +19,22 @@
 #define __GIS_H__
 
 /* GIS Core */
 #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 */
 
 /* 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 */
 
 /* GIS data */

-#include "gis-wms.h"
-#include "gis-data.h"
+#include <gis-wms.h>
+#include <gis-data.h>

 
 /* Plugins */
 
 /* Plugins */

-#include "gis-plugin.h"
+#include <gis-plugin.h>

 
 #endif
 
 #endif

diff --git a/src/libgis.pc.in b/src/libgis.pc.in
index 031cb4a76b82a9dca2de9c907cdad66ca43a9446..859289e4df0dce289dc49e87f5b66c0f41751bd8 100644 (file)
--- 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
 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 9cf5b6ac59b2e164e73a5041b21ce3d88860e3d8..73c68edc5414e38b1255e2899c873c1f53b44e5e 100644 (file)
--- 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)
 
 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
        gis-tile.h
 
 noinst_LTLIBRARIES = libgis-objects.la

diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index a531f8fc45f03a174cdb7a80d4db7323694fd6f2..3595bbf41bd7e3fe8e29763b2ab216841823f560 100644 (file)
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -1,6 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in
 
 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
 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 ccac9f3b256ab3582b1f890f63d2c7eb8eb86e11..7953ec51ee75792be7d64f71929630689934402d 100644 (file)
--- a/src/tile-test.c
+++ b/src/tile-test.c
@@ -18,9 +18,9 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 

-#include "gis-tile.h"

 #include "gis-wms.h"
 #include "gis-util.h"
 #include "gis-wms.h"
 #include "gis-util.h"

+#include "objects/gis-tile.h"

 
 struct CacheState {
        GtkWidget *image;
 
 struct CacheState {
        GtkWidget *image;