1
0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-17 04:52:59 +01:00

Fix cc110x vs cc110x_ng problems

This commit is contained in:
René Kijewski 2014-02-15 12:48:11 +01:00
parent b9c9436e88
commit 4a12c91d95
2 changed files with 5 additions and 6 deletions

View File

@ -25,7 +25,7 @@ ifneq (,$(filter uart0,$(USEMODULE)))
endif
endif
ifneq (,$(filter cc110x,$(USEMODULE)))
ifneq (,$(filter cc110x%,$(USEMODULE)))
ifeq (,$(filter protocol_multiplex,$(USEMODULE)))
USEMODULE += protocol_multiplex
endif

View File

@ -14,11 +14,10 @@ ifneq (,$(filter ltc4150,$(USEMODULE)))
DIRS += ltc4150
endif
ifneq (,$(filter cc110x,$(USEMODULE)))
ifneq (,$(filter cc110x_ng,$(USEMODULE)))
DIRS += cc110x_ng
else
DIRS += cc110x
endif
DIRS += cc110x
endif
ifneq (,$(filter cc110x_ng,$(USEMODULE)))
DIRS += cc110x_ng
endif
ifneq (,$(filter at86rf231,$(USEMODULE)))
DIRS += at86rf231