From: Dean Camera <dean@fourwalledcubicle.com>
Date: Sun, 31 Dec 2017 05:48:15 +0000 (+1100)
Subject: Merge pull request #108 from NicoHood/include_guard
X-Git-Tag: LUFA-210130~75
X-Git-Url: http://git.linex4red.de/pub/USBasp.git/commitdiff_plain/b5c251a7d7a3801a009518365f3d0fd5043dbc5f?hp=2f00be53bc3c072946f4bf1ccffb32996f1fc4fa

Merge pull request #108 from NicoHood/include_guard

Added include guards for DMBS build modules (thanks to Nico Hood).
---

diff --git a/LUFA/Build/LUFA/lufa-gcc.mk b/LUFA/Build/LUFA/lufa-gcc.mk
index f824362e4..0d51ca2b6 100644
--- a/LUFA/Build/LUFA/lufa-gcc.mk
+++ b/LUFA/Build/LUFA/lufa-gcc.mk
@@ -6,6 +6,9 @@
 #           www.lufa-lib.org
 #
 
+# Include Guard
+ifeq ($(filter LUFA_GCC, $(DMBS_BUILD_MODULES)),)
+
 DMBS_BUILD_MODULES         += LUFA_GCC
 DMBS_BUILD_TARGETS         +=
 DMBS_BUILD_MANDATORY_VARS  += LUFA_PATH ARCH F_USB
@@ -41,3 +44,5 @@ LUFA_CXX_DEFINES  = -DARCH=ARCH_$(ARCH) -DBOARD=BOARD_$(BOARD) -DF_USB=$(F_USB)U
 # LUFA specific standard build options
 C_FLAGS   += $(LUFA_CXX_INCLUDES) $(LUFA_CXX_DEFINES) $(LUFA_CXX_FLAGS)
 CPP_FLAGS += $(LUFA_CXX_INCLUDES) $(LUFA_CXX_DEFINES) $(LUFA_CXX_FLAGS)
+
+endif
diff --git a/LUFA/Build/LUFA/lufa-sources.mk b/LUFA/Build/LUFA/lufa-sources.mk
index 7ca9a28dc..b18be5388 100644
--- a/LUFA/Build/LUFA/lufa-sources.mk
+++ b/LUFA/Build/LUFA/lufa-sources.mk
@@ -6,6 +6,9 @@
 #           www.lufa-lib.org
 #
 
+# Include Guard
+ifeq ($(filter LUFA_SOURCES, $(DMBS_BUILD_MODULES)),)
+
 DMBS_BUILD_MODULES         += LUFA_SOURCES
 DMBS_BUILD_TARGETS         +=
 DMBS_BUILD_MANDATORY_VARS  += LUFA_PATH ARCH
@@ -93,3 +96,5 @@ LUFA_SRC_ALL_FILES   := $(LUFA_SRC_USB)            \
                         $(LUFA_SRC_SERIAL)         \
                         $(LUFA_SRC_TWI)            \
                         $(LUFA_SRC_PLATFORM)
+
+endif