aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorPavel Kirienko <pavel.kirienko@gmail.com>2014-07-08 19:51:19 +0400
committerPavel Kirienko <pavel.kirienko@gmail.com>2014-07-08 19:51:19 +0400
commit56649bd10a414a91237dd11142b33851b2a9015c (patch)
treeaab55ec53ce8013d8e482eba9a9d75c9cc476446 /Makefile
parent664795c9db9a0d938cbe7221aed87755ca8de7bf (diff)
parent0054eb23d857844ebae34a7d198fc60e538ccd3c (diff)
downloadpx4-firmware-56649bd10a414a91237dd11142b33851b2a9015c.tar.gz
px4-firmware-56649bd10a414a91237dd11142b33851b2a9015c.tar.bz2
px4-firmware-56649bd10a414a91237dd11142b33851b2a9015c.zip
Merge branch 'master' into uavcan
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile15
1 files changed, 11 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 0a8562251..8bf96ca23 100644
--- a/Makefile
+++ b/Makefile
@@ -104,7 +104,7 @@ DESIRED_FIRMWARES = $(foreach config,$(CONFIGS),$(IMAGE_DIR)$(config).px4)
STAGED_FIRMWARES = $(foreach config,$(KNOWN_CONFIGS),$(IMAGE_DIR)$(config).px4)
FIRMWARES = $(foreach config,$(KNOWN_CONFIGS),$(BUILD_DIR)$(config).build/firmware.px4)
-all: $(DESIRED_FIRMWARES)
+all: checksubmodules $(DESIRED_FIRMWARES)
#
# Copy FIRMWARES into the image directory.
@@ -210,9 +210,16 @@ menuconfig:
endif
$(NUTTX_SRC):
- @$(ECHO) ""
- @$(ECHO) "NuttX sources missing - clone https://github.com/PX4/NuttX.git and try again."
- @$(ECHO) ""
+ $(Q) (./Tools/check_submodules.sh)
+
+.PHONY: checksubmodules
+checksubmodules:
+ $(Q) (./Tools/check_submodules.sh)
+
+.PHONY: updatesubmodules
+updatesubmodules:
+ $(Q) (git submodule init)
+ $(Q) (git submodule update)
#
# Testing targets