From 475496cee2c5f54c94b2d7fdedb1e9846ebe8715 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 18 Dec 2012 13:40:25 +1100 Subject: [PATCH] Revert "Arduino.mk: use target variables rather than recursive make for apm1, apm2.." This reverts commit fcd58cc1d7892bb8b45db75c35e1bdccaa2d47bb. still doesn't work ... --- libraries/AP_Common/Arduino.mk | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/libraries/AP_Common/Arduino.mk b/libraries/AP_Common/Arduino.mk index af8cc6b97f..1b4100af0f 100644 --- a/libraries/AP_Common/Arduino.mk +++ b/libraries/AP_Common/Arduino.mk @@ -457,17 +457,14 @@ endif all: $(SKETCHELF) $(SKETCHEEP) $(SKETCHHEX) # convenient targets for our supported boards -sitl: HAL_BOARD = "HAL_BOARD_AVR_SITL" -sitl: all +sitl: + make -f Makefile HAL_BOARD=HAL_BOARD_AVR_SITL -apm1: HAL_BOARD = "HAL_BOARD_APM1" -apm1: all +apm1: + make -f Makefile HAL_BOARD=HAL_BOARD_APM1 -apm2: HAL_BOARD = "HAL_BOARD_APM2" -apm2: all - -emptyhal: HAL_BOARD = "HAL_BOARD_EMPTY" -emptyhal: all +apm2: + make -f Makefile HAL_BOARD=HAL_BOARD_APM2 .PHONY: upload upload: $(SKETCHHEX)