aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2012-07-10 21:13:09 +0000
committerDean Camera <dean@fourwalledcubicle.com>2012-07-10 21:13:09 +0000
commit22eeb9b4e9262e6c1db6404deeb0327a02817de8 (patch)
treee05955ee703164be66bc78e412b253d63171a3db
parent0da99447d3e88e83f9977501bee56af5c7aa56c0 (diff)
downloadlufa-22eeb9b4e9262e6c1db6404deeb0327a02817de8.tar.gz
lufa-22eeb9b4e9262e6c1db6404deeb0327a02817de8.tar.bz2
lufa-22eeb9b4e9262e6c1db6404deeb0327a02817de8.zip
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.
-rw-r--r--BuildTests/StaticAnalysisTest/makefile2
-rw-r--r--Demos/DualRole/makefile2
-rw-r--r--Projects/XPLAINBridge/makefile3
3 files changed, 5 insertions, 2 deletions
diff --git a/BuildTests/StaticAnalysisTest/makefile b/BuildTests/StaticAnalysisTest/makefile
index a2626ec29..b1ea232b2 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 dbfe9995c..aaca62575 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 304649849..8edd9c71a 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