Move sample map to separate target - samplemap and don't put the map into the distrib...

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk/navit@495 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/Makefile.am b/Makefile.am
index 209355f..0f9d71e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,3 +3,12 @@ SUBDIRS=src po intl
 pkgdoc_DATA = README
 EXTRA_DIST = README
 
+all-local:
+       @echo ------------------------
+       @echo Navit build complete
+       @echo To build the sample map:
+       @echo make samplemap
+       @echo ------------------------
+
+samplemap:
+       make -C src samplemap

diff --git a/src/Makefile.am b/src/Makefile.am
index 3e538af..0384294 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,13 +5,11 @@ SAMPLE_MAP=osm_bbox_11.3,47.9,11.7,48.2
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/fib-1.1 @NAVIT_CFLAGS@ -DPREFIX=\"@prefix@\" -DMODULE=\"navit\"
 
-
 bin_PROGRAMS = navit
 
 pkgdata_DATA = navit.xml
-maps_DATA=maps/$(SAMPLE_MAP).txt
 
-EXTRA_DIST = navit.xml maps/$(SAMPLE_MAP).txt
+EXTRA_DIST = navit.xml 
 
 navit_SOURCES = attr.c callback.c compass.c coord.c country.c cursor.c data_window.c debug.c \
        file.c graphics.c gui.c item.c layout.c log.c main.c map.c \
@@ -26,6 +24,8 @@ navit_SOURCES = attr.c callback.c compass.c coord.c country.c cursor.c data_wind
 
 navit_LDADD = @NAVIT_LIBS@ @GPSD_LIBS@ -Lfib-1.1 -lfib
 
+samplemap: maps/$(SAMPLE_MAP).txt
+
 maps/$(SAMPLE_MAP).osm:
        echo "Downloading osm sample map"
        mkdir -p maps
@@ -38,4 +38,4 @@ maps/$(SAMPLE_MAP).txt: maps/$(SAMPLE_MAP).osm $(top_srcdir)/src/script/osm2navi
        mv maps/$(SAMPLE_MAP).txt.tmp maps/$(SAMPLE_MAP).txt
 
 distclean-local:
-       rm -f maps/$(SAMPLE_MAP).osm
+       rm -f maps/$(SAMPLE_MAP).osm maps/$(SAMPLE_MAP).txt