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

diff --git a/src/Makefile.am b/src/Makefile.am
index dde4da2b..62be6321 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,8 +10,9 @@ noinst_LIBRARIES = libviking.a
 authors.h: ../AUTHORS
 	rm -f $@
 	echo "/* Generated file. */" >> $@
-	echo "#define AUTHORS \\" >> $@
-	sed -e "s/ \*\*.*//" -e 's/^/"/' -e 's/$$/\\n"\\/' -e '$$s/\\$$//' $< >> $@
+	echo "const gchar *AUTHORS[] = {\\" >> $@
+	sed -e "s/ \*\*.*//" -e 's/^/"/' -e 's/$$/",\\/' -e '$$s/\\$$//' $< >> $@
+	echo "NULL};" >> $@
 
 BUILT_SOURCES = authors.h
 
@@ -36,26 +37,30 @@ libviking_a_SOURCES = \
 	util.c util.h \
 	download.c download.h \
 	viktreeview.c viktreeview.h \
-	viktrwlayer.c viktrwlayer.h viktrwlayer_pixmap.h \
+	viktrwlayer.c viktrwlayer.h \
 	viklayer.c viklayer.h \
 	viklayerspanel.c viklayerspanel.h \
-	vikcoordlayer.c vikcoordlayer.h vikcoordlayer_pixmap.h \
+	vikcoordlayer.c vikcoordlayer.h \
 	vikstatus.c vikstatus.h \
 	vikwindow.c vikwindow.h \
 	vikviewport.c vikviewport.h \
-	vikaggregatelayer.c vikaggregatelayer.h vikaggregatelayer_pixmap.h \
-	vikgpslayer.c vikgpslayer.h vikgpslayer_pixmap.h \
-	vikgeoreflayer.c vikgeoreflayer.h vikgeoreflayer_pixmap.h \
+	vikaggregatelayer.c vikaggregatelayer.h \
+	vikgpslayer.c vikgpslayer.h \
+	vikgeoreflayer.c vikgeoreflayer.h \
 	vikfileentry.c vikfileentry.h \
 	viktrwlayer_tpwin.c viktrwlayer_tpwin.h \
 	viktrwlayer_propwin.c viktrwlayer_propwin.h \
-	thumbnails.c thumbnails.h thumbnails_pixbuf.h \
+	thumbnails.c thumbnails.h \
 	background.c background.h \
 	vikradiogroup.c vikradiogroup.h \
 	vikcoord.c vikcoord.h \
 	mapcache.c mapcache.h \
-	vikmapslayer.c vikmapslayer.h vikmapslayer_pixmap.h \
-	gtkcellrendererprogress.c gtkcellrendererprogress.h \
+	vikmapsource.c vikmapsource.h \
+	vikmapsourcedefault.c vikmapsourcedefault.h \
+	vikmapslayer.c vikmapslayer.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 \
@@ -68,7 +73,6 @@ libviking_a_SOURCES = \
 	googlesearch.c googlesearch.h \
 	dem.c dem.h \
 	vikdemlayer.h vikdemlayer.c \
-	vikdemlayer_pixmap.h \
 	vikfilelist.c vikfilelist.h \
 	dems.c dems.h \
 	srtm_continent.c \
@@ -79,13 +83,12 @@ libviking_a_SOURCES = \
 
 if GOOGLE
 libviking_a_SOURCES += \
-	khmaps.c khmaps.h \
-	google.c google.h \
-	googlemaps.c googlemaps.h
+	google.c google.h
 endif
 
 if TERRASERVER
 libviking_a_SOURCES += \
+	terraservermapsource.c terraservermapsource.h \
 	terraserver.c terraserver.h
 endif
 
@@ -100,6 +103,16 @@ libviking_a_SOURCES += \
 	osm-traces.c osm-traces.h
 endif
 
+if BLUEMARBLE
+libviking_a_SOURCES += \
+	bluemarble.c bluemarble.h
+endif
+
+if OPENAERIAL
+libviking_a_SOURCES += \
+	openaerial.c openaerial.h
+endif
+
 viking_SOURCES = main.c
 
 INCLUDES        = @GTK_CFLAGS@ @EXPAT_CFLAGS@ @LIBCURL_CPPFLAGS@