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
#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)
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;
#include <glib.h>
#include <libsoup/soup.h>
-#include "gis-tile.h"
+#include "objects/gis-tile.h"
typedef struct _GisWms GisWms;
#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
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
-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
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
#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;