From d8948985b467a5cfd0447ae413ed1c5d01afb024 Mon Sep 17 00:00:00 2001 From: Andy Spencer Date: Sat, 20 Nov 2010 07:07:41 +0000 Subject: [PATCH] libgis -> grits: Fix build after rename --- configure.ac | 16 +++--- docs/api/Makefile.am | 8 +-- docs/api/grits-demo.xml | 2 +- examples/plugin/mkfile | 4 +- examples/plugin/teapot.c | 2 +- src/.gitignore | 6 +-- src/Makefile.am | 98 ++++++++++++++++++------------------ src/data/Makefile.am | 22 ++++---- src/data/grits-data.c | 2 +- src/data/grits-http.c | 4 +- src/data/grits-http.h | 2 +- src/data/grits-wms.c | 4 +- src/data/grits-wms.h | 4 +- src/grits-demo.c | 2 +- src/grits-opengl.c | 4 +- src/grits-opengl.h | 2 +- src/grits-plugin.c | 2 +- src/grits-plugin.h | 4 +- src/grits-prefs.c | 6 +-- src/grits-test.c | 2 +- src/grits-util.c | 2 +- src/grits-viewer.c | 10 ++-- src/grits-viewer.h | 8 +-- src/grits.h | 24 ++++----- src/objects/Makefile.am | 26 +++++----- src/objects/grits-callback.c | 2 +- src/objects/grits-callback.h | 2 +- src/objects/grits-marker.c | 2 +- src/objects/grits-marker.h | 2 +- src/objects/grits-object.c | 2 +- src/objects/grits-object.h | 4 +- src/objects/grits-tile.c | 2 +- src/objects/grits-tile.h | 2 +- src/plugins/Makefile.am | 4 +- src/plugins/elev.c | 2 +- src/plugins/env.c | 2 +- src/plugins/map.c | 2 +- src/plugins/sat.c | 2 +- src/plugins/test.c | 2 +- src/roam.c | 2 +- src/tile-test.c | 6 +-- 41 files changed, 153 insertions(+), 153 deletions(-) diff --git a/configure.ac b/configure.ac index b75ee4a..953029a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,19 +1,19 @@ -m4_define([gis_release], [0.4.2]) -m4_define([gis_version], [0:0:0]) -m4_define([gis_subdir], [libgis0]) +m4_define([grits_release], [0.4.2]) +m4_define([grits_version], [0:0:0]) +m4_define([grits_subdir], [grits0]) # Init and options -AC_INIT([libgis], [gis_release], [andy753421@gmail.com]) +AC_INIT([grits], [grits_release], [andy753421@gmail.com]) AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability foreign]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) #AM_SILENT_RULES([yes]) # For library versioning -LIB_VERSION=gis_version -GIS_SUBDIR=gis_subdir +LIB_VERSION=grits_version +GRITS_SUBDIR=grits_subdir AC_SUBST(LIB_VERSION) -AC_SUBST(GIS_SUBDIR) +AC_SUBST(GRITS_SUBDIR) # Check for required programs AC_PROG_CC @@ -47,7 +47,7 @@ AC_CONFIG_FILES([ src/data/Makefile src/objects/Makefile src/plugins/Makefile - src/libgis.pc + src/grits.pc docs/Makefile docs/api/Makefile ]) diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am index cab8837..79cf675 100644 --- a/docs/api/Makefile.am +++ b/docs/api/Makefile.am @@ -2,20 +2,20 @@ AM_CPPFLAGS = $(SOUP_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS) # Gtk docs GTKDOC_LIBS = $(SOUP_LIBS) $(GLIB_LIBS) $(GTK_LIBS) \ - $(top_srcdir)/src/libgis.la \ + $(top_srcdir)/src/grits.la \ $(top_srcdir)/src/plugins/*.la -DOC_MODULE = libgis +DOC_MODULE = grits DOC_SOURCE_DIR = $(top_srcdir)/src/ DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml MKDB_OPTIONS = --sgml-mode --output-format=xml include $(top_srcdir)/gtk-doc.make # Man pages -man_MANS = gis-demo.1 +man_MANS = grits-demo.1 %.1: %.xml xsltproc -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< EXTRA_DIST += $(man_MANS) # Remove auto-generated files MAINTAINERCLEANFILES = \ - tmpl/* Makefile.in libgis-overrides.txt llibgis-sections.txt ibgis.types libgis-scan.* + tmpl/* Makefile.in grits-overrides.txt grits-sections.txt grits.types grits-scan.* diff --git a/docs/api/grits-demo.xml b/docs/api/grits-demo.xml index 4e06338..c56849c 100644 --- a/docs/api/grits-demo.xml +++ b/docs/api/grits-demo.xml @@ -37,7 +37,7 @@ Files - $HOME/.config/libgis/config.ini + $HOME/.config/grits/config.ini Configuration file used to store loaded plugins and a few other settings. diff --git a/examples/plugin/mkfile b/examples/plugin/mkfile index 2c63d6d..b89058c 100644 --- a/examples/plugin/mkfile +++ b/examples/plugin/mkfile @@ -1,5 +1,5 @@ -CFLAGS=`{pkg-config --cflags libgis} -LDFLAGS=`{pkg-config --libs libgis} +CFLAGS=`{pkg-config --cflags grits} +LDFLAGS=`{pkg-config --libs grits} LIB=teapot.so default:V: $LIB %.so: %.o diff --git a/examples/plugin/teapot.c b/examples/plugin/teapot.c index bafcae3..d2a51fe 100644 --- a/examples/plugin/teapot.c +++ b/examples/plugin/teapot.c @@ -18,7 +18,7 @@ #include #include -#include +#include #include "teapot.h" diff --git a/src/.gitignore b/src/.gitignore index 2701c8c..8bc295b 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -8,8 +8,8 @@ *.so .deps .libs -gis-demo -gis-marshal.[ch] -gis-test +grits-demo +grits-marshal.[ch] +grits-test gmon.* tile-test diff --git a/src/Makefile.am b/src/Makefile.am index 210cfe0..28d2978 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,44 +5,44 @@ AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(SOUP_CFLAGS) AM_LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(SOUP_LIBS) AM_LDFLAGS = --as-needed -no-undefined -BUILT_SOURCES = gis-marshal.c gis-marshal.h +BUILT_SOURCES = grits-marshal.c grits-marshal.h # Headers -gis_includedir = $(includedir)/gis -gis_include_HEADERS = \ - gis.h \ - gis-viewer.h \ - gis-prefs.h \ - gis-opengl.h \ - gis-plugin.h \ - gis-util.h \ - gpqueue.h \ +grits_includedir = $(includedir)/grits +grits_include_HEADERS = \ + grits.h \ + grits-viewer.h \ + grits-prefs.h \ + grits-opengl.h \ + grits-plugin.h \ + grits-util.h \ + gpqueue.h \ roam.h # Pkg-config pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libgis.pc +pkgconfig_DATA = grits.pc # Library -lib_LTLIBRARIES = libgis.la - -libgis_la_SOURCES = gis.h \ - gis-viewer.c gis-viewer.h \ - gis-prefs.c gis-prefs.h \ - gis-opengl.c gis-opengl.h \ - gis-plugin.c gis-plugin.h \ - gis-marshal.c gis-marshal.h \ - gis-util.c gis-util.h \ - roam.c roam.h \ - gpqueue.c gpqueue.h -libgis_la_CPPFLAGS = $(AM_CPPFLAGS) \ - -DPKGDATADIR="\"$(dots)$(datadir)/$(GIS_SUBDIR)\"" \ - -DPLUGINSDIR="\"$(dots)$(libdir)/$(GIS_SUBDIR)\"" -libgis_la_LIBADD = $(AM_LDADD) \ - objects/libgis-objects.la \ - data/libgis-data.la -libgis_la_LDFLAGS = $(AM_LDFLAGS) \ +lib_LTLIBRARIES = libgrits.la + +libgrits_la_SOURCES = grits.h \ + grits-viewer.c grits-viewer.h \ + grits-prefs.c grits-prefs.h \ + grits-opengl.c grits-opengl.h \ + grits-plugin.c grits-plugin.h \ + grits-marshal.c grits-marshal.h \ + grits-util.c grits-util.h \ + roam.c roam.h \ + gpqueue.c gpqueue.h +libgrits_la_CPPFLAGS = $(AM_CPPFLAGS) \ + -DPKGDATADIR="\"$(dots)$(datadir)/$(GRITS_SUBDIR)\"" \ + -DPLUGINSDIR="\"$(dots)$(libdir)/$(GRITS_SUBDIR)\"" +libgrits_la_LIBADD = $(AM_LDADD) \ + objects/libgrits-objects.la \ + data/libgrits-data.la +libgrits_la_LDFLAGS = $(AM_LDFLAGS) \ -version-info $(LIB_VERSION) # Demo program @@ -53,42 +53,42 @@ else BINLDFLAGS = -static endif -bin_PROGRAMS = gis-demo +bin_PROGRAMS = grits-demo -gis_demo_SOURCES = gis-demo.c -gis_demo_LDADD = $(AM_LDADD) libgis.la -gis_demo_LDFLAGS = $(BINLDFLAGS) +grits_demo_SOURCES = grits-demo.c +grits_demo_LDADD = $(AM_LDADD) libgrits.la +grits_demo_LDFLAGS = $(BINLDFLAGS) # Test programs -noinst_PROGRAMS = gis-test tile-test +noinst_PROGRAMS = grits-test tile-test -gis_test_SOURCES = gis-test.c -gis_test_LDADD = $(AM_LDADD) libgis.la -gis_test_LDFLAGS = $(BINLDFLAGS) +grits_test_SOURCES = grits-test.c +grits_test_LDADD = $(AM_LDADD) libgrits.la +grits_test_LDFLAGS = $(BINLDFLAGS) tile_test_SOURCES = tile-test.c -tile_test_LDADD = $(AM_LDADD) libgis.la +tile_test_LDADD = $(AM_LDADD) libgrits.la tile_test_LDFLAGS = $(BINLDFLAGS) MAINTAINERCLEANFILES = Makefile.in .list.c: - glib-genmarshal --prefix=gis_cclosure_marshal --body $< > $@ + glib-genmarshal --prefix=grits_cclosure_marshal --body $< > $@ .list.h: - glib-genmarshal --prefix=gis_cclosure_marshal --header $< > $@ + glib-genmarshal --prefix=grits_cclosure_marshal --header $< > $@ -test: all .libs/$(GIS_SUBDIR) - ./gis-test +test: all .libs/$(GRITS_SUBDIR) + ./grits-test -gdb: all .libs/$(GIS_SUBDIR) - gdb ./gis-test +gdb: all .libs/$(GRITS_SUBDIR) + gdb ./grits-test -ddd: all .libs/$(GIS_SUBDIR) - ddd ./gis-test +ddd: all .libs/$(GRITS_SUBDIR) + ddd ./grits-test -.libs/$(GIS_SUBDIR): plugins/.libs - ln -sf ../plugins/.libs .libs/$(GIS_SUBDIR) +.libs/$(GRITS_SUBDIR): plugins/.libs + ln -sf ../plugins/.libs .libs/$(GRITS_SUBDIR) memcheck: all G_SLICE=always-malloc \ @@ -98,5 +98,5 @@ memcheck: all --leak-resolution=high \ --num-callers=50 \ --suppressions=gtk.suppression \ - ./gis-test \ + ./grits-test \ 2> valgrind.out diff --git a/src/data/Makefile.am b/src/data/Makefile.am index cee1794..ec90c19 100644 --- a/src/data/Makefile.am +++ b/src/data/Makefile.am @@ -4,17 +4,17 @@ if NOTWIN32 AM_CFLAGS += -fPIC endif -gis_data_includedir = $(includedir)/gis/data -gis_data_include_HEADERS = \ - gis-data.h \ - gis-http.h \ - gis-wms.h +grits_data_includedir = $(includedir)/grits/data +grits_data_include_HEADERS = \ + grits-data.h \ + grits-http.h \ + grits-wms.h -noinst_LTLIBRARIES = libgis-data.la -libgis_data_la_SOURCES = \ - gis-data.c gis-data.h \ - gis-http.c gis-http.h \ - gis-wms.c gis-wms.h -libgis_data_la_LDFLAGS = -static +noinst_LTLIBRARIES = libgrits-data.la +libgrits_data_la_SOURCES = \ + grits-data.c grits-data.h \ + grits-http.c grits-http.h \ + grits-wms.c grits-wms.h +libgrits_data_la_LDFLAGS = -static MAINTAINERCLEANFILES = Makefile.in diff --git a/src/data/grits-data.c b/src/data/grits-data.c index 1126825..a41e9b0 100644 --- a/src/data/grits-data.c +++ b/src/data/grits-data.c @@ -28,7 +28,7 @@ #include #include -#include "gis-data.h" +#include "grits-data.h" /** * fopen_p: diff --git a/src/data/grits-http.c b/src/data/grits-http.c index 7f7d03b..c0f098f 100644 --- a/src/data/grits-http.c +++ b/src/data/grits-http.c @@ -22,7 +22,7 @@ * #GisHttp is a small wrapper around libsoup to provide data access using the * Hyper Text Transfer Protocol. Each #GisHttp should be associated with a * particular server or dataset, all the files downloaded for this dataset will - * be cached together in $HOME.cache/libgis/ + * be cached together in $HOME/.cache/grits/ */ #include @@ -30,7 +30,7 @@ #include #include -#include "gis-http.h" +#include "grits-http.h" gchar *_get_cache_path(GisHttp *http, const gchar *local) { diff --git a/src/data/grits-http.h b/src/data/grits-http.h index 489bf51..713c2c8 100644 --- a/src/data/grits-http.h +++ b/src/data/grits-http.h @@ -21,7 +21,7 @@ #include #include -#include "gis-data.h" +#include "grits-data.h" typedef struct _GisHttp { SoupSession *soup; diff --git a/src/data/grits-wms.c b/src/data/grits-wms.c index e1de457..300528c 100644 --- a/src/data/grits-wms.c +++ b/src/data/grits-wms.c @@ -73,8 +73,8 @@ #include #include -#include "gis-wms.h" -#include "gis-http.h" +#include "grits-wms.h" +#include "grits-http.h" static gchar *_make_uri(GisWms *wms, GisTile *tile) { diff --git a/src/data/grits-wms.h b/src/data/grits-wms.h index 6177d59..236a405 100644 --- a/src/data/grits-wms.h +++ b/src/data/grits-wms.h @@ -20,8 +20,8 @@ #include -#include "data/gis-http.h" -#include "objects/gis-tile.h" +#include "data/grits-http.h" +#include "objects/grits-tile.h" typedef struct _GisWms { GisHttp *http; diff --git a/src/grits-demo.c b/src/grits-demo.c index d41dc3d..c439e6f 100644 --- a/src/grits-demo.c +++ b/src/grits-demo.c @@ -19,7 +19,7 @@ #include #include -#include "gis.h" +#include "grits.h" static GisPrefs *prefs; diff --git a/src/grits-opengl.c b/src/grits-opengl.c index d65ea3f..2e12d06 100644 --- a/src/grits-opengl.c +++ b/src/grits-opengl.c @@ -36,8 +36,8 @@ #include #include -#include "gis-opengl.h" -#include "gis-util.h" +#include "grits-opengl.h" +#include "grits-util.h" #include "roam.h" // #define ROAM_DEBUG diff --git a/src/grits-opengl.h b/src/grits-opengl.h index 72d7b13..0b5a9b6 100644 --- a/src/grits-opengl.h +++ b/src/grits-opengl.h @@ -31,7 +31,7 @@ typedef struct _GisOpenGL GisOpenGL; typedef struct _GisOpenGLClass GisOpenGLClass; -#include "gis-viewer.h" +#include "grits-viewer.h" #include "roam.h" struct _GisOpenGL { diff --git a/src/grits-plugin.c b/src/grits-plugin.c index 9eb2d21..7b5b179 100644 --- a/src/grits-plugin.c +++ b/src/grits-plugin.c @@ -40,7 +40,7 @@ #include -#include "gis-plugin.h" +#include "grits-plugin.h" /******************** * Plugin interface * diff --git a/src/grits-plugin.h b/src/grits-plugin.h index 9913e54..41c6b97 100644 --- a/src/grits-plugin.h +++ b/src/grits-plugin.h @@ -58,8 +58,8 @@ GtkWidget *gis_plugin_get_config(GisPlugin *plugin); ***************/ typedef struct _GisPlugins GisPlugins; -#include "gis-viewer.h" -#include "gis-prefs.h" +#include "grits-viewer.h" +#include "grits-prefs.h" /** * GisPluginConstructor: diff --git a/src/grits-prefs.c b/src/grits-prefs.c index fb111e6..e8f546a 100644 --- a/src/grits-prefs.c +++ b/src/grits-prefs.c @@ -33,8 +33,8 @@ #include #include -#include "gis-marshal.h" -#include "gis-prefs.h" +#include "grits-marshal.h" +#include "grits-prefs.h" enum { SIG_PREF_CHANGED, @@ -183,7 +183,7 @@ static void gis_prefs_class_init(GisPrefsClass *klass) 0, NULL, NULL, - gis_cclosure_marshal_VOID__STRING_UINT_POINTER, + grits_cclosure_marshal_VOID__STRING_UINT_POINTER, G_TYPE_NONE, 3, G_TYPE_STRING, diff --git a/src/grits-test.c b/src/grits-test.c index 153cbda..43d014b 100644 --- a/src/grits-test.c +++ b/src/grits-test.c @@ -20,7 +20,7 @@ #include #include -#include "gis.h" +#include "grits.h" GisPrefs *prefs = NULL; GisPlugins *plugins = NULL; diff --git a/src/grits-util.c b/src/grits-util.c index d42cee5..634f132 100644 --- a/src/grits-util.c +++ b/src/grits-util.c @@ -71,7 +71,7 @@ #include #include -#include "gis-util.h" +#include "grits-util.h" /************ * GisPoint * diff --git a/src/grits-viewer.c b/src/grits-viewer.c index 38c8207..767b919 100644 --- a/src/grits-viewer.c +++ b/src/grits-viewer.c @@ -30,10 +30,10 @@ #include #include -#include "gis-marshal.h" -#include "gis-viewer.h" +#include "grits-marshal.h" +#include "grits-viewer.h" -#include "gis-util.h" +#include "grits-util.h" /* Constants */ @@ -630,7 +630,7 @@ static void gis_viewer_class_init(GisViewerClass *klass) 0, NULL, NULL, - gis_cclosure_marshal_VOID__DOUBLE_DOUBLE_DOUBLE, + grits_cclosure_marshal_VOID__DOUBLE_DOUBLE_DOUBLE, G_TYPE_NONE, 3, G_TYPE_DOUBLE, @@ -654,7 +654,7 @@ static void gis_viewer_class_init(GisViewerClass *klass) 0, NULL, NULL, - gis_cclosure_marshal_VOID__DOUBLE_DOUBLE_DOUBLE, + grits_cclosure_marshal_VOID__DOUBLE_DOUBLE_DOUBLE, G_TYPE_NONE, 3, G_TYPE_DOUBLE, diff --git a/src/grits-viewer.h b/src/grits-viewer.h index a4da4fc..8e50b81 100644 --- a/src/grits-viewer.h +++ b/src/grits-viewer.h @@ -31,7 +31,7 @@ * seems like too much work. Merging GisViewer and GisOpenGL would also work, * but I like the separate that that's provided by having two. */ -#include "gis-opengl.h" +#include "grits-opengl.h" #ifndef __GIS_VIEWER_H__ #define __GIS_VIEWER_H__ @@ -96,9 +96,9 @@ typedef struct _GisViewerClass GisViewerClass; */ typedef gdouble (*GisHeightFunc)(gdouble lat, gdouble lon, gpointer user_data); -#include "gis-plugin.h" -#include "gis-prefs.h" -#include "objects/gis-object.h" +#include "grits-plugin.h" +#include "grits-prefs.h" +#include "objects/grits-object.h" struct _GisViewer { GtkDrawingArea parent_instance; diff --git a/src/grits.h b/src/grits.h index 6c91c03..ad36735 100644 --- a/src/grits.h +++ b/src/grits.h @@ -19,23 +19,23 @@ #define __GIS_H__ /* GIS Core */ -#include -#include -#include -#include +#include +#include +#include +#include /* GIS data */ -#include -#include -#include +#include +#include +#include /* GIS objects */ -#include -#include -#include -#include +#include +#include +#include +#include /* Plugins */ -#include +#include #endif diff --git a/src/objects/Makefile.am b/src/objects/Makefile.am index 844352f..19a3b84 100644 --- a/src/objects/Makefile.am +++ b/src/objects/Makefile.am @@ -4,19 +4,19 @@ if NOTWIN32 AM_CFLAGS += -fPIC endif -gis_objects_includedir = $(includedir)/gis/objects -gis_objects_include_HEADERS = \ - gis-object.h \ - gis-marker.h \ - gis-callback.h \ - gis-tile.h +grits_objects_includedir = $(includedir)/grits/objects +grits_objects_include_HEADERS = \ + grits-object.h \ + grits-marker.h \ + grits-callback.h \ + grits-tile.h -noinst_LTLIBRARIES = libgis-objects.la -libgis_objects_la_SOURCES = \ - gis-object.c gis-object.h \ - gis-marker.c gis-marker.h \ - gis-callback.c gis-callback.h \ - gis-tile.c gis-tile.h -libgis_objects_la_LDFLAGS = -static +noinst_LTLIBRARIES = libgrits-objects.la +libgrits_objects_la_SOURCES = \ + grits-object.c grits-object.h \ + grits-marker.c grits-marker.h \ + grits-callback.c grits-callback.h \ + grits-tile.c grits-tile.h +libgrits_objects_la_LDFLAGS = -static MAINTAINERCLEANFILES = Makefile.in diff --git a/src/objects/grits-callback.c b/src/objects/grits-callback.c index 89dada4..512c3d3 100644 --- a/src/objects/grits-callback.c +++ b/src/objects/grits-callback.c @@ -28,7 +28,7 @@ */ #include -#include "gis-callback.h" +#include "grits-callback.h" /** * gis_callback_new: diff --git a/src/objects/grits-callback.h b/src/objects/grits-callback.h index db82739..b4a3619 100644 --- a/src/objects/grits-callback.h +++ b/src/objects/grits-callback.h @@ -20,7 +20,7 @@ #include #include -#include "gis-object.h" +#include "grits-object.h" /* GisCallback */ #define GIS_TYPE_CALLBACK (gis_callback_get_type()) diff --git a/src/objects/grits-marker.c b/src/objects/grits-marker.c index 3073b0f..ff6ccb2 100644 --- a/src/objects/grits-marker.c +++ b/src/objects/grits-marker.c @@ -32,7 +32,7 @@ #include #include -#include "gis-marker.h" +#include "grits-marker.h" /** * gis_marker_new: diff --git a/src/objects/grits-marker.h b/src/objects/grits-marker.h index fac4680..50dca05 100644 --- a/src/objects/grits-marker.h +++ b/src/objects/grits-marker.h @@ -21,7 +21,7 @@ #include #include #include -#include "gis-object.h" +#include "grits-object.h" /* GisMarker */ #define GIS_TYPE_MARKER (gis_marker_get_type()) diff --git a/src/objects/grits-object.c b/src/objects/grits-object.c index 735e62e..81899e6 100644 --- a/src/objects/grits-object.c +++ b/src/objects/grits-object.c @@ -32,7 +32,7 @@ #include #include -#include "gis-object.h" +#include "grits-object.h" /************* diff --git a/src/objects/grits-object.h b/src/objects/grits-object.h index 3060c64..298580b 100644 --- a/src/objects/grits-object.h +++ b/src/objects/grits-object.h @@ -20,7 +20,7 @@ #include #include -#include "gis-util.h" +#include "grits-util.h" /* GisObject */ #define GIS_TYPE_OBJECT (gis_object_get_type()) @@ -40,7 +40,7 @@ struct _GisObject { gdouble lod; }; -#include "gis-opengl.h" +#include "grits-opengl.h" struct _GisObjectClass { GObjectClass parent_class; diff --git a/src/objects/grits-tile.c b/src/objects/grits-tile.c index 14e699d..c71be50 100644 --- a/src/objects/grits-tile.c +++ b/src/objects/grits-tile.c @@ -34,7 +34,7 @@ #include #include -#include "gis-tile.h" +#include "grits-tile.h" gchar *gis_tile_path_table[2][2] = { {"00.", "01."}, diff --git a/src/objects/grits-tile.h b/src/objects/grits-tile.h index 39cdeea..91f5ac6 100644 --- a/src/objects/grits-tile.h +++ b/src/objects/grits-tile.h @@ -20,7 +20,7 @@ #include #include -#include "gis-object.h" +#include "grits-object.h" #define GIS_TYPE_TILE (gis_tile_get_type()) #define GIS_TILE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GIS_TYPE_TILE, GisTile)) diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am index d18b9e9..0e54a57 100644 --- a/src/plugins/Makefile.am +++ b/src/plugins/Makefile.am @@ -3,9 +3,9 @@ MAINTAINERCLEANFILES = Makefile.in 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 +LIBS = $(top_srcdir)/src/libgrits.la -pluginsdir = "$(libdir)/$(GIS_SUBDIR)" +pluginsdir = "$(libdir)/$(GRITS_SUBDIR)" plugins_LTLIBRARIES = sat.la elev.la map.la env.la test.la sat_la_SOURCES = sat.c sat.h diff --git a/src/plugins/elev.c b/src/plugins/elev.c index 0ee96db..f59238d 100644 --- a/src/plugins/elev.c +++ b/src/plugins/elev.c @@ -29,7 +29,7 @@ #include #include -#include +#include #include "elev.h" diff --git a/src/plugins/env.c b/src/plugins/env.c index 2952487..129e759 100644 --- a/src/plugins/env.c +++ b/src/plugins/env.c @@ -28,7 +28,7 @@ #include #include -#include +#include #include "env.h" diff --git a/src/plugins/map.c b/src/plugins/map.c index d93e336..13e9185 100644 --- a/src/plugins/map.c +++ b/src/plugins/map.c @@ -28,7 +28,7 @@ #include #include -#include +#include #include "map.h" diff --git a/src/plugins/sat.c b/src/plugins/sat.c index 1e61f1d..3ae85b9 100644 --- a/src/plugins/sat.c +++ b/src/plugins/sat.c @@ -28,7 +28,7 @@ #include #include -#include +#include #include "sat.h" diff --git a/src/plugins/test.c b/src/plugins/test.c index 92b5886..f42f02c 100644 --- a/src/plugins/test.c +++ b/src/plugins/test.c @@ -27,7 +27,7 @@ #include #include -#include +#include #include "test.h" diff --git a/src/roam.c b/src/roam.c index 0f4995e..aca55a3 100644 --- a/src/roam.c +++ b/src/roam.c @@ -35,7 +35,7 @@ #include #include "gpqueue.h" -#include "gis-util.h" +#include "grits-util.h" #include "roam.h" /* diff --git a/src/tile-test.c b/src/tile-test.c index 66e105d..edaabe6 100644 --- a/src/tile-test.c +++ b/src/tile-test.c @@ -18,9 +18,9 @@ #include #include -#include "gis-util.h" -#include "data/gis-wms.h" -#include "objects/gis-tile.h" +#include "grits-util.h" +#include "data/grits-wms.h" +#include "objects/grits-tile.h" struct CacheState { GtkWidget *image; -- 2.43.2