From def392aca09dd0d5a29c1c390accb44ff76db280 Mon Sep 17 00:00:00 2001
From: Dean Camera <dean@fourwalledcubicle.com>
Date: Sun, 17 Jul 2016 17:30:55 +1000
Subject: Update to latest DMBS, fix XPLAINBridge project compilation errors on
 full tree build.

---
 LUFA/Build/DMBS/DMBS/core.mk   | 2 +-
 LUFA/Build/DMBS/DMBS/gcc.mk    | 2 +-
 Projects/XPLAINBridge/makefile | 8 +++-----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/LUFA/Build/DMBS/DMBS/core.mk b/LUFA/Build/DMBS/DMBS/core.mk
index 7fdb7f229..1c55569e5 100644
--- a/LUFA/Build/DMBS/DMBS/core.mk
+++ b/LUFA/Build/DMBS/DMBS/core.mk
@@ -16,7 +16,7 @@ DMBS_BUILD_PROVIDED_MACROS += DMBS_CHECK_VERSION ERROR_IF_UNSET ERROR_IF_EMPTY E
 SHELL = /bin/sh
 
 # Current DMBS release version
-DMBS_VERSION       := 20160403
+DMBS_VERSION       := 20160717
 
 # Macro to check the DMBS version, aborts if the given DMBS version is below the current version
 DMBS_CHECK_VERSION ?= $(if $(filter-out 0, $(shell test $(DMBS_VERSION) -lt $(1); echo $$?)), , $(error DMBS version $(1) or newer required, current version is $(DMBS_VERSION)))
diff --git a/LUFA/Build/DMBS/DMBS/gcc.mk b/LUFA/Build/DMBS/DMBS/gcc.mk
index e33c9c084..3affa6346 100644
--- a/LUFA/Build/DMBS/DMBS/gcc.mk
+++ b/LUFA/Build/DMBS/DMBS/gcc.mk
@@ -96,7 +96,7 @@ ifneq ($(OBJDIR),.)
    endif
 
    # Create the output object file directory if it does not exist and add it to the virtual path list
-   $(shell mkdir $(OBJDIR) 2> /dev/null)
+   $(shell mkdir -p $(OBJDIR) 2> /dev/null)
    VPATH           += $(dir $(SRC))
 endif
 
diff --git a/Projects/XPLAINBridge/makefile b/Projects/XPLAINBridge/makefile
index b40b212ba..e23b54d37 100644
--- a/Projects/XPLAINBridge/makefile
+++ b/Projects/XPLAINBridge/makefile
@@ -31,13 +31,11 @@ LD_FLAGS     =
 # Default target
 all:
 
-OBJDIR      := obj
-
 # Since this project borrows files from the AVRISP-MKII project which may also have an
 # identical OBJDIR directory, we need to enforce the use of this project's object file
-# directory as the one where the build object files are to be stored by pre-pending the
-# absolute path of the current project to the OBJDIR variable.
-override OBJDIR:=$(shell pwd)/$(OBJDIR)
+# directory as the one where the build object files are to be stored, by giving it a
+# project-specific name.
+OBJDIR      := obj.$(TARGET)
 
 # Include LUFA-specific DMBS extension modules
 DMBS_LUFA_PATH ?= $(LUFA_PATH)/Build/LUFA
-- 
cgit v1.2.3