Making the pulling of the google version part of the make process

This commit is contained in:
Bernard Davison
2011-06-19 23:16:08 +10:00
committed by Felix Ruess
parent 161d758ec0
commit 028ce2c7a0
2 changed files with 6 additions and 5 deletions
+5 -4
View File
@@ -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) $(@)
+1 -1
View File
@@ -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.*## > $(@)