X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/f75d0233efd33a6495d33698ee097c8464d67695..12b68116138027b0004412a3a058694a5102885c:/src/Makefile.am?ds=inline

diff --git a/src/Makefile.am b/src/Makefile.am
index 59131513..ba889689 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
@@ -15,7 +15,6 @@ authors.h: $(top_srcdir)/AUTHORS
 	echo "NULL};" >> $@
 
 if HAVE_XSLTPROC
-XP=@XP@
 documenters.h: $(top_srcdir)/help/C/viking.xml
 	$(XP) $(srcdir)/docbook2documenters.xsl $(top_srcdir)/help/C/viking.xml > $@
 else
@@ -34,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
 
@@ -50,8 +49,9 @@ libviking_a_SOURCES = \
 	bbox.h \
 	modules.h modules.c \
 	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,12 +60,15 @@ libviking_a_SOURCES = \
 	coords.c coords.h \
 	gpsmapper.c gpsmapper.h \
 	gpspoint.c gpspoint.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 \
@@ -83,13 +86,22 @@ 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 \
+	viktrwlayer_tracklist.c viktrwlayer_tracklist.h \
+	viktrwlayer_waypointlist.c viktrwlayer_waypointlist.h \
+	vikrouting.c vikrouting.h \
+	vikroutingengine.c vikroutingengine.h \
+	vikroutingwebengine.c vikroutingwebengine.h \
+	vikutils.c vikutils.h \
 	thumbnails.c thumbnails.h \
 	background.c background.h \
 	vikradiogroup.c vikradiogroup.h \
 	vikcoord.c vikcoord.h \
 	mapcache.c mapcache.h \
+	maputils.c maputils.h \
 	vikmapsource.c vikmapsource.h \
 	vikmapsourcedefault.c vikmapsourcedefault.h \
 	vikmapslayer.c vikmapslayer.h \
@@ -98,15 +110,18 @@ 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_gps.c \
-	datasource_google.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 \
@@ -117,11 +132,15 @@ libviking_a_SOURCES = \
 	vikwebtool.c vikwebtool.h \
 	vikwebtoolcenter.c vikwebtoolcenter.h \
 	vikwebtoolbounds.c vikwebtoolbounds.h \
+	vikexttool_datasources.c vikexttool_datasources.h \
+	vikwebtool_datasource.c vikwebtool_datasource.h \
 	dems.c dems.h \
 	srtm_continent.c \
 	uibuilder.c uibuilder.h \
 	print-preview.c print-preview.h \
 	print.c print.h \
+	viklayer_defaults.c viklayer_defaults.h \
+	settings.c settings.h \
 	preferences.c preferences.h
 
 if BING
@@ -150,6 +169,7 @@ if OPENSTREETMAP
 libviking_a_SOURCES += \
 	osm.c osm.h \
 	osm-traces.c osm-traces.h \
+	datasource_osm_my_traces.c \
 	datasource_osm.c
 endif
 
@@ -164,26 +184,29 @@ 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 \
-	geotag_exif.c geotag_exif.h
+	geotag_exif.c geotag_exif.h \
+	viktrwlayer_geotag.c viktrwlayer_geotag.h \
+	libjpeg/jpeg-data.c libjpeg/jpeg-data.h \
+	libjpeg/jpeg-marker.c libjpeg/jpeg-marker.h
 endif
 
 viking_SOURCES = main.c
 
 LDADD           = libviking.a $(PACKAGE_LIBS) @EXPAT_LIBS@ @LIBCURL@ icons/libicons.a
-if REALTIME_GPS_TRACKING
-LDADD           += -lgps
+if WINDOWS
+LDADD += \
+	../win32/installer/pixmaps/viking_icon.o
 endif
+
 AM_CFLAGS		= -Wall -g -D_GNU_SOURCE \
 	$(PACKAGE_CFLAGS) \
 	@EXPAT_CFLAGS@ @LIBCURL_CPPFLAGS@
+AM_CPPFLAGS		= \
+	-DVIKING_DATADIR=\""$(pkgdatadir)"\" \
+	-DVIKING_SYSCONFDIR=\""$(sysconfdir)/$(PACKAGE)"\"
 
 @INTLTOOL_DESKTOP_RULE@