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 326230949f5ac7b077fd73b23376a6d23644b78f..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
        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
 documenters.h: $(top_srcdir)/help/C/viking.xml
        $(XP) $(srcdir)/docbook2documenters.xsl $(top_srcdir)/help/C/viking.xml > $@
 else


@@ -109,6 +108,7 @@ libviking_a_SOURCES = \
        datasource_gc.c \
        datasource_bfilter.c \
        datasources.h \
        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 \


@@ -131,11 +131,6 @@ libviking_a_SOURCES += \
        bing.c bing.h
 endif
 
        bing.c bing.h
 endif
 

-if GOOGLE
-libviking_a_SOURCES += \
-       google.c google.h
-endif
-

 if TERRASERVER
 libviking_a_SOURCES += \
        terraservermapsource.c terraservermapsource.h \
 if TERRASERVER
 libviking_a_SOURCES += \
        terraservermapsource.c terraservermapsource.h \