diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2017-12-31 16:48:15 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-31 16:48:15 +1100 |
| commit | b5c251a7d7a3801a009518365f3d0fd5043dbc5f (patch) | |
| tree | 3cfb780f55bd82da48b3d9484978ef0193a4a5bb | |
| parent | 2f00be53bc3c072946f4bf1ccffb32996f1fc4fa (diff) | |
| parent | 29c8f21f5f0dbc62ff79ece0c89cb939d6117185 (diff) | |
| download | lufa-b5c251a7d7a3801a009518365f3d0fd5043dbc5f.tar.gz lufa-b5c251a7d7a3801a009518365f3d0fd5043dbc5f.tar.bz2 lufa-b5c251a7d7a3801a009518365f3d0fd5043dbc5f.zip | |
Merge pull request #108 from NicoHood/include_guard
Added include guards for DMBS build modules (thanks to Nico Hood).
| -rw-r--r-- | LUFA/Build/LUFA/lufa-gcc.mk | 5 | ||||
| -rw-r--r-- | LUFA/Build/LUFA/lufa-sources.mk | 5 |
2 files changed, 10 insertions, 0 deletions
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 |