X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/07493583d2fd49343128488217fd19ddfc29eaad..98b7eddc9f9fa0b72f2344cbabb0f69ee177906e:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 2d1a2717..2f98f73b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -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
@@ -47,6 +46,7 @@ ENUM_H_FILES = \
 	vikviewport.h
 
 libviking_a_SOURCES = \
+	bbox.h \
 	modules.h modules.c \
 	curl_download.c curl_download.h \
 	menu.xml.h \
@@ -59,6 +59,7 @@ libviking_a_SOURCES = \
 	coords.c coords.h \
 	gpsmapper.c gpsmapper.h \
 	gpspoint.c gpspoint.h \
+	dir.c dir.h \
 	file.c file.h \
 	authors.h \
 	documenters.h \
@@ -101,11 +102,13 @@ libviking_a_SOURCES = \
 	garminsymbols.c garminsymbols.h \
 	acquire.c acquire.h \
 	babel.c babel.h \
+	datasource_file.c \
 	datasource_gps.c \
 	datasource_google.c \
 	datasource_gc.c \
 	datasource_bfilter.c \
 	datasources.h \
+	google.c google.h \
 	googlesearch.c googlesearch.h \
 	dem.c dem.h \
 	vikdemlayer.h vikdemlayer.c \
@@ -114,6 +117,7 @@ libviking_a_SOURCES = \
 	vikexttools.c vikexttools.h \
 	vikwebtool.c vikwebtool.h \
 	vikwebtoolcenter.c vikwebtoolcenter.h \
+	vikwebtoolbounds.c vikwebtoolbounds.h \
 	dems.c dems.h \
 	srtm_continent.c \
 	uibuilder.c uibuilder.h \
@@ -121,9 +125,10 @@ libviking_a_SOURCES = \
 	print.c print.h \
 	preferences.c preferences.h
 
-if GOOGLE
+if BING
 libviking_a_SOURCES += \
-	google.c google.h
+	bingmapsource.c bingmapsource.h \
+	bing.c bing.h
 endif
 
 if TERRASERVER
@@ -140,7 +145,8 @@ endif
 if OPENSTREETMAP
 libviking_a_SOURCES += \
 	osm.c osm.h \
-	osm-traces.c osm-traces.h
+	osm-traces.c osm-traces.h \
+	datasource_osm.c
 endif
 
 if BLUEMARBLE
@@ -159,15 +165,24 @@ libviking_a_SOURCES += \
 	spotmaps.c spotmaps.h
 #endif
 
+if GEOTAG
+libviking_a_SOURCES += \
+	datasource_geotag.c \
+	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
-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@