Don't compile in ISP sources into the XPLAIN bridge project.

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

diff --git a/Projects/XPLAINBridge/makefile b/Projects/XPLAINBridge/makefile
index b40b212..9fa04b1 100644 (file)
--- a/Projects/XPLAINBridge/makefile
+++ b/Projects/XPLAINBridge/makefile
@@ -1,6 +1,6 @@
 #
 #             LUFA Library
 #
 #             LUFA Library

-#     Copyright (C) Dean Camera, 2016.
+#     Copyright (C) Dean Camera, 2017.

 #
 #  dean [at] fourwalledcubicle [dot] com
 #           www.lufa-lib.org
 #
 #  dean [at] fourwalledcubicle [dot] com
 #           www.lufa-lib.org


@@ -21,9 +21,10 @@ F_USB        = $(F_CPU)
 OPTIMIZATION = s
 TARGET       = XPLAINBridge
 SRC          = $(TARGET).c Lib/SoftUART.c USARTDescriptors.c $(AVRISP_PATH)/AVRISPDescriptors.c $(AVRISP_PATH)/Lib/V2Protocol.c \
 OPTIMIZATION = s
 TARGET       = XPLAINBridge
 SRC          = $(TARGET).c Lib/SoftUART.c USARTDescriptors.c $(AVRISP_PATH)/AVRISPDescriptors.c $(AVRISP_PATH)/Lib/V2Protocol.c \

-               $(AVRISP_PATH)/Lib/V2ProtocolParams.c $(AVRISP_PATH)/Lib/ISP/ISPProtocol.c $(AVRISP_PATH)/Lib/ISP/ISPTarget.c \
-               $(AVRISP_PATH)/Lib/XPROG/XPROGProtocol.c $(AVRISP_PATH)/Lib/XPROG/XPROGTarget.c $(AVRISP_PATH)/Lib/XPROG/XMEGANVM.c \
-               $(AVRISP_PATH)/Lib/XPROG/TINYNVM.c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS)
+               $(AVRISP_PATH)/Lib/V2ProtocolParams.c \
+               $(AVRISP_PATH)/Lib/XPROG/XPROGProtocol.c $(AVRISP_PATH)/Lib/XPROG/XPROGTarget.c \
+               $(AVRISP_PATH)/Lib/XPROG/XMEGANVM.c $(AVRISP_PATH)/Lib/XPROG/TINYNVM.c \
+               $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS)

 LUFA_PATH    = ../../LUFA
 CC_FLAGS     = -DUSE_LUFA_CONFIG_HEADER -IConfig/ -I$(AVRISP_PATH)
 LD_FLAGS     =
 LUFA_PATH    = ../../LUFA
 CC_FLAGS     = -DUSE_LUFA_CONFIG_HEADER -IConfig/ -I$(AVRISP_PATH)
 LD_FLAGS     =


@@ -31,13 +32,11 @@ LD_FLAGS     =
 # Default target
 all:
 
 # 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
 # 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
+# path relative to the current folder.
+OBJDIR      := ./obj

 
 # Include LUFA-specific DMBS extension modules
 DMBS_LUFA_PATH ?= $(LUFA_PATH)/Build/LUFA
 
 # Include LUFA-specific DMBS extension modules
 DMBS_LUFA_PATH ?= $(LUFA_PATH)/Build/LUFA