Merge 'viking-0.9.8'

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 6a742145318e30926e309a388c35ab7bbca8fa2d..78752e2f177052c45fd15b04d37bde6147695688 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -55,7 +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 \
+       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 \
@@ -69,6 +74,10 @@ libviking_a_SOURCES = \
        dem.c dem.h \
        vikdemlayer.h vikdemlayer.c \
        vikfilelist.c vikfilelist.h \
+       vikexttool.c vikexttool.h \
+       vikexttools.c vikexttools.h \
+       vikwebtool.c vikwebtool.h \
+       vikwebtoolcenter.c vikwebtoolcenter.h \
        dems.c dems.h \
        srtm_continent.c \
        uibuilder.c uibuilder.h \
@@ -81,14 +90,9 @@ libviking_a_SOURCES += \
        google.c google.h
 endif
 
-if OLDGOOGLE
-libviking_a_SOURCES += \
-       khmaps.c khmaps.h \
-       googlemaps.c googlemaps.h
-endif
-
 if TERRASERVER
 libviking_a_SOURCES += \
+       terraservermapsource.c terraservermapsource.h \
        terraserver.c terraserver.h
 endif
 
@@ -103,6 +107,21 @@ 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
+
+if GEONAMES
+libviking_a_SOURCES += \
+       geonamessearch.c geonamessearch.h
+endif
+
 viking_SOURCES = main.c
 
 INCLUDES        = @GTK_CFLAGS@ @EXPAT_CFLAGS@ @LIBCURL_CPPFLAGS@