From 028ce2c7a029bc1ae4739404e906bf13dfd0cc7b Mon Sep 17 00:00:00 2001
From: Bernard Davison <bernard@gondwana.com.au>
Date: Sun, 19 Jun 2011 23:16:08 +1000
Subject: [PATCH] Making the pulling of the google version part of the make
 process

---
 Makefile           | 9 +++++----
 data/maps/Makefile | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 7a2c6dde55..836ed269f4 100644
--- a/Makefile
+++ b/Makefile
@@ -72,11 +72,14 @@ all: commands static conf
 
 static : lib center tools cockpit multimon tmtc misc logalizer lpc21iap sim_static static_h usb_lib
 
-conf: conf/conf.xml conf/control_panel.xml
+conf: conf/conf.xml conf/control_panel.xml conf/maps_data/version
 
 conf/%.xml :conf/%.xml.example
 	[ -L $@ ] || [ -f $@ ] || cp $< $@
 
+conf/maps_data/version:
+	cd data/maps; $(MAKE)
+
 
 lib:
 	cd $(LIB)/ocaml; $(MAKE)
@@ -248,10 +251,8 @@ sw/simulator/launchsitl:
 	cat src/$(@F) | sed s#OCAMLRUN#$(OCAMLRUN)# | sed s#OCAML#$(OCAML)# > $@
 	chmod a+x $@
 
-#.SUFFIXES: .hgt.zip .jpg
+#.SUFFIXES: .hgt.zip
 
 %.hgt.zip:
 	cd data/srtm; $(MAKE) $(@)
 
-%.jpg:
-	cd data/maps; $(MAKE) $(@)
diff --git a/data/maps/Makefile b/data/maps/Makefile
index 3e5fecf937..01ca5b64ea 100644
--- a/data/maps/Makefile
+++ b/data/maps/Makefile
@@ -7,7 +7,7 @@ $(DATADIR):
 	mkdir $(DATADIR)
 
 $(DATADIR)/index: $(DATADIR)
-	$(@)wget -O $(@) http://maps.google.com/
+	$(Q)wget -O $(@) http://maps.google.com/
 
 $(DATADIR)/version: $(DATADIR)/index
 	$(Q)grep -P "http://khm[0-9]+.google.com/kh/v=[0-9]+.x26" $(DATADIR)/index | sed -E s#.*http://khm[0-9]+.google.com/kh/v=## | sed -E s#.x26.*## > $(@)