libgis -> grits: Fix build after rename

diff --git a/configure.ac b/configure.ac
index b75ee4a3c34550f0c0b54256d4b75525244654e0..953029a8dce8f5937a872d2a1125177d751cee47 100644 (file)
--- 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 cab8837e86f2a8b12735714908afa7980ab2fe30..79cf675ccb75363f0c54dc0da679e05a8f1269e0 100644 (file)
--- 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 4e06338734a7d50d630e6b87aff3a6267c631a4d..c56849c1df95fb055d7341f33adcaa5feba4c5bd 100644 (file)
--- a/docs/api/grits-demo.xml
+++ b/docs/api/grits-demo.xml
@@ -37,7 +37,7 @@
 <refsect1><title>Files</title>
        <variablelist>
                <varlistentry>
-                       <term>$HOME/.config/libgis/config.ini</term>
+                       <term>$HOME/.config/grits/config.ini</term>
                        <listitem><para>
                                Configuration file used to store loaded
                                plugins and a few other settings.

diff --git a/examples/plugin/mkfile b/examples/plugin/mkfile
index 2c63d6dceb822bf077524a9fc48dc9015b399cbf..b89058c455d6564bd22c316b1c439633d4554805 100644 (file)
--- 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 7916edeb9cf5c9a1332f2a7f33597403f79fd31a..8fede7f14b978c7edf4200ab31b1c6dcd6488128 100644 (file)
--- a/examples/plugin/teapot.c
+++ b/examples/plugin/teapot.c
@@ -18,7 +18,7 @@
 #include <gtk/gtkgl.h>
 #include <GL/gl.h>
 
-#include <gis.h>
+#include <grits.h>
 
 #include "teapot.h"
 

diff --git a/src/.gitignore b/src/.gitignore
index 2701c8c5b5a16fc5933a726f4ceb7ae3a56320fe..8bc295bc0b222548fcd57230eda780a0ca8696f4 100644 (file)
--- 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 210cfe05816b1c0d070a1801bb5b05558aa18b79..28d2978e091f7cb6c7199d16f5f20535274448a8 100644 (file)
--- 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 e6109eed67b3f874c4fb6687f17dcbd9a415fc01..ddb1abe99534c439362fdace7964a039dc11386c 100644 (file)
--- 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 1126825be09342eb54d138ff330d35be5e5f8611..a41e9b051a7ecf5c0fd23b7a35f53faeae5c2eb0 100644 (file)
--- a/src/data/grits-data.c
+++ b/src/data/grits-data.c
@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <glib.h>
 
-#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 7f7d03be9393978f21aff9039749d745e718cff9..c0f098f24c62881344b8a09b0c438edf2d89519e 100644 (file)
--- 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 <config.h>
@@ -30,7 +30,7 @@
 #include <glib/gstdio.h>
 #include <libsoup/soup.h>
 
-#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 489bf51ec44e8543bc8ab2e9fb089778cb183ad3..713c2c8bc1bd4debbef6a6f2d19e7a32e0380cbd 100644 (file)
--- a/src/data/grits-http.h
+++ b/src/data/grits-http.h
@@ -21,7 +21,7 @@
 #include <glib.h>
 #include <libsoup/soup.h>
 
-#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 e1de457e05b3a9938bbc5add2cff97c551a65658..300528c2c317e6ee99bfe55403db80794eba246a 100644 (file)
--- a/src/data/grits-wms.c
+++ b/src/data/grits-wms.c
@@ -73,8 +73,8 @@
 #include <stdio.h>
 #include <glib.h>
 
-#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 6177d5902ba1bc4e6c2f5e76af02d7b140a1e20c..236a405a164c16c07504560be40507f7818c6cbf 100644 (file)
--- a/src/data/grits-wms.h
+++ b/src/data/grits-wms.h
@@ -20,8 +20,8 @@
 
 #include <glib.h>
 
-#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 d41dc3d1c9553eb85b610ea33f97017ba13f01ce..c439e6fd82de1fb09798a41eee5315cd5fbd45b9 100644 (file)
--- a/src/grits-demo.c
+++ b/src/grits-demo.c
@@ -19,7 +19,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
-#include "gis.h"
+#include "grits.h"
 
 
 static GisPrefs   *prefs;

diff --git a/src/grits-opengl.c b/src/grits-opengl.c
index 9deb0064db89ea9caf7a2ef988f078e9c5c22c37..7ec3a5cde5f85d982feff814827365cc26b08864 100644 (file)
--- a/src/grits-opengl.c
+++ b/src/grits-opengl.c
@@ -36,13 +36,13 @@
 #include <GL/gl.h>
 #include <GL/glu.h>
 
-#include "gis-opengl.h"
-#include "gis-util.h"
+#include "grits-opengl.h"
+#include "grits-util.h"
 #include "roam.h"
 
-#include "objects/gis-object.h"
-#include "objects/gis-marker.h"
-#include "objects/gis-callback.h"
+#include "objects/grits-object.h"
+#include "objects/grits-marker.h"
+#include "objects/grits-callback.h"
 
 // #define ROAM_DEBUG
 

diff --git a/src/grits-opengl.h b/src/grits-opengl.h
index 72d7b13bdf0fe62050ad28a4bbc190e06fce401e..0b5a9b6ee6f1f778543989923084f56e8ecfdd28 100644 (file)
--- 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 9eb2d2180fca0f84f686e772740db2b81dd20b63..7b5b179598e9de45aada4534b1a2b1eb5fccce0d 100644 (file)
--- a/src/grits-plugin.c
+++ b/src/grits-plugin.c
@@ -40,7 +40,7 @@
 
 #include <string.h>
 
-#include "gis-plugin.h"
+#include "grits-plugin.h"
 
 /********************
  * Plugin interface *

diff --git a/src/grits-plugin.h b/src/grits-plugin.h
index 9913e545f7450668a46e0f8b1a648ba9b18b51d0..41c6b97dd112fe017acaae800fb76657032f6789 100644 (file)
--- 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 fb111e617eaff78149b23b20296aa200ba65c318..e8f546ac442f0896f6c96fe3528bb4adff3f2c06 100644 (file)
--- a/src/grits-prefs.c
+++ b/src/grits-prefs.c
@@ -33,8 +33,8 @@
 #include <config.h>
 
 #include <glib.h>
-#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 3423af5a389f665c6bdd0f587f33c7fef451d62e..20b71ae1b319fcd5c02a1aacaf11300364e806fe 100644 (file)
--- a/src/grits-test.c
+++ b/src/grits-test.c
@@ -20,7 +20,7 @@
 #include <gtk/gtkgl.h>
 #include <gdk/gdkkeysyms.h>
 
-#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 f748cd2e280675a7170d143972f1ccbb3c277532..7c86290d4bba7c15d9ae2f1d629b56314ae3afca 100644 (file)
--- a/src/grits-util.c
+++ b/src/grits-util.c
@@ -71,7 +71,7 @@
 #include <glib.h>
 #include <math.h>
 
-#include "gis-util.h"
+#include "grits-util.h"
 
 /************
  * GisPoint *

diff --git a/src/grits-viewer.c b/src/grits-viewer.c
index 8679ff990104d4a79758a41c8f5491689a0e631c..d94bd54684fc2509e80bb59c4ebd80c7564fc34b 100644 (file)
--- a/src/grits-viewer.c
+++ b/src/grits-viewer.c
@@ -30,10 +30,10 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
-#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 76a2d117c098dcd4843aa1c8f6448794f6580329..f7433b2b5d988971bd67679a5cdb36a70b4bd4a8 100644 (file)
--- a/src/grits-viewer.h
+++ b/src/grits-viewer.h
@@ -78,10 +78,10 @@ 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 "objects/gis-tile.h"
+#include "grits-plugin.h"
+#include "grits-prefs.h"
+#include "objects/grits-object.h"
+#include "objects/grits-tile.h"
 
 struct _GisViewer {
        GtkDrawingArea parent_instance;

diff --git a/src/grits.h b/src/grits.h
index 6c91c031806843679ff3ca5a7699fbb9b69de176..ad367355102d2c4b45cd474132ef4a015305ec3a 100644 (file)
--- a/src/grits.h
+++ b/src/grits.h
@@ -19,23 +19,23 @@
 #define __GIS_H__
 
 /* GIS Core */
-#include <gis-viewer.h>
-#include <gis-opengl.h>
-#include <gis-prefs.h>
-#include <gis-util.h>
+#include <grits-viewer.h>
+#include <grits-opengl.h>
+#include <grits-prefs.h>
+#include <grits-util.h>
 
 /* GIS data */
-#include <data/gis-data.h>
-#include <data/gis-http.h>
-#include <data/gis-wms.h>
+#include <data/grits-data.h>
+#include <data/grits-http.h>
+#include <data/grits-wms.h>
 
 /* GIS objects */
-#include <objects/gis-object.h>
-#include <objects/gis-tile.h>
-#include <objects/gis-marker.h>
-#include <objects/gis-callback.h>
+#include <objects/grits-object.h>
+#include <objects/grits-tile.h>
+#include <objects/grits-marker.h>
+#include <objects/grits-callback.h>
 
 /* Plugins */
-#include <gis-plugin.h>
+#include <grits-plugin.h>
 
 #endif

diff --git a/src/objects/Makefile.am b/src/objects/Makefile.am
index 5f7c256ce67e6e9a1025add992cbf6788b3ebd14..c8b7418f7d85f4220dff21d0224965476b7527d0 100644 (file)
--- 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 9e6373757166c17bd46c8dbe2c36dba4e537d480..6f8d31434fe1e18ce4ef3ae238d869fce55eac42 100644 (file)
--- a/src/objects/grits-callback.c
+++ b/src/objects/grits-callback.c
@@ -25,7 +25,7 @@
  */
 
 #include <config.h>
-#include "gis-callback.h"
+#include "grits-callback.h"
 
 /* GisCallback */
 G_DEFINE_TYPE(GisCallback, gis_callback, GIS_TYPE_OBJECT);

diff --git a/src/objects/grits-callback.h b/src/objects/grits-callback.h
index b9c77da8a8fbefb9d96e2b56610ca4431e5434e3..31a24ad4ff321b5050b05bd72c743efa2af27b12 100644 (file)
--- a/src/objects/grits-callback.h
+++ b/src/objects/grits-callback.h
@@ -20,7 +20,7 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#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 f02da47d7a9f2e8e8194d2a2bf5a0eb7a75124a9..628050968e7ba91fad7a139881f7d4d701525e0d 100644 (file)
--- a/src/objects/grits-marker.c
+++ b/src/objects/grits-marker.c
@@ -31,7 +31,7 @@
  */
 
 #include <config.h>
-#include "gis-marker.h"
+#include "grits-marker.h"
 
 /*************
  * GisMarker *

diff --git a/src/objects/grits-marker.h b/src/objects/grits-marker.h
index fac46800692877febab28628bbf155dc0f0ae8fa..50dca05b45996a9f1cf84b4ae969d1b30ac8096c 100644 (file)
--- a/src/objects/grits-marker.h
+++ b/src/objects/grits-marker.h
@@ -21,7 +21,7 @@
 #include <glib.h>
 #include <glib-object.h>
 #include <cairo.h>
-#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 9eff935f2efae3f0df77622f3fc7e029299faa46..36191cc001247d756e544c49f1478355ea284210 100644 (file)
--- a/src/objects/grits-object.c
+++ b/src/objects/grits-object.c
@@ -29,7 +29,7 @@
  */
 
 #include <config.h>
-#include "gis-object.h"
+#include "grits-object.h"
 
 
 /*************

diff --git a/src/objects/grits-object.h b/src/objects/grits-object.h
index 6763a5fd18a4425763712b27028fa7089cc27585..6e3f78aa2d920b9680d09e3823a7b114f7975c16 100644 (file)
--- a/src/objects/grits-object.h
+++ b/src/objects/grits-object.h
@@ -20,7 +20,7 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include "gis-util.h"
+#include "grits-util.h"
 
 /* GisObject */
 #define GIS_TYPE_OBJECT            (gis_object_get_type())

diff --git a/src/objects/grits-tile.c b/src/objects/grits-tile.c
index fbffd6ff0f799d638145230e89f9db1cc9524bee..a42024ae7d5b231e9badca75c4d5dfec9642a5b4 100644 (file)
--- a/src/objects/grits-tile.c
+++ b/src/objects/grits-tile.c
@@ -33,7 +33,7 @@
  */
 
 #include <config.h>
-#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 c912b5a171ef507e67aa02ecae1650a5610c65e8..bf15fce135b502a77b1b254d8c81cd3333843b13 100644 (file)
--- a/src/objects/grits-tile.h
+++ b/src/objects/grits-tile.h
@@ -20,7 +20,7 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#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 d18b9e90180cf4f51f1daf89a0c6e383ceabe2ca..0e54a577719a451bb310e1f5dcfcbedb7f979a5e 100644 (file)
--- 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 a6589ff0b6aff8af717ea2055611a46d10abeca3..6a678b1f6cdd250a92d235d8d1af735d944676da 100644 (file)
--- a/src/plugins/elev.c
+++ b/src/plugins/elev.c
@@ -29,7 +29,7 @@
 #include <glib/gstdio.h>
 #include <GL/gl.h>
 
-#include <gis.h>
+#include <grits.h>
 
 #include "elev.h"
 

diff --git a/src/plugins/env.c b/src/plugins/env.c
index 75ba5701cf3f897b0920b81457ea0cae099be434..109b562939d7b76426477536a175a3b07541cef1 100644 (file)
--- a/src/plugins/env.c
+++ b/src/plugins/env.c
@@ -28,7 +28,7 @@
 #include <gtk/gtkgl.h>
 #include <GL/gl.h>
 
-#include <gis.h>
+#include <grits.h>
 
 #include "env.h"
 

diff --git a/src/plugins/map.c b/src/plugins/map.c
index d93e33633f73fe5862752ae00ccfdf0abd43f330..13e91858d768a58a44e188396df4d6824de4d611 100644 (file)
--- a/src/plugins/map.c
+++ b/src/plugins/map.c
@@ -28,7 +28,7 @@
 #include <glib/gstdio.h>
 #include <GL/gl.h>
 
-#include <gis.h>
+#include <grits.h>
 
 #include "map.h"
 

diff --git a/src/plugins/sat.c b/src/plugins/sat.c
index 1e61f1de2c630fb6d10e1489be3d82c71929ea39..3ae85b9046a53313d44ffe0ec2fbeacc26824ea0 100644 (file)
--- a/src/plugins/sat.c
+++ b/src/plugins/sat.c
@@ -28,7 +28,7 @@
 #include <glib/gstdio.h>
 #include <GL/gl.h>
 
-#include <gis.h>
+#include <grits.h>
 
 #include "sat.h"
 

diff --git a/src/plugins/test.c b/src/plugins/test.c
index 92b588681e263803a515ab2ac843bb0502d3abb3..f42f02cadf9e44684c4aff1ca16d43dad1874a7b 100644 (file)
--- a/src/plugins/test.c
+++ b/src/plugins/test.c
@@ -27,7 +27,7 @@
 #include <GL/gl.h>
 #include <GL/glu.h>
 
-#include <gis.h>
+#include <grits.h>
 
 #include "test.h"
 

diff --git a/src/roam.c b/src/roam.c
index 6694026a10e320b75be2b3ce683933d215ef3784..497f4979137aa5928c62dcddfb64fe50abd2c752 100644 (file)
--- a/src/roam.c
+++ b/src/roam.c
@@ -35,7 +35,7 @@
 #include <GL/glu.h>
 
 #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 66e105d1ed499f32bc5a35fbb0d78c662a1bebb5..edaabe617c9c7124036a9ef0411073eda24ad837 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 "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;