From 22eeb9b4e9262e6c1db6404deeb0327a02817de8 Mon Sep 17 00:00:00 2001
From: Dean Camera <dean@fourwalledcubicle.com>
Date: Tue, 10 Jul 2012 21:13:09 +0000
Subject: [PATCH] Override the OBJDIR setting for the XPLAINBridge project, as
 this currently doesn't work. Turn off check-config test in the
 StaticAnalysisTest build test to save time - if the standard build fails this
 can be run manually to determine the problem cause.

---
 BuildTests/StaticAnalysisTest/makefile | 2 +-
 Demos/DualRole/makefile                | 2 +-
 Projects/XPLAINBridge/makefile         | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/BuildTests/StaticAnalysisTest/makefile b/BuildTests/StaticAnalysisTest/makefile
index a2626ec29c..b1ea232b2a 100644
--- a/BuildTests/StaticAnalysisTest/makefile
+++ b/BuildTests/StaticAnalysisTest/makefile
@@ -19,7 +19,7 @@ CPPCHECK_INCLUDES := $(patsubst %/,%,$(LUFA_PATH))/CodeTemplates/
 
 SRC               := $(patsubst %/,%,$(LUFA_PATH))/..
 
-all: begin cppcheck-config cppcheck end
+all: begin cppcheck end
 
 begin:
 	@echo Executing build test "StaticAnalysisTest".
diff --git a/Demos/DualRole/makefile b/Demos/DualRole/makefile
index dbfe9995c8..aaca62575b 100644
--- a/Demos/DualRole/makefile
+++ b/Demos/DualRole/makefile
@@ -16,5 +16,5 @@
 all:
 
 %:
-	$(MAKE) -C ClassDriver/ $@
+	$(MAKE) -C ClassDriver $@
 
diff --git a/Projects/XPLAINBridge/makefile b/Projects/XPLAINBridge/makefile
index 304649849b..8edd9c71a3 100644
--- a/Projects/XPLAINBridge/makefile
+++ b/Projects/XPLAINBridge/makefile
@@ -11,6 +11,9 @@
 
 AVRISP_PATH  = ../AVRISP-MKII/
 
+# FIXME - object directories do not currently work for this project
+override OBJDIR =
+
 MCU          = at90usb1287
 ARCH         = AVR8
 BOARD        = XPLAIN