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 c2e2888811fd32e2c7f20507e4dbde2269ad6982..2f98f73bbd57cadf7bb1f789af4d4e4fe3bca020 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,7 +7,7 @@ bin_PROGRAMS = viking
 
 noinst_LIBRARIES = libviking.a
 
-authors.h: ../AUTHORS
+authors.h: $(top_srcdir)/AUTHORS
        rm -f $@
        echo "/* Generated file. */" >> $@
        echo "const gchar *AUTHORS[] = {\\" >> $@
@@ -15,7 +15,6 @@ authors.h: ../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
@@ -47,6 +46,7 @@ ENUM_H_FILES = \
        vikviewport.h
 
 libviking_a_SOURCES = \
+       bbox.h \
        modules.h modules.c \
        curl_download.c curl_download.h \
        menu.xml.h \
@@ -59,6 +59,7 @@ libviking_a_SOURCES = \
        coords.c coords.h \
        gpsmapper.c gpsmapper.h \
        gpspoint.c gpspoint.h \
+       dir.c dir.h \
        file.c file.h \
        authors.h \
        documenters.h \
@@ -95,15 +96,19 @@ libviking_a_SOURCES = \
        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 \
+       datasource_file.c \
        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 \
@@ -112,6 +117,7 @@ libviking_a_SOURCES = \
        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 \
@@ -119,9 +125,10 @@ libviking_a_SOURCES = \
        print.c print.h \
        preferences.c preferences.h
 
-if GOOGLE
+if BING
 libviking_a_SOURCES += \
-       google.c google.h
+       bingmapsource.c bingmapsource.h \
+       bing.c bing.h
 endif
 
 if TERRASERVER
@@ -138,7 +145,8 @@ endif
 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
@@ -152,15 +160,29 @@ libviking_a_SOURCES += \
        geonamessearch.c geonamessearch.h
 endif
 
+#if SPOTMAPS
+libviking_a_SOURCES += \
+       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
-if REALTIME_GPS_TRACKING
-LDADD           += -lgps
-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@