-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
src/data/Makefile
src/objects/Makefile
src/plugins/Makefile
- src/libgis.pc
+ src/grits.pc
docs/Makefile
docs/api/Makefile
])
# 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.*
<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.
-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
#include <gtk/gtkgl.h>
#include <GL/gl.h>
-#include <gis.h>
+#include <grits.h>
#include "teapot.h"
*.so
.deps
.libs
-gis-demo
-gis-marshal.[ch]
-gis-test
+grits-demo
+grits-marshal.[ch]
+grits-test
gmon.*
tile-test
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
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 \
--leak-resolution=high \
--num-callers=50 \
--suppressions=gtk.suppression \
- ./gis-test \
+ ./grits-test \
2> valgrind.out
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
#include <stdio.h>
#include <glib.h>
-#include "gis-data.h"
+#include "grits-data.h"
/**
* fopen_p:
* #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>
#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)
{
#include <glib.h>
#include <libsoup/soup.h>
-#include "gis-data.h"
+#include "grits-data.h"
typedef struct _GisHttp {
SoupSession *soup;
#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)
{
#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;
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
-#include "gis.h"
+#include "grits.h"
static GisPrefs *prefs;
#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"
// #define ROAM_DEBUG
typedef struct _GisOpenGL GisOpenGL;
typedef struct _GisOpenGLClass GisOpenGLClass;
-#include "gis-viewer.h"
+#include "grits-viewer.h"
#include "roam.h"
struct _GisOpenGL {
#include <string.h>
-#include "gis-plugin.h"
+#include "grits-plugin.h"
/********************
* Plugin interface *
***************/
typedef struct _GisPlugins GisPlugins;
-#include "gis-viewer.h"
-#include "gis-prefs.h"
+#include "grits-viewer.h"
+#include "grits-prefs.h"
/**
* GisPluginConstructor:
#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,
0,
NULL,
NULL,
- gis_cclosure_marshal_VOID__STRING_UINT_POINTER,
+ grits_cclosure_marshal_VOID__STRING_UINT_POINTER,
G_TYPE_NONE,
3,
G_TYPE_STRING,
#include <gtk/gtkgl.h>
#include <gdk/gdkkeysyms.h>
-#include "gis.h"
+#include "grits.h"
GisPrefs *prefs = NULL;
GisPlugins *plugins = NULL;
#include <glib.h>
#include <math.h>
-#include "gis-util.h"
+#include "grits-util.h"
/************
* GisPoint *
#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 */
0,
NULL,
NULL,
- gis_cclosure_marshal_VOID__DOUBLE_DOUBLE_DOUBLE,
+ grits_cclosure_marshal_VOID__DOUBLE_DOUBLE_DOUBLE,
G_TYPE_NONE,
3,
G_TYPE_DOUBLE,
0,
NULL,
NULL,
- gis_cclosure_marshal_VOID__DOUBLE_DOUBLE_DOUBLE,
+ grits_cclosure_marshal_VOID__DOUBLE_DOUBLE_DOUBLE,
G_TYPE_NONE,
3,
G_TYPE_DOUBLE,
* 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__
*/
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;
#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
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
*/
#include <config.h>
-#include "gis-callback.h"
+#include "grits-callback.h"
/**
* gis_callback_new:
#include <glib.h>
#include <glib-object.h>
-#include "gis-object.h"
+#include "grits-object.h"
/* GisCallback */
#define GIS_TYPE_CALLBACK (gis_callback_get_type())
#include <config.h>
#include <GL/gl.h>
-#include "gis-marker.h"
+#include "grits-marker.h"
/**
* gis_marker_new:
#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())
#include <math.h>
#include <GL/gl.h>
-#include "gis-object.h"
+#include "grits-object.h"
/*************
#include <glib.h>
#include <glib-object.h>
-#include "gis-util.h"
+#include "grits-util.h"
/* GisObject */
#define GIS_TYPE_OBJECT (gis_object_get_type())
gdouble lod;
};
-#include "gis-opengl.h"
+#include "grits-opengl.h"
struct _GisObjectClass {
GObjectClass parent_class;
#include <config.h>
#include <GL/gl.h>
-#include "gis-tile.h"
+#include "grits-tile.h"
gchar *gis_tile_path_table[2][2] = {
{"00.", "01."},
#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))
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
#include <glib/gstdio.h>
#include <GL/gl.h>
-#include <gis.h>
+#include <grits.h>
#include "elev.h"
#include <gtk/gtkgl.h>
#include <GL/gl.h>
-#include <gis.h>
+#include <grits.h>
#include "env.h"
#include <glib/gstdio.h>
#include <GL/gl.h>
-#include <gis.h>
+#include <grits.h>
#include "map.h"
#include <glib/gstdio.h>
#include <GL/gl.h>
-#include <gis.h>
+#include <grits.h>
#include "sat.h"
#include <GL/gl.h>
#include <GL/glu.h>
-#include <gis.h>
+#include <grits.h>
#include "test.h"
#include <GL/glu.h>
#include "gpqueue.h"
-#include "gis-util.h"
+#include "grits-util.h"
#include "roam.h"
/*
#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;