X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/ad0a8c2dc0306d5b311df4c51915e20233ba859f..9d8d6d0f5f50cec2db703af99b3639979ab2c9ae:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 7d35b1d1..61d8ed93 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,6 +15,7 @@ BUILT_SOURCES = authors.h
 
 viking_SOURCES = main.c \
 	modules.h modules.c \
+	curl_download.c curl_download.h \
 	menu.xml.h \
     degrees_converters.c degrees_converters.h \
 	viking.h globals.h mapcoord.h config.h \
@@ -27,6 +28,7 @@ viking_SOURCES = main.c \
 	file.c file.h \
 	authors.h \
 	dialog.c dialog.h \
+	util.c util.h \
 	download.c download.h \
 	viktreeview.c viktreeview.h \
 	viktrwlayer.c viktrwlayer.h viktrwlayer_pixmap.h \
@@ -56,21 +58,19 @@ viking_SOURCES = main.c \
 	datasource_gps.c \
 	datasource_google.c \
 	datasource_gc.c \
+	datasource_bfilter.c \
 	datasources.h \
 	googlesearch.c googlesearch.h \
-	datasources.h \
 	dem.c dem.h \
 	vikdemlayer.h vikdemlayer.c \
+	vikdemlayer_pixmap.h \
 	vikfilelist.c vikfilelist.h \
-	dems.c dems.h
-
-if LIBCURL
-viking_SOURCES += \
-	curl_download.c curl_download.h
-else
-viking_SOURCES += \
-	http.c http.h
-endif
+	dems.c dems.h \
+	srtm_continent.c \
+	uibuilder.c uibuilder.h \
+	print-preview.c print-preview.h \
+	print.c print.h \
+	preferences.c preferences.h
 
 if GOOGLE
 viking_SOURCES += \
@@ -91,10 +91,15 @@ endif
 
 if OPENSTREETMAP
 viking_SOURCES += \
-	osm.c osm.h
+	osm.c osm.h \
+	osm-traces.c osm-traces.h
 endif
 
 
 INCLUDES        = @GTK_CFLAGS@ @EXPAT_CFLAGS@ @LIBCURL_CPPFLAGS@
 LDADD           = @GTK_LIBS@ @EXPAT_LIBS@ @LIBCURL@
-AM_CFLAGS		= -Wall -g
+if REALTIME_GPS_TRACKING
+LDADD           += -lgps
+endif
+#LDADD           = -lz @GTK_LIBS@ @EXPAT_LIBS@ @LIBCURL@
+AM_CFLAGS		= -Wall -g -D_GNU_SOURCE