X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/cae93cde01500ccc491e243e6e9873cab6d7fede..2b49017b18424f3aa37bb00220e8d98610a2931e:/src/Makefile.am?ds=inline

diff --git a/src/Makefile.am b/src/Makefile.am
index 983fe647..7c732dbe 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-# This is the Makefile for the viking gps viewer program.
+# This is the Makefile for the Viking GPS viewer program.
 # This file is licensed through the GPL version 2 or newer.
 
 SUBDIRS = icons
@@ -33,10 +33,10 @@ vikenumtypes.h: vikenumtypes.h.template $(ENUM_H_FILES) $(GLIB_MKENUMS)
 vikenumtypes.c: vikenumtypes.c.template $(ENUM_H_FILES) $(GLIB_MKENUMS)
 	(cd $(srcdir) && $(GLIB_MKENUMS) --template vikenumtypes.c.template $(ENUM_H_FILES)) > $@
 
-EXTRA_DIST =                         \
-        docbook2documenters.xsl      \
-        vikenumtypes.h.template      \
-        vikenumtypes.c.template
+EXTRA_DIST = \
+	docbook2documenters.xsl \
+	vikenumtypes.h.template \
+	vikenumtypes.c.template
 
 BUILT_SOURCES += vikenumtypes.h vikenumtypes.c
 
@@ -51,7 +51,7 @@ libviking_a_SOURCES = \
 	curl_download.c curl_download.h \
 	compression.c compression.h \
 	menu.xml.h \
-    degrees_converters.c degrees_converters.h \
+	degrees_converters.c degrees_converters.h \
 	globals.c globals.h \
 	viking.h mapcoord.h config.h \
 	viktrack.c viktrack.h \
@@ -60,13 +60,16 @@ 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 \
 	download.c download.h \
+	jpg.c jpg.h \
 	vikenumtypes.c vikenumtypes.h \
 	viktreeview.c viktreeview.h \
 	viktrwlayer.c viktrwlayer.h \
@@ -84,6 +87,7 @@ libviking_a_SOURCES = \
 	vikgototool.c vikgototool.h \
 	vikgotoxmltool.c vikgotoxmltool.h \
 	vikgoto.c vikgoto.h \
+	viktrwlayer_export.c viktrwlayer_export.h \
 	viktrwlayer_tpwin.c viktrwlayer_tpwin.h \
 	viktrwlayer_propwin.c viktrwlayer_propwin.h \
 	viktrwlayer_analysis.c viktrwlayer_analysis.h \
@@ -107,16 +111,19 @@ libviking_a_SOURCES = \
 	vikslippymapsource.c vikslippymapsource.h \
 	vikwmscmapsource.c vikwmscmapsource.h \
 	viktmsmapsource.c viktmsmapsource.h \
-        gpx.c gpx.h \
+	gpx.c gpx.h \
 	garminsymbols.c garminsymbols.h \
 	acquire.c acquire.h \
 	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 \
 	datasource_bfilter.c \
 	datasource_wikipedia.c \
+	datasource_url.c \
 	datasources.h \
 	googlesearch.c googlesearch.h \
 	dem.c dem.h \
@@ -146,7 +153,7 @@ endif
 
 if GOOGLE
 libviking_a_SOURCES += \
-       google.c google.h
+	google.c google.h
 endif
 
 if TERRASERVER
@@ -179,11 +186,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 \
@@ -196,6 +198,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@