Added include guard for dmbs modules. Fix https://github.com/abcminiuser/dmbs/issues...

diff --git a/LUFA/Build/LUFA/lufa-gcc.mk b/LUFA/Build/LUFA/lufa-gcc.mk
index f824362..0d51ca2 100644 (file)
--- a/LUFA/Build/LUFA/lufa-gcc.mk
+++ b/LUFA/Build/LUFA/lufa-gcc.mk
@@ -6,6 +6,9 @@
 #           www.lufa-lib.org
 #
 
 #           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
 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)
 # 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 7ca9a28..b18be53 100644 (file)
--- a/LUFA/Build/LUFA/lufa-sources.mk
+++ b/LUFA/Build/LUFA/lufa-sources.mk
@@ -6,6 +6,9 @@
 #           www.lufa-lib.org
 #
 
 #           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
 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)
                         $(LUFA_SRC_SERIAL)         \
                         $(LUFA_SRC_TWI)            \
                         $(LUFA_SRC_PLATFORM)

+
+endif