Bug fix: View Mode displayed wrong setting on startup.

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 46a26fb4680e594326bd543802123018d7493961..252ec6e448883017dacf4df82d3ec98789009d84 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,7 +9,7 @@ authors.h: ../AUTHORS
        rm -f $@
        echo "/* Generated file. */" >> $@
        echo "#define 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
 
 
 BUILT_SOURCES = authors.h
 


@@ -56,7 +56,8 @@ viking_SOURCES = main.c \
        datasource_gps.c \
        datasource_google.c \
        datasource_gc.c \
        datasource_gps.c \
        datasource_google.c \
        datasource_gc.c \

-       datasources.h
+       datasources.h \
+       googlesearch.c googlesearch.h

 
 if LIBCURL
 viking_SOURCES += \
 
 if LIBCURL
 viking_SOURCES += \


@@ -83,6 +84,12 @@ viking_SOURCES += \
        expedia.c expedia.h
 endif
 
        expedia.c expedia.h
 endif
 

+if OPENSTREETMAP
+viking_SOURCES += \
+       osm.c osm.h
+endif
+
+

 INCLUDES        = @GTK_CFLAGS@ @EXPAT_CFLAGS@ @LIBCURL_CPPFLAGS@
 LDADD           = @GTK_LIBS@ @EXPAT_LIBS@ @LIBCURL@
 AM_CFLAGS              = -Wall -g
 INCLUDES        = @GTK_CFLAGS@ @EXPAT_CFLAGS@ @LIBCURL_CPPFLAGS@
 LDADD           = @GTK_LIBS@ @EXPAT_LIBS@ @LIBCURL@
 AM_CFLAGS              = -Wall -g