From a78699113d584d4e73681e2a99aa7e30d0fb0a6c Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 13 Dec 2012 08:59:54 +1100
Subject: [PATCH] Plane: fixed Makefile for new AP_HAL build approach

---
 ArduPlane/Makefile | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/ArduPlane/Makefile b/ArduPlane/Makefile
index 22c6793506..1652fd8db7 100644
--- a/ArduPlane/Makefile
+++ b/ArduPlane/Makefile
@@ -10,19 +10,19 @@ hil:
 	make -f Makefile EXTRAFLAGS="-DHIL_MODE=HIL_MODE_ATTITUDE"
 
 hil-apm2:
-	make -f Makefile EXTRAFLAGS="-DHIL_MODE=HIL_MODE_ATTITUDE -DCONFIG_HAL_BOARD=HAL_BOARD_APM2"
+	make -f Makefile HAL_BOARD=HAL_BOARD_AVR_SITL EXTRAFLAGS="-DHIL_MODE=HIL_MODE_ATTITUDE"
 
 hil-apm2-nologging:
-	make -f Makefile EXTRAFLAGS="-DHIL_MODE=HIL_MODE_ATTITUDE -DCONFIG_HAL_BOARD=HAL_BOARD_APM2 -DLOGGING_ENABLED=DISABLED"
+	make -f Makefile HAL_BOARD=HAL_BOARD_APM2 EXTRAFLAGS="-DHIL_MODE=HIL_MODE_ATTITUDE -DLOGGING_ENABLED=DISABLED"
 
 hilsensors:
 	make -f Makefile EXTRAFLAGS="-DHIL_MODE=HIL_MODE_SENSORS"
 
 hilsensors-apm2:
-	make -f Makefile EXTRAFLAGS="-DHIL_MODE=HIL_MODE_SENSORS -DCONFIG_HAL_BOARD=HAL_BOARD_APM2"
+	make -f Makefile HAL_BOARD=HAL_BOARD_APM2 EXTRAFLAGS="-DHIL_MODE=HIL_MODE_SENSORS"
 
 hilsensors-apm2-nologging:
-	make -f Makefile EXTRAFLAGS="-DHIL_MODE=HIL_MODE_SENSORS -DCONFIG_HAL_BOARD=HAL_BOARD_APM2 -DLOGGING_ENABLED=DISABLED"
+	make -f Makefile HAL_BOARD=HAL_BOARD_APM2 EXTRAFLAGS="-DHIL_MODE=HIL_MODE_SENSORS -DLOGGING_ENABLED=DISABLED"
 
 hilnocli:
 	make -f Makefile EXTRAFLAGS="-DHIL_MODE=HIL_MODE_ATTITUDE -DCLI_ENABLED=DISABLED"
@@ -43,20 +43,20 @@ heli:
 	make -f Makefile EXTRAFLAGS="-DFRAME_CONFIG=HELI_FRAME"
 
 apm2:
-	make -f Makefile EXTRAFLAGS="-DCONFIG_HAL_BOARD=HAL_BOARD_APM2"
+	make -f Makefile HAL_BOARD=HAL_BOARD_APM2
 
 apm2-nologging:
-	make -f Makefile EXTRAFLAGS="-DCONFIG_HAL_BOARD=HAL_BOARD_APM2 -DLOGGING_ENABLED=DISABLED"
+	make -f Makefile HAL_BOARD=HAL_BOARD_APM2 EXTRAFLAGS="-DLOGGING_ENABLED=DISABLED"
 
 apm2-uart2:
-	make -f Makefile EXTRAFLAGS="-DCONFIG_HAL_BOARD=HAL_BOARD_APM2 -DTELEMETRY_UART2=ENABLED"
+	make -f Makefile HAL_BOARD=HAL_BOARD_APM2 EXTRAFLAGS="-DTELEMETRY_UART2=ENABLED"
 
 apm2beta:
-	make -f Makefile EXTRAFLAGS="-DCONFIG_HAL_BOARD=HAL_BOARD_APM2 -DAPM2_BETA_HARDWARE"
+	make -f Makefile HAL_BOARD=HAL_BOARD_APM2 EXTRAFLAGS="-DAPM2_BETA_HARDWARE"
 
 
 sitl:
-	make -f ../libraries/Desktop/Makefile.desktop
+	make -f Makefile HAL_BOARD=HAL_BOARD_AVR_SITL
 
 sitl-mount:
 	make -f ../libraries/Desktop/Makefile.desktop EXTRAFLAGS="-DMOUNT=ENABLED"
@@ -65,7 +65,7 @@ etags:
 	cd .. && etags -f ArduPlane/TAGS --langmap=C++:.pde.cpp.h $$(git ls-files ArduPlane libraries)
 
 obc:
-	make -f Makefile EXTRAFLAGS="-DCONFIG_HAL_BOARD=HAL_BOARD_APM2 -DOBC_FAILSAFE=ENABLED -DTELEMETRY_UART2=ENABLED -DSERIAL_BUFSIZE=512"
+	make -f Makefile HAL_BOARD=HAL_BOARD_APM2 EXTRAFLAGS="-DOBC_FAILSAFE=ENABLED -DTELEMETRY_UART2=ENABLED -DSERIAL_BUFSIZE=512"
 
 obc-sitl:
 	make -f ../libraries/Desktop/Makefile.desktop EXTRAFLAGS="-DOBC_FAILSAFE=ENABLED -DSERIAL_BUFSIZE=512"