BUILT_SOURCES = \
- champlain-marshal.h \
- champlain-marshal.c
+ champlain-marshal.h \
+ champlain-marshal.c
CLEANFILES = $(BUILT_SOURCES)
CHAMPLAIN_MARSHAL = champlain-marshal
-CHAMPLAIN_MARSHAL_LIST = champlain-marshal.list
+CHAMPLAIN_MARSHAL_LIST = champlain-marshal.list
lib_LTLIBRARIES = libchamplain-0.2.la
-libchamplain_0_2_la_SOURCES = $(CHAMPLAIN_MARSHAL_LIST) \
- $(BUILT_SOURCES) \
- champlainview.c \
- champlainlayer.c \
- champlainmarker.c \
- map.c \
- zoomlevel.c \
- tile.c \
- sources/oam.c \
- sources/osmmapnik.c \
- sources/mffrelief.c \
- sources/googlemap.c \
- sources/googlesat.c \
- sources/googleterrain.c \
- sources/debugmap.c
-
-noinst_HEADERS = champlainview.h \
- champlainmarker.c \
- champlainprivate.h \
- map.h \
- zoomlevel.h \
- tile.h \
- sources/oam.h \
- sources/osmmapnik.h \
- sources/mffrelief.h \
- sources/googlemap.h \
- sources/googlesat.h \
- sources/googleterrain.h \
- sources/debugmap.h
+libchamplain_0_2_la_SOURCES = \
+ $(CHAMPLAIN_MARSHAL_LIST) \
+ $(BUILT_SOURCES) \
+ champlain-view.c \
+ champlain-layer.c \
+ champlain-marker.c \
+ champlain-map.c \
+ champlain-zoom-level.c \
+ champlain-tile.c \
+ sources/oam.c \
+ sources/osmmapnik.c \
+ sources/mffrelief.c \
+ sources/googlemap.c \
+ sources/googlesat.c \
+ sources/googleterrain.c \
+ sources/debugmap.c
-libchamplain_0_2_la_LIBADD = $(DEPS_LIBS) ../tidy/libtidy-1.0.la
+noinst_HEADERS = \
+ champlain-view.h \
+ champlain-marker.c \
+ champlain-private.h \
+ champlain-map.h \
+ champlain-zoom-level.h \
+ champlain-tile.h \
+ sources/oam.h \
+ sources/osmmapnik.h \
+ sources/mffrelief.h \
+ sources/googlemap.h \
+ sources/googlesat.h \
+ sources/googleterrain.h \
+ sources/debugmap.h
-champlain-marshal.h: $(CHAMPLAIN_MARSHAL_LIST)
- @GLIB_GENMARSHAL@ --header --prefix=cpl_marshal $< > $(CHAMPLAIN_MARSHAL).h
+libchamplain_include_HEADERS = \
+ champlain.h \
+ champlain-view.h \
+ champlain-defines.h \
+ champlain-layer.h \
+ champlain-marker.h
-champlain-marshal.c: $(CHAMPLAIN_MARSHAL_LIST)
- @GLIB_GENMARSHAL@ --body --prefix=cpl_marshal $< > $(CHAMPLAIN_MARSHAL).c
+libchamplain_0_2_la_LIBADD = $(DEPS_LIBS) ../tidy/libtidy-1.0.la
-libchamplain_includedir=$(includedir)/libchamplain-0.2/champlain
-libchamplain_include_HEADERS = champlain.h champlainview.h champlaindefines.h champlainlayer.h champlainmarker.h
+libchamplain_includedir = $(includedir)/libchamplain-0.2/champlain
-libchamplain_0_2_la_LDFLAGS= -version-info $(LIBRARY_VERSION)
+libchamplain_0_2_la_LDFLAGS = -version-info $(LIBRARY_VERSION)
AM_CPPFLAGS = $(DEPS_CFLAGS) -DDATADIR=\""$(datadir)"\" -I$(top_srcdir)/tidy -I$(top_srcdir) -DCHAMPLAIN_COMPILATION
AM_LDFLAGS = $(DEPS_LIBS) -export-dynamic -export-symbols-regex ^champlain_.*
svg_DATA = error.svg
EXTRA_DIST = $(svg_DATA) $(CHAMPLAIN_MARSHAL_LIST)
+
+champlain-marshal.h: $(CHAMPLAIN_MARSHAL_LIST)
+ @GLIB_GENMARSHAL@ --header --prefix=cpl_marshal $< > $(CHAMPLAIN_MARSHAL).h
+
+champlain-marshal.c: $(CHAMPLAIN_MARSHAL_LIST)
+ @GLIB_GENMARSHAL@ --body --prefix=cpl_marshal $< > $(CHAMPLAIN_MARSHAL).c
#define CHAMPLAIN_PARAM_READWRITE \
(G_PARAM_READABLE | G_PARAM_WRITABLE | \
G_PARAM_STATIC_NICK | G_PARAM_STATIC_NAME | G_PARAM_STATIC_BLURB)
-
+
#endif
#include "config.h"
-#include "champlainlayer.h"
-#include "champlaindefines.h"
+#include "champlain-layer.h"
+
+#include "champlain-defines.h"
#include <clutter/clutter.h>
#include <glib.h>
#ifndef CHAMPLAIN_LAYER_H
#define CHAMPLAIN_LAYER_H
-#include <champlain/champlaindefines.h>
+#include <champlain/champlain-defines.h>
+
#include <glib-object.h>
#include <clutter/clutter.h>
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "map.h"
-#include "zoomlevel.h"
+#include "champlain-map.h"
+
+#include "champlain-zoom-level.h"
#include "sources/osmmapnik.h"
#include "sources/mffrelief.h"
#include "sources/oam.h"
#include "sources/debugmap.h"
+
#include <math.h>
Map*
#define MAP_H
#include "champlain.h"
-#include "champlainview.h"
-#include "champlainprivate.h"
-#include "zoomlevel.h"
-#include "tile.h"
+#include "champlain-private.h"
+#include "champlain-tile.h"
+#include "champlain-view.h"
+#include "champlain-zoom-level.h"
#include <glib.h>
#include <clutter/clutter.h>
#include "config.h"
-#include "champlaindefines.h"
-#include "champlainmarker.h"
-#include "champlainprivate.h"
+#include "champlain-marker.h"
+
#include "champlain.h"
+#include "champlain-defines.h"
#include "champlain-marshal.h"
-#include "map.h"
-#include "tile.h"
-#include "zoomlevel.h"
+#include "champlain-private.h"
+#include "champlain-map.h"
+#include "champlain-tile.h"
+#include "champlain-zoom-level.h"
#include <clutter/clutter.h>
#include <clutter-cairo/clutter-cairo.h>
#ifndef CHAMPLAIN_MARKER_H
#define CHAMPLAIN_MARKER_H
-#include <champlain/champlaindefines.h>
+#include <champlain/champlain-defines.h>
+
#include <glib-object.h>
#include <clutter/clutter.h>
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "tile.h"
-#include "map.h"
-#include "champlainprivate.h"
+#include "champlain-tile.h"
+
+#include "champlain-map.h"
+#include "champlain-private.h"
#include <math.h>
#include <errno.h>
#ifndef CHAMPLAIN_MAP_TILE_H
#define CHAMPLAIN_MAP_TILE_H
+#include <champlain/champlain-private.h>
+
#include <glib.h>
#include <clutter/clutter.h>
-#include <champlain/champlainprivate.h>
struct _Tile
{
#include "config.h"
-#include "champlaindefines.h"
-#include "champlainprivate.h"
+#include "champlain-view.h"
+
#include "champlain.h"
+#include "champlain-defines.h"
+#include "champlain-map.h"
#include "champlain-marshal.h"
-#include "champlainview.h"
-#include "map.h"
-#include "tile.h"
-#include "zoomlevel.h"
+#include "champlain-private.h"
+#include "champlain-tile.h"
+#include "champlain-zoom-level.h"
#include <clutter/clutter.h>
#include <glib.h>
#if !defined (__CHAMPLAIN_CHAMPLAIN_H_INSIDE__) && !defined (CHAMPLAIN_COMPILATION)
#error "Only <champlain/champlain.h> can be included directly."
-#endif
+#endif
#ifndef CHAMPLAIN_VIEW_H
#define CHAMPLAIN_VIEW_H
-#include <champlain/champlaindefines.h>
+#include <champlain/champlain-defines.h>
+
#include <glib.h>
#include <glib-object.h>
#include <clutter/clutter.h>
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <zoomlevel.h>
-#include <tile.h>
-#include "map.h"
+#include "champlain-zoom-level.h"
+
+#include "champlain-map.h"
+#include "champlain-tile.h"
+
#include <clutter/clutter.h>
ZoomLevel*
#ifndef CHAMPLAIN_MAP_ZOOM_LEVEL_H
#define CHAMPLAIN_MAP_ZOOM_LEVEL_H
+#include "champlain-private.h"
+
#include <glib.h>
#include <clutter/clutter.h>
-#include "champlainprivate.h"
typedef struct
{
#include <glib.h>
-#include <champlain/champlaindefines.h>
-#include <champlain/champlainview.h>
-#include <champlain/champlainmarker.h>
-#include <champlain/champlainlayer.h>
+#include "champlain/champlain-defines.h"
+#include "champlain/champlain-layer.h"
+#include "champlain/champlain-marker.h"
+#include "champlain/champlain-view.h"
#undef __CHAMPLAIN_CHAMPLAIN_H_INSIDE__
#ifndef OPENSTREETMAP_H
#define OPENSTREETMAP_H
-#include <map.h>
+#include "champlain-map.h"
void debugmap_init(Map* map);
*/
#include "sources/googlemap.h"
-#include "map.h"
+
+#include "champlain-map.h"
+
#include <math.h>
#include <clutter/clutter.h>
#ifndef GOOGLE_MAP_H
#define GOOGLE_MAP_H
-#include <map.h>
+#include "champlain-map.h"
void google_map_init(Map* map);
*/
#include "sources/googlesat.h"
-#include "map.h"
-#include <math.h>
+
+#include "champlain-map.h"
+
#include <clutter/clutter.h>
+#include <math.h>
guint google_sat_row_count(Map *map, guint zoom_level);
guint google_sat_column_count(Map *map, guint zoom_level);
#ifndef GOOGLE_SAT_H
#define GOOGLE_SAT_H
-#include <map.h>
+#include "champlain-map.h"
void google_sat_init(Map* map);
*/
#include "sources/googleterrain.h"
-#include "map.h"
-#include <math.h>
+
+#include "champlain-map.h"
+
#include <clutter/clutter.h>
+#include <math.h>
guint google_terrain_row_count(Map *map, guint zoom_level);
guint google_terrain_column_count(Map *map, guint zoom_level);
#ifndef GOOGLE_TERRAIN_H
#define GOOGLE_TERRAIN_H
-#include <map.h>
+#include "champlain-map.h"
void google_terrain_init(Map* map);
*/
#include "sources/mffrelief.h"
-#include "map.h"
+
+#include "champlain-map.h"
+
#include <math.h>
#include <clutter/clutter.h>
#ifndef MFF_RELIEF_H
#define MFF_RELIEF_H
-#include <map.h>
+#include "champlain-map.h"
void mff_relief_init(Map* map);
*/
#include "sources/oam.h"
-#include "map.h"
-#include <math.h>
+
+#include "champlain-map.h"
+
#include <clutter/clutter.h>
+#include <math.h>
guint oam_row_count(Map *map, guint zoom_level);
guint oam_column_count(Map *map, guint zoom_level);
#ifndef OAM_H
#define OAM_H
-#include <map.h>
+#include "champlain-map.h"
void oam_init(Map* map);
*/
#include "sources/osmmapnik.h"
-#include "map.h"
+
+#include "champlain-map.h"
+
#include <math.h>
#include <clutter/clutter.h>
#ifndef OSM_MAPNIK_H
#define OSM_MAPNIK_H
-#include <map.h>
+#include "champlain-map.h"
void osm_mapnik_init(Map* map);
AC_PREREQ(2.61)
AC_INIT(libchamplain, 0.2.8, pierre-luc@pierlux.com)
-AC_CONFIG_SRCDIR([champlain/champlainview.h])
+AC_CONFIG_SRCDIR([champlain/champlain.h])
AC_CONFIG_HEADER([config.h])
AM_INIT_AUTOMAKE