Remove unnecessary subdomain in some OSM tileserver hostnames.

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 153606c917213c1f6796ee995187e1b6d4d04880..ba88968920670c239a355c0c55c3b48b0c12c708 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-# This is the Makefile for the viking gps viewer program.
+# This is the Makefile for the Viking GPS viewer program.
 # This file is licensed through the GPL version 2 or newer.
 
 SUBDIRS = icons
@@ -15,7 +15,6 @@ authors.h: $(top_srcdir)/AUTHORS
        echo "NULL};" >> $@
 
 if HAVE_XSLTPROC
-XP=@XP@
 documenters.h: $(top_srcdir)/help/C/viking.xml
        $(XP) $(srcdir)/docbook2documenters.xsl $(top_srcdir)/help/C/viking.xml > $@
 else
@@ -34,10 +33,10 @@ vikenumtypes.h: vikenumtypes.h.template $(ENUM_H_FILES) $(GLIB_MKENUMS)
 vikenumtypes.c: vikenumtypes.c.template $(ENUM_H_FILES) $(GLIB_MKENUMS)
        (cd $(srcdir) && $(GLIB_MKENUMS) --template vikenumtypes.c.template $(ENUM_H_FILES)) > $@
 
-EXTRA_DIST =                         \
-        docbook2documenters.xsl      \
-        vikenumtypes.h.template      \
-        vikenumtypes.c.template
+EXTRA_DIST = \
+       docbook2documenters.xsl \
+       vikenumtypes.h.template \
+       vikenumtypes.c.template
 
 BUILT_SOURCES += vikenumtypes.h vikenumtypes.c
 
@@ -47,10 +46,12 @@ ENUM_H_FILES = \
        vikviewport.h
 
 libviking_a_SOURCES = \
+       bbox.h \
        modules.h modules.c \
        curl_download.c curl_download.h \
+       compression.c compression.h \
        menu.xml.h \
-    degrees_converters.c degrees_converters.h \
+       degrees_converters.c degrees_converters.h \
        globals.c globals.h \
        viking.h mapcoord.h config.h \
        viktrack.c viktrack.h \
@@ -59,12 +60,15 @@ libviking_a_SOURCES = \
        coords.c coords.h \
        gpsmapper.c gpsmapper.h \
        gpspoint.c gpspoint.h \
+       dir.c dir.h \
        file.c file.h \
+       fileutils.c fileutils.h \
        authors.h \
        documenters.h \
        dialog.c dialog.h \
        util.c util.h \
        download.c download.h \
+       jpg.c jpg.h \
        vikenumtypes.c vikenumtypes.h \
        viktreeview.c viktreeview.h \
        viktrwlayer.c viktrwlayer.h \
@@ -82,27 +86,42 @@ libviking_a_SOURCES = \
        vikgototool.c vikgototool.h \
        vikgotoxmltool.c vikgotoxmltool.h \
        vikgoto.c vikgoto.h \
+       viktrwlayer_export.c viktrwlayer_export.h \
        viktrwlayer_tpwin.c viktrwlayer_tpwin.h \
        viktrwlayer_propwin.c viktrwlayer_propwin.h \
+       viktrwlayer_analysis.c viktrwlayer_analysis.h \
+       viktrwlayer_tracklist.c viktrwlayer_tracklist.h \
+       viktrwlayer_waypointlist.c viktrwlayer_waypointlist.h \
+       vikrouting.c vikrouting.h \
+       vikroutingengine.c vikroutingengine.h \
+       vikroutingwebengine.c vikroutingwebengine.h \
+       vikutils.c vikutils.h \
        thumbnails.c thumbnails.h \
        background.c background.h \
        vikradiogroup.c vikradiogroup.h \
        vikcoord.c vikcoord.h \
        mapcache.c mapcache.h \
+       maputils.c maputils.h \
        vikmapsource.c vikmapsource.h \
        vikmapsourcedefault.c vikmapsourcedefault.h \
        vikmapslayer.c vikmapslayer.h \
        vikmapslayer_compat.c vikmapslayer_compat.h \
        vikmaptype.c vikmaptype.h \
        vikslippymapsource.c vikslippymapsource.h \
-        gpx.c gpx.h \
+       vikwmscmapsource.c vikwmscmapsource.h \
+       viktmsmapsource.c viktmsmapsource.h \
+       gpx.c gpx.h \
        garminsymbols.c garminsymbols.h \
        acquire.c acquire.h \
        babel.c babel.h \
-       datasource_gps.c \
-       datasource_google.c \
+       babel_ui.c babel_ui.h \
+       datasource_file.c \
+       datasource_gps.c datasource_gps.h \
+       datasource_routing.c \
        datasource_gc.c \
        datasource_bfilter.c \
+       datasource_wikipedia.c \
+       datasource_url.c \
        datasources.h \
        googlesearch.c googlesearch.h \
        dem.c dem.h \
@@ -112,13 +131,24 @@ libviking_a_SOURCES = \
        vikexttools.c vikexttools.h \
        vikwebtool.c vikwebtool.h \
        vikwebtoolcenter.c vikwebtoolcenter.h \
+       vikwebtoolbounds.c vikwebtoolbounds.h \
+       vikexttool_datasources.c vikexttool_datasources.h \
+       vikwebtool_datasource.c vikwebtool_datasource.h \
        dems.c dems.h \
        srtm_continent.c \
        uibuilder.c uibuilder.h \
        print-preview.c print-preview.h \
        print.c print.h \
+       viklayer_defaults.c viklayer_defaults.h \
+       settings.c settings.h \
        preferences.c preferences.h
 
+if BING
+libviking_a_SOURCES += \
+       bingmapsource.c bingmapsource.h \
+       bing.c bing.h
+endif
+
 if GOOGLE
 libviking_a_SOURCES += \
        google.c google.h
@@ -138,7 +168,9 @@ endif
 if OPENSTREETMAP
 libviking_a_SOURCES += \
        osm.c osm.h \
-       osm-traces.c osm-traces.h
+       osm-traces.c osm-traces.h \
+       datasource_osm_my_traces.c \
+       datasource_osm.c
 endif
 
 if BLUEMARBLE
@@ -152,15 +184,29 @@ libviking_a_SOURCES += \
        geonamessearch.c geonamessearch.h
 endif
 
+if GEOTAG
+libviking_a_SOURCES += \
+       datasource_geotag.c \
+       geotag_exif.c geotag_exif.h \
+       viktrwlayer_geotag.c viktrwlayer_geotag.h \
+       libjpeg/jpeg-data.c libjpeg/jpeg-data.h \
+       libjpeg/jpeg-marker.c libjpeg/jpeg-marker.h
+endif
+
 viking_SOURCES = main.c
 
 LDADD           = libviking.a $(PACKAGE_LIBS) @EXPAT_LIBS@ @LIBCURL@ icons/libicons.a
-if REALTIME_GPS_TRACKING
-LDADD           += -lgps
+if WINDOWS
+LDADD += \
+       ../win32/installer/pixmaps/viking_icon.o
 endif
+
 AM_CFLAGS              = -Wall -g -D_GNU_SOURCE \
        $(PACKAGE_CFLAGS) \
        @EXPAT_CFLAGS@ @LIBCURL_CPPFLAGS@
+AM_CPPFLAGS            = \
+       -DVIKING_DATADIR=\""$(pkgdatadir)"\" \
+       -DVIKING_SYSCONFDIR=\""$(sysconfdir)/$(PACKAGE)"\"
 
 @INTLTOOL_DESKTOP_RULE@