From: NicoHood Date: Fri, 29 Dec 2017 22:09:14 +0000 (+0100) Subject: Added include guard for dmbs modules. Fix https://github.com/abcminiuser/dmbs/issues... X-Git-Tag: LUFA-210130~75^2 X-Git-Url: http://git.linex4red.de/pub/USBasp.git/commitdiff_plain/29c8f21f5f0dbc62ff79ece0c89cb939d6117185?hp=--cc Added include guard for dmbs modules. Fix https://github.com/abcminiuser/dmbs/issues/28 already included. --- 29c8f21f5f0dbc62ff79ece0c89cb939d6117185 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