diff --git a/Makefile b/Makefile index dc038c10d3..5537086c6a 100644 --- a/Makefile +++ b/Makefile @@ -74,14 +74,16 @@ all: conf commands static 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/maps.xml +conf: conf/conf.xml conf/control_panel.xml conf/maps.xml FORCE conf/%.xml :conf/%.xml.example [ -L $@ ] || [ -f $@ ] || cp $< $@ -conf/maps.xml: - cd data/maps; $(MAKE) +conf/maps.xml: conf/maps.xml.example FORCE + -cd data/maps; $(MAKE) + if test ! -e $@; then cp $< $@; fi +FORCE: lib: cd $(LIB)/ocaml; $(MAKE) diff --git a/conf/maps.xml.example b/conf/maps.xml.example new file mode 100644 index 0000000000..0103dd0ef4 --- /dev/null +++ b/conf/maps.xml.example @@ -0,0 +1,3 @@ + + + diff --git a/data/maps/Makefile b/data/maps/Makefile index 5d393a1517..b9bc104c3c 100644 --- a/data/maps/Makefile +++ b/data/maps/Makefile @@ -6,11 +6,12 @@ all: $(DATADIR)/maps.google.com $(PAPARAZZI_HOME)/conf/maps.xml $(DATADIR): mkdir $(DATADIR) -$(DATADIR)/maps.google.com: $(DATADIR) +$(DATADIR)/maps.google.com: $(DATADIR) FORCE wget -O $(@) http://maps.google.com/ $(PAPARAZZI_HOME)/conf/maps.xml: $(DATADIR)/maps.google.com - $(Q)echo "" > $(@) + $(Q)echo "\n" > $(@) $(Q)echo "" >> $(@) $(Q)echo "" >> $(@) +Force: