aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2015-02-03 20:27:51 +0100
committerLorenz Meier <lm@inf.ethz.ch>2015-02-03 20:27:51 +0100
commit37ec1ec8defd67a76e476944123ed43006516dad (patch)
tree50b2efa847ea8a88382cc2a0bd95c929e5bc92de /Makefile
parentdc46736eadac43527f875b281cc1f50032d36066 (diff)
downloadpx4-firmware-37ec1ec8defd67a76e476944123ed43006516dad.tar.gz
px4-firmware-37ec1ec8defd67a76e476944123ed43006516dad.tar.bz2
px4-firmware-37ec1ec8defd67a76e476944123ed43006516dad.zip
Improve submodule checking
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 3 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index af93504ee..05e0d90a2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2012, 2013 PX4 Development Team. All rights reserved.
+# Copyright (c) 2012-2015 PX4 Development Team. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -161,7 +161,7 @@ $(foreach config,$(FMU_CONFIGS),$(eval $(call FMU_DEP,$(config))))
#
NUTTX_ARCHIVES = $(foreach board,$(BOARDS),$(ARCHIVE_DIR)$(board).export)
.PHONY: archives
-archives: $(NUTTX_ARCHIVES)
+archives: checksubmodules $(NUTTX_ARCHIVES)
# We cannot build these parallel; note that we also force -j1 for the
# sub-make invocations.
@@ -211,8 +211,7 @@ menuconfig:
@$(ECHO) ""
endif
-$(NUTTX_SRC):
- $(Q) ($(PX4_BASE)/Tools/check_submodules.sh)
+$(NUTTX_SRC): checksubmodules
$(UAVCAN_DIR):
$(Q) (./Tools/check_submodules.sh)