riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix cc110x vs cc110x_ng problems

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.dep
View File

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

9
drivers/Makefile
View File

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