Don't run user application in the bootloader unless a valid app is present (thanks...

[pub/USBasp.git] / Projects / XPLAINBridge / makefile

diff --git a/Projects/XPLAINBridge/makefile b/Projects/XPLAINBridge/makefile
index f51ada5..68e0a70 100644 (file)
--- a/Projects/XPLAINBridge/makefile
+++ b/Projects/XPLAINBridge/makefile
@@ -1,6 +1,6 @@
 #
 #             LUFA Library
-#     Copyright (C) Dean Camera, 2012.
+#     Copyright (C) Dean Camera, 2014.
 #
 #  dean [at] fourwalledcubicle [dot] com
 #           www.lufa-lib.org
@@ -9,6 +9,8 @@
 #         LUFA Project Makefile.
 # --------------------------------------
 
+# Run "make help" for target help.
+
 AVRISP_PATH  = ../AVRISP-MKII
 
 MCU          = at90usb1287
@@ -29,6 +31,14 @@ LD_FLAGS     =
 # Default target
 all:
 
+# 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.
+ifneq ($(OBJDIR),)
+  override OBJDIR:=$(shell pwd)/$(OBJDIR)
+endif
+
 # Include LUFA build script makefiles
 include $(LUFA_PATH)/Build/lufa_core.mk
 include $(LUFA_PATH)/Build/lufa_sources.mk