X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/3292ba8bb8e85babc44cb4f831f9b758089f1cfc..97cab2d5a9e2464421b2756a8ebaaf8148810402:/src/Makefile.am?ds=sidebyside

diff --git a/src/Makefile.am b/src/Makefile.am
index 46a26fb4..671e06f0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,12 +9,13 @@ authors.h: ../AUTHORS
 	rm -f $@
 	echo "/* Generated file. */" >> $@
 	echo "#define AUTHORS \\" >> $@
-	sed -e "s/ \*\*.*//" -e 's/^/"/' -e 's/$$/\\n"\\/' $< >> $@
+	sed -e "s/ \*\*.*//" -e 's/^/"/' -e 's/$$/\\n"\\/' -e '$$s/\\$$//' $< >> $@
 
 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 \
@@ -56,15 +57,14 @@ viking_SOURCES = main.c \
 	datasource_gps.c \
 	datasource_google.c \
 	datasource_gc.c \
-	datasources.h
-
-if LIBCURL
-viking_SOURCES += \
-	curl_download.c curl_download.h
-else
-viking_SOURCES += \
-	http.c http.h
-endif
+	datasources.h \
+	googlesearch.c googlesearch.h \
+	dem.c dem.h \
+	vikdemlayer.h vikdemlayer.c \
+	vikdemlayer_pixmap.h \
+	vikfilelist.c vikfilelist.h \
+	dems.c dems.h \
+	srtm_continent.c
 
 if GOOGLE
 viking_SOURCES += \
@@ -83,6 +83,15 @@ viking_SOURCES += \
 	expedia.c expedia.h
 endif
 
+if OPENSTREETMAP
+viking_SOURCES += \
+	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
+LDADD           += -lgps
+#LDADD           = -lz @GTK_LIBS@ @EXPAT_LIBS@ @LIBCURL@
+AM_CFLAGS		= -Wall -g -D_GNU_SOURCE