From 51707245bb643a79bec6a75e3a151549ad1093c1 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Wed, 14 Oct 2015 12:13:20 +0200 Subject: [PATCH] Makefile: Use blunt force to ensure uavcan submodule is up to date --- Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index a507be0826..2b9a34553f 100644 --- a/Makefile +++ b/Makefile @@ -104,13 +104,13 @@ endef # -------------------------------------------------------------------- # Do not put any spaces between function arguments. -px4fmu-v1_default: +px4fmu-v1_default: git-init $(call cmake-build,nuttx_px4fmu-v1_default) -px4fmu-v2_default: +px4fmu-v2_default: git-init $(call cmake-build,nuttx_px4fmu-v2_default) -px4fmu-v2_simple: +px4fmu-v2_simple: git-init $(call cmake-build,nuttx_px4fmu-v2_simple) nuttx_sim_simple: @@ -181,6 +181,11 @@ distclean: clean @git clean -d -f -x @cd ../../../.. +# XXX this is not the right way to fix it, but we need a temporary solution +# for average joe +git-init: + @git submodule update --init --recursive + # targets handled by cmake cmake_targets = test upload package package_source debug debug_tui debug_ddd debug_io debug_io_tui debug_io_ddd check_weak libuavcan $(foreach targ,$(cmake_targets),$(eval $(call cmake-targ,$(targ))))