SF#3575828: Ensure new track drawing uses track property line thickness

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 1846df5b422b3613e05a6787b7da339cc9a1920e..2f98f73bbd57cadf7bb1f789af4d4e4fe3bca020 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,14 +7,25 @@ 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.h: vikenumtypes.h.template $(ENUM_H_FILES) $(GLIB_MKENUMS)
        (cd $(srcdir) && $(GLIB_MKENUMS) --template vikenumtypes.h.template $(ENUM_H_FILES)) > $@


@@ -23,6 +34,7 @@ vikenumtypes.c: vikenumtypes.c.template $(ENUM_H_FILES) $(GLIB_MKENUMS)
        (cd $(srcdir) && $(GLIB_MKENUMS) --template vikenumtypes.c.template $(ENUM_H_FILES)) > $@
 
 EXTRA_DIST =                         \
        (cd $(srcdir) && $(GLIB_MKENUMS) --template vikenumtypes.c.template $(ENUM_H_FILES)) > $@
 
 EXTRA_DIST =                         \

+        docbook2documenters.xsl      \

         vikenumtypes.h.template      \
         vikenumtypes.c.template
 
         vikenumtypes.h.template      \
         vikenumtypes.c.template
 


@@ -34,6 +46,7 @@ ENUM_H_FILES = \
        vikviewport.h
 
 libviking_a_SOURCES = \
        vikviewport.h
 
 libviking_a_SOURCES = \

+       bbox.h \

        modules.h modules.c \
        curl_download.c curl_download.h \
        menu.xml.h \
        modules.h modules.c \
        curl_download.c curl_download.h \
        menu.xml.h \


@@ -46,8 +59,10 @@ 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 \
        authors.h \
        file.c file.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 \


@@ -65,9 +80,9 @@ libviking_a_SOURCES = \
        vikgpslayer.c vikgpslayer.h \
        vikgeoreflayer.c vikgeoreflayer.h \
        vikfileentry.c vikfileentry.h \
        vikgpslayer.c vikgpslayer.h \
        vikgeoreflayer.c vikgeoreflayer.h \
        vikfileentry.c vikfileentry.h \

-       viksearchtool.c viksearchtool.h \
-       vikxmlsearchtool.c vikxmlsearchtool.h \
-       viksearch.c viksearch.h \
+       vikgototool.c vikgototool.h \
+       vikgotoxmltool.c vikgotoxmltool.h \
+       vikgoto.c vikgoto.h \

        viktrwlayer_tpwin.c viktrwlayer_tpwin.h \
        viktrwlayer_propwin.c viktrwlayer_propwin.h \
        thumbnails.c thumbnails.h \
        viktrwlayer_tpwin.c viktrwlayer_tpwin.h \
        viktrwlayer_propwin.c viktrwlayer_propwin.h \
        thumbnails.c thumbnails.h \


@@ -81,15 +96,19 @@ libviking_a_SOURCES = \
        vikmapslayer_compat.c vikmapslayer_compat.h \
        vikmaptype.c vikmaptype.h \
        vikslippymapsource.c vikslippymapsource.h \
        vikmapslayer_compat.c vikmapslayer_compat.h \
        vikmaptype.c vikmaptype.h \
        vikslippymapsource.c vikslippymapsource.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 \
         gpx.c gpx.h \
        garminsymbols.c garminsymbols.h \
        acquire.c acquire.h \
        babel.c babel.h \

+       datasource_file.c \

        datasource_gps.c \
        datasource_google.c \
        datasource_gc.c \
        datasource_bfilter.c \
        datasources.h \
        datasource_gps.c \
        datasource_google.c \
        datasource_gc.c \
        datasource_bfilter.c \
        datasources.h \

+       google.c google.h \

        googlesearch.c googlesearch.h \
        dem.c dem.h \
        vikdemlayer.h vikdemlayer.c \
        googlesearch.c googlesearch.h \
        dem.c dem.h \
        vikdemlayer.h vikdemlayer.c \


@@ -98,6 +117,7 @@ libviking_a_SOURCES = \
        vikexttools.c vikexttools.h \
        vikwebtool.c vikwebtool.h \
        vikwebtoolcenter.c vikwebtoolcenter.h \
        vikexttools.c vikexttools.h \
        vikwebtool.c vikwebtool.h \
        vikwebtoolcenter.c vikwebtoolcenter.h \

+       vikwebtoolbounds.c vikwebtoolbounds.h \

        dems.c dems.h \
        srtm_continent.c \
        uibuilder.c uibuilder.h \
        dems.c dems.h \
        srtm_continent.c \
        uibuilder.c uibuilder.h \


@@ -105,9 +125,10 @@ libviking_a_SOURCES = \
        print.c print.h \
        preferences.c preferences.h
 
        print.c print.h \
        preferences.c preferences.h
 

-if GOOGLE
+if BING

 libviking_a_SOURCES += \
 libviking_a_SOURCES += \

-       google.c google.h
+       bingmapsource.c bingmapsource.h \
+       bing.c bing.h

 endif
 
 if TERRASERVER
 endif
 
 if TERRASERVER


@@ -124,7 +145,8 @@ 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.c

 endif
 
 if BLUEMARBLE
 endif
 
 if BLUEMARBLE


@@ -132,26 +154,35 @@ 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
 
 endif
 

-if GEONAMES
+#if SPOTMAPS

 libviking_a_SOURCES += \
 libviking_a_SOURCES += \

-       geonamessearch.c geonamessearch.h
+       spotmaps.c spotmaps.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
 endif
 
 viking_SOURCES = main.c
 
 LDADD           = libviking.a $(PACKAGE_LIBS) @EXPAT_LIBS@ @LIBCURL@ icons/libicons.a

-if REALTIME_GPS_TRACKING
-LDADD           += -lgps
-endif

 AM_CFLAGS              = -Wall -g -D_GNU_SOURCE \
 AM_CFLAGS              = -Wall -g -D_GNU_SOURCE \

-       $(DISABLE_DEPRECATED_CFLAGS) \

        $(PACKAGE_CFLAGS) \
        @EXPAT_CFLAGS@ @LIBCURL_CPPFLAGS@
        $(PACKAGE_CFLAGS) \
        @EXPAT_CFLAGS@ @LIBCURL_CPPFLAGS@

+AM_CPPFLAGS            = \
+       -DVIKING_DATADIR=\""$(pkgdatadir)"\" \
+       -DVIKING_SYSCONFDIR=\""$(sysconfdir)/$(PACKAGE)"\"

 
 @INTLTOOL_DESKTOP_RULE@
 
 
 @INTLTOOL_DESKTOP_RULE@