Allow compilation

diff --git a/src/Makefile.am b/src/Makefile.am
index 15af997555ca8f99f4add83095df079793e96070..fa2f57ed26a2eeaf8b7ae7b9716e2f4df40747c7 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -56,6 +56,7 @@ libviking_a_SOURCES = \
        vikcoord.c vikcoord.h \
        mapcache.c mapcache.h \
        vikmapslayer.c vikmapslayer.h \
+       vik-map-type.c vik-map-type.h \
         gpx.c gpx.h \
        garminsymbols.c garminsymbols.h \
        acquire.c acquire.h \
@@ -101,6 +102,9 @@ endif
 
 viking_SOURCES = main.c
 
+%.h %.c:%.gob
+       gob2 $<
+
 INCLUDES        = @GTK_CFLAGS@ @EXPAT_CFLAGS@ @LIBCURL_CPPFLAGS@
 LDADD           = libviking.a @GTK_LIBS@ @EXPAT_LIBS@ @LIBCURL@ icons/libicons.a
 if REALTIME_GPS_TRACKING

diff --git a/src/vik-map-type.gob b/src/vik-map-type.gob
new file mode 100644 (file)
index 0000000..32cfe8d
--- /dev/null
+++ b/src/vik-map-type.gob
@@ -0,0 +1,27 @@
+%headertop{
+#ifdef HAVE_CONFIG
+#include "config.h"
+#endif
+
+#include "vikcoord.h"
+#include "mapcoord.h"
+%}
+
+ class Vik:Map:Type from G:Object {
+  public guint8 uniq_id;
+  public guint16 tilesize_x;
+  public guint16 tilesize_y;
+  public guint drawmode;
+  public gboolean coord_to_mapcoord ( self, const VikCoord *src, gdouble xzoom, gdouble yzoom, MapCoord *dest )
+  {
+    return FALSE;
+  }
+  public void mapcoord_to_center_coord ( self, MapCoord *src, VikCoord *dest )
+  { }
+  public int download ( self, MapCoord *src, const gchar *dest_fn )
+  {
+    return 0;
+  }
+
+  }
+

diff --git a/src/vikmaptype.gob b/src/vikmaptype.gob
deleted file mode 100644 (file)
index 8055fae..0000000
--- a/src/vikmaptype.gob
+++ /dev/null
@@ -1,18 +0,0 @@
- class Vik:Map:Type from G:Object {
-  public guint8 uniq_id;
-  public guint16 tilesize_x;
-  public guint16 tilesize_y;
-  public guint drawmode;
-  public gboolean coord_to_mapcoord ( self, const VikCoord *src, gdouble xzoom, gdouble yzoom, MapCoord *dest )
-  {
-    return FALSE;
-  }
-  public void mapcoord_to_center_coord ( self, MapCoord *src, VikCoord *dest )
-  { }
-  public int download ( self, MapCoord *src, const gchar *dest_fn )
-  {
-    return 0;
-  }
-
-  }
-