X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/3a4b95f6b6093787cd19808618c2ad6e26cd4230..80471a6a905e00bf80ad04fa2061f88ea81f15cb:/src/Makefile.am?ds=inline

diff --git a/src/Makefile.am b/src/Makefile.am
index a2ae1b6d..62be6321 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -60,8 +60,7 @@ libviking_a_SOURCES = \
 	vikmapslayer.c vikmapslayer.h \
 	vikmapslayer_compat.c vikmapslayer_compat.h \
 	vikmaptype.c vikmaptype.h \
-	slippy-map-type-abstract.c slippy-map-type-abstract.h \
-	slippy-map-type.c slippy-map-type.h \
+	vikslippymapsource.c vikslippymapsource.h \
         gpx.c gpx.h \
 	garminsymbols.c garminsymbols.h \
 	acquire.c acquire.h \
@@ -82,30 +81,15 @@ libviking_a_SOURCES = \
 	print.c print.h \
 	preferences.c preferences.h
 
-BUILT_SOURCES += \
-	slippy-map-type-abstract.c slippy-map-type-abstract.h \
-	slippy-map-type.c slippy-map-type.h
-
 if GOOGLE
 libviking_a_SOURCES += \
 	google.c google.h
 endif
 
-if OLDGOOGLE
-libviking_a_SOURCES += \
-	khmaps.c khmaps.h \
-	googlemaps.c googlemaps.h \
-	google-maps.c google-maps.h \
-BUILT_SOURCES += \
-	google-maps.c google-maps.h
-endif
-
 if TERRASERVER
 libviking_a_SOURCES += \
-	terraserver-map-type.c terraserver-map-type.h \
+	terraservermapsource.c terraservermapsource.h \
 	terraserver.c terraserver.h
-BUILT_SOURCES += \
-	terraserver-map-type.c terraserver-map-type.h
 endif
 
 if EXPEDIA
@@ -131,9 +115,6 @@ 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