[QA] Shift Gtk dependent utility functions into separate file.

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 4e086cd74b4c9750f2653462c5c34268152562ba..f1e5f39daf7c1097c037fa2a24900000d7fbbb22 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -60,13 +60,17 @@ libviking_a_SOURCES = \
        coords.c coords.h \
        gpsmapper.c gpsmapper.h \
        gpspoint.c gpspoint.h \
+       geojson.c geojson.h \
        dir.c dir.h \
        file.c file.h \
+       fileutils.c fileutils.h \
        authors.h \
        documenters.h \
        dialog.c dialog.h \
        util.c util.h \
+       ui_util.c ui_util.h \
        download.c download.h \
+       jpg.c jpg.h \
        vikenumtypes.c vikenumtypes.h \
        viktreeview.c viktreeview.h \
        viktrwlayer.c viktrwlayer.h \
@@ -86,6 +90,7 @@ libviking_a_SOURCES = \
        vikgoto.c vikgoto.h \
        viktrwlayer_export.c viktrwlayer_export.h \
        viktrwlayer_tpwin.c viktrwlayer_tpwin.h \
+       viktrwlayer_wpwin.c viktrwlayer_wpwin.h \
        viktrwlayer_propwin.c viktrwlayer_propwin.h \
        viktrwlayer_analysis.c viktrwlayer_analysis.h \
        viktrwlayer_tracklist.c viktrwlayer_tracklist.h \
@@ -114,6 +119,7 @@ libviking_a_SOURCES = \
        babel.c babel.h \
        babel_ui.c babel_ui.h \
        datasource_file.c \
+       datasource_geojson.c \
        datasource_gps.c datasource_gps.h \
        datasource_routing.c \
        datasource_gc.c \
@@ -124,12 +130,14 @@ libviking_a_SOURCES = \
        googlesearch.c googlesearch.h \
        dem.c dem.h \
        vikdemlayer.h vikdemlayer.c \
+       vikdatetime_edit_dialog.c vikdatetime_edit_dialog.h \
        vikfilelist.c vikfilelist.h \
        vikexttool.c vikexttool.h \
        vikexttools.c vikexttools.h \
        vikwebtool.c vikwebtool.h \
        vikwebtoolcenter.c vikwebtoolcenter.h \
        vikwebtoolbounds.c vikwebtoolbounds.h \
+       vikwebtoolformat.c vikwebtoolformat.h \
        vikexttool_datasources.c vikexttool_datasources.h \
        vikwebtool_datasource.c vikwebtool_datasource.h \
        dems.c dems.h \
@@ -139,7 +147,9 @@ libviking_a_SOURCES = \
        print.c print.h \
        viklayer_defaults.c viklayer_defaults.h \
        settings.c settings.h \
-       preferences.c preferences.h
+       preferences.c preferences.h \
+       misc/strtod.c misc/strtod.h \
+       misc/kdtree.c misc/kdtree.h
 
 if BING
 libviking_a_SOURCES += \
@@ -182,11 +192,6 @@ libviking_a_SOURCES += \
        geonamessearch.c geonamessearch.h
 endif
 
-#if SPOTMAPS
-libviking_a_SOURCES += \
-       spotmaps.c spotmaps.h
-#endif
-
 if GEOTAG
 libviking_a_SOURCES += \
        datasource_geotag.c \
@@ -199,6 +204,11 @@ endif
 viking_SOURCES = main.c
 
 LDADD           = libviking.a $(PACKAGE_LIBS) @EXPAT_LIBS@ @LIBCURL@ icons/libicons.a
+if WINDOWS
+LDADD += \
+       ../win32/installer/pixmaps/viking_icon.o
+endif
+
 AM_CFLAGS              = -Wall -g -D_GNU_SOURCE \
        $(PACKAGE_CFLAGS) \
        @EXPAT_CFLAGS@ @LIBCURL_CPPFLAGS@