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 426c3e94b5557a9a18749a7d36e20cf007223f7a..2f98f73bbd57cadf7bb1f789af4d4e4fe3bca020 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -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
@@ -60,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 \
@@ -108,6 +108,7 @@ libviking_a_SOURCES = \
        datasource_gc.c \
        datasource_bfilter.c \
        datasources.h \
+       google.c google.h \
        googlesearch.c googlesearch.h \
        dem.c dem.h \
        vikdemlayer.h vikdemlayer.c \
@@ -130,11 +131,6 @@ libviking_a_SOURCES += \
        bing.c bing.h
 endif
 
-if GOOGLE
-libviking_a_SOURCES += \
-       google.c google.h
-endif
-
 if TERRASERVER
 libviking_a_SOURCES += \
        terraservermapsource.c terraservermapsource.h \
@@ -181,12 +177,12 @@ 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@