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 62be63210c7693cbe541dd082c469531d4ac04a3..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
 # This file is licensed through the GPL version 2 or newer.
 
 SUBDIRS = icons


@@ -7,22 +7,51 @@ bin_PROGRAMS = viking
 
 noinst_LIBRARIES = libviking.a
 
 
 noinst_LIBRARIES = libviking.a
 

-authors.h: ../AUTHORS
+authors.h: $(top_srcdir)/AUTHORS

        rm -f $@
        echo "/* Generated file. */" >> $@
        echo "const gchar *AUTHORS[] = {\\" >> $@
        sed -e "s/ \*\*.*//" -e 's/^/"/' -e 's/$$/",\\/' -e '$$s/\\$$//' $< >> $@
        echo "NULL};" >> $@
 
        rm -f $@
        echo "/* Generated file. */" >> $@
        echo "const gchar *AUTHORS[] = {\\" >> $@
        sed -e "s/ \*\*.*//" -e 's/^/"/' -e 's/$$/",\\/' -e '$$s/\\$$//' $< >> $@
        echo "NULL};" >> $@
 

-BUILT_SOURCES = authors.h
+if HAVE_XSLTPROC
+documenters.h: $(top_srcdir)/help/C/viking.xml
+       $(XP) $(srcdir)/docbook2documenters.xsl $(top_srcdir)/help/C/viking.xml > $@
+else
+documenters.h:
+       rm -f $@
+       echo "/* Generated file. */" >> $@
+       echo "const gchar *DOCUMENTERS[] = {\\" >> $@
+       echo "NULL};" >> $@
+endif
+
+BUILT_SOURCES = authors.h documenters.h
+
+vikenumtypes.h: vikenumtypes.h.template $(ENUM_H_FILES) $(GLIB_MKENUMS)
+       (cd $(srcdir) && $(GLIB_MKENUMS) --template vikenumtypes.h.template $(ENUM_H_FILES)) > $@
+
+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
+
+BUILT_SOURCES += vikenumtypes.h vikenumtypes.c

 
 $(BUILT_SOURCES): $(srcdir)/Makefile.am
 
 
 $(BUILT_SOURCES): $(srcdir)/Makefile.am
 

+ENUM_H_FILES = \
+       vikviewport.h
+

 libviking_a_SOURCES = \
 libviking_a_SOURCES = \

+       bbox.h \

        modules.h modules.c \
        curl_download.c curl_download.h \
        modules.h modules.c \
        curl_download.c curl_download.h \

+       compression.c compression.h \

        menu.xml.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 \
        globals.c globals.h \
        viking.h mapcoord.h config.h \
        viktrack.c viktrack.h \


@@ -31,11 +60,16 @@ libviking_a_SOURCES = \
        coords.c coords.h \
        gpsmapper.c gpsmapper.h \
        gpspoint.c gpspoint.h \
        coords.c coords.h \
        gpsmapper.c gpsmapper.h \
        gpspoint.c gpspoint.h \

+       dir.c dir.h \

        file.c file.h \
        file.c file.h \

+       fileutils.c fileutils.h \

        authors.h \
        authors.h \

+       documenters.h \

        dialog.c dialog.h \
        util.c util.h \
        download.c download.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 \
        viklayer.c viklayer.h \
        viktreeview.c viktreeview.h \
        viktrwlayer.c viktrwlayer.h \
        viklayer.c viklayer.h \


@@ -45,42 +79,76 @@ libviking_a_SOURCES = \
        vikwindow.c vikwindow.h \
        vikviewport.c vikviewport.h \
        vikaggregatelayer.c vikaggregatelayer.h \
        vikwindow.c vikwindow.h \
        vikviewport.c vikviewport.h \
        vikaggregatelayer.c vikaggregatelayer.h \

+       vikgobjectbuilder.c vikgobjectbuilder.h \

        vikgpslayer.c vikgpslayer.h \
        vikgeoreflayer.c vikgeoreflayer.h \
        vikfileentry.c vikfileentry.h \
        vikgpslayer.c vikgpslayer.h \
        vikgeoreflayer.c vikgeoreflayer.h \
        vikfileentry.c vikfileentry.h \

+       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_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 \
        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 \
        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 \
        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_gc.c \
        datasource_bfilter.c \

+       datasource_wikipedia.c \
+       datasource_url.c \

        datasources.h \
        googlesearch.c googlesearch.h \
        dem.c dem.h \
        vikdemlayer.h vikdemlayer.c \
        vikfilelist.c vikfilelist.h \
        datasources.h \
        googlesearch.c googlesearch.h \
        dem.c dem.h \
        vikdemlayer.h vikdemlayer.c \
        vikfilelist.c vikfilelist.h \

+       vikexttool.c vikexttool.h \
+       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 \
        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
 
        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
 if GOOGLE
 libviking_a_SOURCES += \
        google.c google.h


@@ -100,7 +168,9 @@ endif
 if OPENSTREETMAP
 libviking_a_SOURCES += \
        osm.c osm.h \
 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
 endif
 
 if BLUEMARBLE


@@ -108,26 +178,41 @@ libviking_a_SOURCES += \
        bluemarble.c bluemarble.h
 endif
 
        bluemarble.c bluemarble.h
 endif
 

-if OPENAERIAL
+if GEONAMES

 libviking_a_SOURCES += \
 libviking_a_SOURCES += \

-       openaerial.c openaerial.h
+       geonames.c geonames.h \
+       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
 
 endif
 
 viking_SOURCES = main.c
 

-INCLUDES        = @GTK_CFLAGS@ @EXPAT_CFLAGS@ @LIBCURL_CPPFLAGS@
-LDADD           = libviking.a @GTK_LIBS@ @EXPAT_LIBS@ @LIBCURL@ icons/libicons.a
-if REALTIME_GPS_TRACKING
-LDADD           += -lgps
+LDADD           = libviking.a $(PACKAGE_LIBS) @EXPAT_LIBS@ @LIBCURL@ icons/libicons.a
+if WINDOWS
+LDADD += \
+       ../win32/installer/pixmaps/viking_icon.o

 endif
 endif

-#LDADD           = -lz @GTK_LIBS@ @EXPAT_LIBS@ @LIBCURL@
-AM_CFLAGS              = -Wall -g -D_GNU_SOURCE
+
+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@
 
 desktopdir = $(datadir)/applications
 desktop_in_files = viking.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
 @INTLTOOL_DESKTOP_RULE@
 
 desktopdir = $(datadir)/applications
 desktop_in_files = viking.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)

-EXTRA_DIST=$(desktop_in_files)
+EXTRA_DIST += $(desktop_in_files)

 
 CLEANFILES = $(BUILT_SOURCES) $(desktop_DATA)
 
 CLEANFILES = $(BUILT_SOURCES) $(desktop_DATA)