aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorThomas Gubler <thomasgubler@gmail.com>2015-01-07 17:01:03 +0100
committerThomas Gubler <thomasgubler@gmail.com>2015-01-07 17:01:03 +0100
commit154111d4c011a9fd58812cb88fbbbbc38e30e08d (patch)
tree0574fab893c8139cd58b8e1e947b4a9086c22f5a /Makefile
parentfe279d340dccdd40ebfade4c53893e8f7a77b45e (diff)
downloadpx4-firmware-154111d4c011a9fd58812cb88fbbbbc38e30e08d.tar.gz
px4-firmware-154111d4c011a9fd58812cb88fbbbbc38e30e08d.tar.bz2
px4-firmware-154111d4c011a9fd58812cb88fbbbbc38e30e08d.zip
move checksubmodules and generateuorbtopicheaders dependency
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 2 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 2ba2073eb..6adbf765e 100644
--- a/Makefile
+++ b/Makefile
@@ -104,10 +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:
- $(Q) $(MAKE) checksubmodules
- $(Q) $(MAKE) generateuorbtopicheaders
- $(Q) $(MAKE) $(DESIRED_FIRMWARES)
+all: $(DESIRED_FIRMWARES)
#
# Copy FIRMWARES into the image directory.
@@ -127,7 +124,7 @@ $(STAGED_FIRMWARES): $(IMAGE_DIR)%.px4: $(BUILD_DIR)%.build/firmware.px4
.PHONY: $(FIRMWARES)
$(BUILD_DIR)%.build/firmware.px4: config = $(patsubst $(BUILD_DIR)%.build/firmware.px4,%,$@)
$(BUILD_DIR)%.build/firmware.px4: work_dir = $(BUILD_DIR)$(config).build/
-$(FIRMWARES): $(BUILD_DIR)%.build/firmware.px4:
+$(FIRMWARES): $(BUILD_DIR)%.build/firmware.px4: checksubmodules generateuorbtopicheaders
@$(ECHO) %%%%
@$(ECHO) %%%% Building $(config) in $(work_dir)
@$(ECHO) %%%%