Remove dependencies to gob2

[andy/viking.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index e11ae984f35af2ff518597998646f265009cd060..62be63210c7693cbe541dd082c469531d4ac04a3 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -55,8 +55,12 @@ libviking_a_SOURCES = \
        vikradiogroup.c vikradiogroup.h \
        vikcoord.c vikcoord.h \
        mapcache.c mapcache.h \
+       vikmapsource.c vikmapsource.h \
+       vikmapsourcedefault.c vikmapsourcedefault.h \
        vikmapslayer.c vikmapslayer.h \
-       vik-map-type.c vik-map-type.h \
+       vikmapslayer_compat.c vikmapslayer_compat.h \
+       vikmaptype.c vikmaptype.h \
+       vikslippymapsource.c vikslippymapsource.h \
         gpx.c gpx.h \
        garminsymbols.c garminsymbols.h \
        acquire.c acquire.h \
@@ -79,16 +83,12 @@ libviking_a_SOURCES = \
 
 if GOOGLE
 libviking_a_SOURCES += \
-       khmaps.c khmaps.h \
-       google.c google.h \
-       googlemaps.c googlemaps.h \
-       google-maps.c google-maps.h \
-       google-map-type.c google-map-type.h
+       google.c google.h
 endif
 
 if TERRASERVER
 libviking_a_SOURCES += \
-       terraserver-map-type.c terraserver-map-type.h \
+       terraservermapsource.c terraservermapsource.h \
        terraserver.c terraserver.h
 endif
 
@@ -100,14 +100,20 @@ endif
 if OPENSTREETMAP
 libviking_a_SOURCES += \
        osm.c osm.h \
-       osm-map-type.c osm-map-type.h \
        osm-traces.c osm-traces.h
 endif
 
-viking_SOURCES = main.c
+if BLUEMARBLE
+libviking_a_SOURCES += \
+       bluemarble.c bluemarble.h
+endif
 
-%.h %.c:%.gob
-       gob2 $<
+if OPENAERIAL
+libviking_a_SOURCES += \
+       openaerial.c openaerial.h
+endif
+
+viking_SOURCES = main.c
 
 INCLUDES        = @GTK_CFLAGS@ @EXPAT_CFLAGS@ @LIBCURL_CPPFLAGS@
 LDADD           = libviking.a @GTK_LIBS@ @EXPAT_LIBS@ @LIBCURL@ icons/libicons.a