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 5e876cc91723bba37aba5a50f84c1c31b4ba1188..252ec6e448883017dacf4df82d3ec98789009d84 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,9 +4,19 @@
 SUBDIRS = icons
 
 bin_PROGRAMS = viking
 SUBDIRS = icons
 
 bin_PROGRAMS = viking

+
+authors.h: ../AUTHORS
+       rm -f $@
+       echo "/* Generated file. */" >> $@
+       echo "#define AUTHORS \\" >> $@
+       sed -e "s/ \*\*.*//" -e 's/^/"/' -e 's/$$/\\n"\\/' -e '$$s/\\$$//' $< >> $@
+
+BUILT_SOURCES = authors.h
+

 viking_SOURCES = main.c \
 viking_SOURCES = main.c \

-       icons.h \
+       modules.h modules.c \

        menu.xml.h \
        menu.xml.h \

+    degrees_converters.c degrees_converters.h \

        viking.h globals.h mapcoord.h config.h \
        viktrack.c viktrack.h \
        vikwaypoint.c vikwaypoint.h \
        viking.h globals.h mapcoord.h config.h \
        viktrack.c viktrack.h \
        vikwaypoint.c vikwaypoint.h \


@@ -15,8 +25,9 @@ viking_SOURCES = main.c \
        gpsmapper.c gpsmapper.h \
        gpspoint.c gpspoint.h \
        file.c file.h \
        gpsmapper.c gpsmapper.h \
        gpspoint.c gpspoint.h \
        file.c file.h \

+       authors.h \

        dialog.c dialog.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 \


@@ -26,6 +37,7 @@ viking_SOURCES = main.c \
        vikwindow.c vikwindow.h \
        vikviewport.c vikviewport.h \
        vikaggregatelayer.c vikaggregatelayer.h vikaggregatelayer_pixmap.h \
        vikwindow.c vikwindow.h \
        vikviewport.c vikviewport.h \
        vikaggregatelayer.c vikaggregatelayer.h vikaggregatelayer_pixmap.h \

+       vikgpslayer.c vikgpslayer.h vikgpslayer_pixmap.h \

        vikgeoreflayer.c vikgeoreflayer.h vikgeoreflayer_pixmap.h \
        vikfileentry.c vikfileentry.h \
        viktrwlayer_tpwin.c viktrwlayer_tpwin.h \
        vikgeoreflayer.c vikgeoreflayer.h vikgeoreflayer_pixmap.h \
        vikfileentry.c vikfileentry.h \
        viktrwlayer_tpwin.c viktrwlayer_tpwin.h \


@@ -34,24 +46,50 @@ viking_SOURCES = main.c \
        background.c background.h \
        vikradiogroup.c vikradiogroup.h \
        vikcoord.c vikcoord.h \
        background.c background.h \
        vikradiogroup.c vikradiogroup.h \
        vikcoord.c vikcoord.h \

-       expedia.c expedia.h \

        mapcache.c mapcache.h \
        vikmapslayer.c vikmapslayer.h vikmapslayer_pixmap.h \
        mapcache.c mapcache.h \
        vikmapslayer.c vikmapslayer.h vikmapslayer_pixmap.h \

-       terraserver.c terraserver.h \
-       google.c google.h \
-       googlemaps.c googlemaps.h \

        gtkcellrendererprogress.c gtkcellrendererprogress.h \
        gtkcellrendererprogress.c gtkcellrendererprogress.h \

-       khmaps.c khmaps.h \
-       usgs.c usgs.h \

         gpx.c gpx.h \
         gpx.c gpx.h \

-       garminsymbols.c garminsymbols.h
+       garminsymbols.c garminsymbols.h \
+       acquire.c acquire.h \
+       babel.c babel.h \
+       datasource_gps.c \
+       datasource_google.c \
+       datasource_gc.c \
+       datasources.h \
+       googlesearch.c googlesearch.h

 
 

-INCLUDES        = @GTK_CFLAGS@
-LDADD           = @GTK_LIBS@
-AM_CFLAGS              = -Wall -g
+if LIBCURL
+viking_SOURCES += \
+       curl_download.c curl_download.h
+else
+viking_SOURCES += \
+       http.c http.h
+endif

 
 

-icons.h: icons/*_h
-       echo "/* Generated file */" > icons.h
-       for file in icons/*_h ; do echo "#include \"$$file\"" >> icons.h ; done
+if GOOGLE
+viking_SOURCES += \
+       khmaps.c khmaps.h \
+       google.c google.h \
+       googlemaps.c googlemaps.h
+endif
+
+if TERRASERVER
+viking_SOURCES += \
+       terraserver.c terraserver.h
+endif
+
+if EXPEDIA
+viking_SOURCES += \
+       expedia.c expedia.h
+endif

 
 

-CLEANFILES = icons.h
\ No newline at end of file
+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