Fix:maps:Improved Makefile

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

diff --git a/navit/maps/Makefile.am b/navit/maps/Makefile.am
index 29fa032..0830da2 100644 (file)
--- a/navit/maps/Makefile.am
+++ b/navit/maps/Makefile.am
@@ -1,11 +1,15 @@
 include $(top_srcdir)/Makefile.inc
 
+.SECONDARY:
+
 SAMPLE_MAP=osm_bbox_11.3,47.9,11.7,48.2
 
 osm2navit_args=--attr-debug-level=5
 
 maps_DATA = $(SAMPLE_MAP).bin $(SAMPLE_MAP).xml
 
+SUFFIXES=.osm.bz2
+
 samplemap: $(SAMPLE_MAP).bin
 
 .osm.bin:
@@ -13,7 +17,7 @@ samplemap: $(SAMPLE_MAP).bin
        $(top_builddir)/navit/osm2navit $(osm2navit_args) $@.tmp <$<
        mv $@.tmp $@
 
-.osm_bz2.bin:
+.osm.bz2.bin:
        echo "Converting osm map"
        bzcat $< | $(top_builddir)/navit/osm2navit $(osm2navit_args) $@.tmp
        mv $@.tmp $@
@@ -22,10 +26,10 @@ samplemap: $(SAMPLE_MAP).bin
        echo '<map type="binfile" enabled="yes" data="$$NAVIT_SHAREDIR/maps/$<"/>' >$@
 
        
-$(SAMPLE_MAP).osm_bz2:
+$(SAMPLE_MAP).osm.bz2:
        echo "Downloading osm sample map"
-       wget -O $(SAMPLE_MAP).osm_bz2.tmp http://www.navit-project.org/maps/$(SAMPLE_MAP).osm.bz2
-       mv $(SAMPLE_MAP).osm_bz2.tmp $(SAMPLE_MAP).osm_bz2
+       wget -O $(SAMPLE_MAP).osm.bz2.tmp http://www.navit-project.org/maps/$(SAMPLE_MAP).osm.bz2
+       mv $(SAMPLE_MAP).osm.bz2.tmp $(SAMPLE_MAP).osm.bz2
 
 distclean-local: 
        rm -f $(SAMPLE_MAP).osm.bz2 $(SAMPLE_MAP).bin $(SAMPLE_MAP).xml