Add option to auto connect to GPSD rather than having to manually control

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

diff --git a/src/Makefile.am b/src/Makefile.am
index bc792eb97f3f8b209d6e5e31c3017b35ec880d89..7c5809052edc28e720a744000398d2aaf7dc3267 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -34,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 = \
+       misc/fpconv-license.txt \
        docbook2documenters.xsl \
        vikenumtypes.h.template \
        vikenumtypes.c.template
@@ -66,6 +67,7 @@ libviking_a_SOURCES = \
        dir.c dir.h \
        file.c file.h \
        fileutils.c fileutils.h \
+       file_magic.c file_magic.h \
        authors.h \
        documenters.h \
        dialog.c dialog.h \
@@ -103,6 +105,7 @@ libviking_a_SOURCES = \
        vikutils.c vikutils.h \
        toolbar.c toolbar.h toolbar.xml.h \
        thumbnails.c thumbnails.h \
+       md5_hash.c md5_hash.h \
        background.c background.h \
        vikradiogroup.c vikradiogroup.h \
        vikcoord.c vikcoord.h \
@@ -149,9 +152,11 @@ libviking_a_SOURCES = \
        uibuilder.c uibuilder.h \
        print-preview.c print-preview.h \
        print.c print.h \
+       kmz.c kmz.h \
        viklayer_defaults.c viklayer_defaults.h \
        settings.c settings.h \
        preferences.c preferences.h \
+       misc/fpconv.c misc/fpconv.h misc/powers.h \
        misc/strtod.c misc/strtod.h \
        misc/kdtree.c misc/kdtree.h
 
@@ -210,9 +215,15 @@ libviking_a_SOURCES += \
        libjpeg/jpeg-marker.c libjpeg/jpeg-marker.h
 endif
 
+if MAPNIK
+libviking_a_SOURCES += \
+       vikmapniklayer.c vikmapniklayer.h \
+       mapnik_interface.cpp mapnik_interface.h
+endif
+
 viking_SOURCES = main.c
 
-LDADD           = libviking.a $(PACKAGE_LIBS) @EXPAT_LIBS@ @LIBCURL@ icons/libicons.a
+LDADD           = $(noinst_LIBRARIES) $(PACKAGE_LIBS) @EXPAT_LIBS@ @LIBCURL@ icons/libicons.a
 if WINDOWS
 LDADD += \
        ../win32/installer/pixmaps/viking_icon.o
@@ -222,6 +233,7 @@ AM_CFLAGS           = -Wall -g -D_GNU_SOURCE \
        $(PACKAGE_CFLAGS) \
        @EXPAT_CFLAGS@ @LIBCURL_CPPFLAGS@
 AM_CPPFLAGS            = \
+       $(PACKAGE_CFLAGS) \
        -DVIKING_DATADIR=\""$(pkgdatadir)"\" \
        -DVIKING_SYSCONFDIR=\""$(sysconfdir)/$(PACKAGE)"\"