Refactoring: retrieve the VikWindow from the VikViewport via its GtkWidget nature

[andy/viking.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index eca0dfe3f42fbf3f0ee4a6a7a0fc0c23fe998aca..67155a4b5501412db906c542e92246320c4f7b22 100644 (file)
--- 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 \
@@ -57,15 +58,12 @@ viking_SOURCES = main.c \
        datasource_google.c \
        datasource_gc.c \
        datasources.h \
-       googlesearch.c googlesearch.h
-
-if LIBCURL
-viking_SOURCES += \
-       curl_download.c curl_download.h
-else
-viking_SOURCES += \
-       http.c http.h
-endif
+       googlesearch.c googlesearch.h \
+       dem.c dem.h \
+       vikdemlayer.h vikdemlayer.c \
+       vikdemlayer_pixmap.h \
+       vikfilelist.c vikfilelist.h \
+       dems.c dems.h
 
 if GOOGLE
 viking_SOURCES += \
@@ -86,10 +84,12 @@ 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@
+#LDADD           = -lz @GTK_LIBS@ @EXPAT_LIBS@ @LIBCURL@
 AM_CFLAGS              = -Wall -g