Always open new .vik file in current window when no .vik file is loaded.

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

diff --git a/src/Makefile.am b/src/Makefile.am
index f5e922836db64dbdd1232f7e12b1a4e4ef1ebe2b..983fe6471b8274ad9ec08667a7b905f38338a422 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
@@ -50,6 +49,7 @@ libviking_a_SOURCES = \
        bbox.h \
        modules.h modules.c \
        curl_download.c curl_download.h \
+       compression.c compression.h \
        menu.xml.h \
     degrees_converters.c degrees_converters.h \
        globals.c globals.h \
@@ -60,6 +60,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 \
@@ -85,11 +86,19 @@ libviking_a_SOURCES = \
        vikgoto.c vikgoto.h \
        viktrwlayer_tpwin.c viktrwlayer_tpwin.h \
        viktrwlayer_propwin.c viktrwlayer_propwin.h \
+       viktrwlayer_analysis.c viktrwlayer_analysis.h \
+       viktrwlayer_tracklist.c viktrwlayer_tracklist.h \
+       viktrwlayer_waypointlist.c viktrwlayer_waypointlist.h \
+       vikrouting.c vikrouting.h \
+       vikroutingengine.c vikroutingengine.h \
+       vikroutingwebengine.c vikroutingwebengine.h \
+       vikutils.c vikutils.h \
        thumbnails.c thumbnails.h \
        background.c background.h \
        vikradiogroup.c vikradiogroup.h \
        vikcoord.c vikcoord.h \
        mapcache.c mapcache.h \
+       maputils.c maputils.h \
        vikmapsource.c vikmapsource.h \
        vikmapsourcedefault.c vikmapsourcedefault.h \
        vikmapslayer.c vikmapslayer.h \
@@ -103,10 +112,11 @@ libviking_a_SOURCES = \
        acquire.c acquire.h \
        babel.c babel.h \
        datasource_file.c \
-       datasource_gps.c \
-       datasource_google.c \
+       datasource_gps.c datasource_gps.h \
+       datasource_routing.c \
        datasource_gc.c \
        datasource_bfilter.c \
+       datasource_wikipedia.c \
        datasources.h \
        googlesearch.c googlesearch.h \
        dem.c dem.h \
@@ -117,11 +127,15 @@ libviking_a_SOURCES = \
        vikwebtool.c vikwebtool.h \
        vikwebtoolcenter.c vikwebtoolcenter.h \
        vikwebtoolbounds.c vikwebtoolbounds.h \
+       vikexttool_datasources.c vikexttool_datasources.h \
+       vikwebtool_datasource.c vikwebtool_datasource.h \
        dems.c dems.h \
        srtm_continent.c \
        uibuilder.c uibuilder.h \
        print-preview.c print-preview.h \
        print.c print.h \
+       viklayer_defaults.c viklayer_defaults.h \
+       settings.c settings.h \
        preferences.c preferences.h
 
 if BING
@@ -132,7 +146,7 @@ endif
 
 if GOOGLE
 libviking_a_SOURCES += \
-       google.c google.h
+       google.c google.h
 endif
 
 if TERRASERVER
@@ -150,6 +164,7 @@ if OPENSTREETMAP
 libviking_a_SOURCES += \
        osm.c osm.h \
        osm-traces.c osm-traces.h \
+       datasource_osm_my_traces.c \
        datasource_osm.c
 endif
 
@@ -184,6 +199,9 @@ LDADD           = libviking.a $(PACKAGE_LIBS) @EXPAT_LIBS@ @LIBCURL@ icons/libic
 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@