libgps is no more mandatory

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 1a1988e61394dc77a1fc51bb509c196bdb310ec7..3a424221d6f1ff68eb46de9e79f43e45ba22dbfc 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 \\" >> $@
        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 \
 
 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 \
        menu.xml.h \
     degrees_converters.c degrees_converters.h \
        viking.h globals.h mapcoord.h config.h \


@@ -27,7 +28,7 @@ viking_SOURCES = main.c \
        file.c file.h \
        authors.h \
        dialog.c dialog.h \
        file.c file.h \
        authors.h \
        dialog.c dialog.h \

-       http.c http.h \
+       download.c download.h \

        viktreeview.c viktreeview.h \
        viktrwlayer.c viktrwlayer.h viktrwlayer_pixmap.h \
        viklayer.c viklayer.h \
        viktreeview.c viktreeview.h \
        viktrwlayer.c viktrwlayer.h viktrwlayer_pixmap.h \
        viklayer.c viklayer.h \


@@ -56,7 +57,14 @@ 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 \
+       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 += \
 
 if GOOGLE
 viking_SOURCES += \


@@ -75,6 +83,17 @@ viking_SOURCES += \
        expedia.c expedia.h
 endif
 
        expedia.c expedia.h
 endif
 

-INCLUDES        = @GTK_CFLAGS@ @EXPAT_CFLAGS@
-LDADD           = @GTK_LIBS@ @EXPAT_LIBS@
-AM_CFLAGS              = -Wall -g
+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@
+if LIBGPS
+LDADD           += -lgps
+endif
+#LDADD           = -lz @GTK_LIBS@ @EXPAT_LIBS@ @LIBCURL@
+AM_CFLAGS              = -Wall -g -D_GNU_SOURCE