From 9216228f4b39f38a0f67174ef2ebbaaf0bf94e7e Mon Sep 17 00:00:00 2001 From: Felix Ruess Date: Mon, 16 Mar 2015 23:59:12 +0100 Subject: [PATCH] move init target to main makefile --- Makefile | 5 ++++- Makefile.ac | 6 +----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 6401791e93..b3354c1cae 100644 --- a/Makefile +++ b/Makefile @@ -121,6 +121,9 @@ _save_build_version: update_google_version: -$(MAKE) -C data/maps +init: + @[ -d $(PAPARAZZI_HOME) ] || (echo "Copying config example in your $(PAPARAZZI_HOME) directory"; mkdir -p $(PAPARAZZI_HOME); cp -a conf $(PAPARAZZI_HOME); cp -a data $(PAPARAZZI_HOME); mkdir -p $(PAPARAZZI_HOME)/var/maps; mkdir -p $(PAPARAZZI_HOME)/var/include) + conf: conf/conf.xml conf/control_panel.xml conf/maps.xml conf/%.xml :conf/%_example.xml @@ -320,7 +323,7 @@ test_math: test_sim: all prove tests/sim -.PHONY: all print_build_version _print_building _save_build_version update_google_version dox ground_segment ground_segment.opt \ +.PHONY: all print_build_version _print_building _save_build_version update_google_version init dox ground_segment ground_segment.opt \ subdirs $(SUBDIRS) conf ext libpprz multimon cockpit cockpit.opt tmtc tmtc.opt generators\ static sim_static lpctools commands \ clean cleanspaces ab_clean dist_clean distclean dist_clean_irreversible \ diff --git a/Makefile.ac b/Makefile.ac index 449111ad03..5e05dfba78 100644 --- a/Makefile.ac +++ b/Makefile.ac @@ -136,10 +136,6 @@ endif endif -init: - @[ -d $(PAPARAZZI_HOME) ] || (echo "Copying config example in your $(PAPARAZZI_HOME) directory"; mkdir -p $(PAPARAZZI_HOME); cp -a conf $(PAPARAZZI_HOME); cp -a data $(PAPARAZZI_HOME); mkdir -p $(PAPARAZZI_HOME)/var/maps; mkdir -p $(PAPARAZZI_HOME)/var/include) - - print_version: @echo "-----------------------------------------------------------------------" @echo "Paparazzi version" $(GIT_DESC)$(VERSION_MATCH) @@ -254,4 +250,4 @@ clean_ac : @echo "CLEANING $(AIRCRAFT)" $(Q)rm -fr $(AIRCRAFT_BUILD_DIR) -.PHONY: init all_ac_h radio_ac_h flight_plan_ac_h makefile_ac clean_ac print_version +.PHONY: all_ac_h radio_ac_h flight_plan_ac_h makefile_ac clean_ac print_version