Merge branch 'master' into i18n-launchpad

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

diff --git a/src/Makefile.am b/src/Makefile.am
index ee8c8f9a9f00406d13e9e874445dd4941df698bb..367cc87527b10573282b1700a4b107a98d3bffde 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -65,6 +65,9 @@ libviking_a_SOURCES = \
        vikgpslayer.c vikgpslayer.h \
        vikgeoreflayer.c vikgeoreflayer.h \
        vikfileentry.c vikfileentry.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 \
@@ -136,6 +139,7 @@ endif
 
 if GEONAMES
 libviking_a_SOURCES += \
+       geonames.c geonames.h \
        geonamessearch.c geonamessearch.h
 endif
 
@@ -146,6 +150,7 @@ if REALTIME_GPS_TRACKING
 LDADD           += -lgps
 endif
 AM_CFLAGS              = -Wall -g -D_GNU_SOURCE \
+       $(DISABLE_DEPRECATED_CFLAGS) \
        $(PACKAGE_CFLAGS) \
        @EXPAT_CFLAGS@ @LIBCURL_CPPFLAGS@