From 4a12c91d957c466504cbb44102031531353fbfa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Kijewski?= <rene.kijewski@fu-berlin.de>
Date: Sat, 15 Feb 2014 12:48:11 +0100
Subject: [PATCH] Fix cc110x vs cc110x_ng problems
---
Makefile.dep | 2 +-
drivers/Makefile | 9 ++++-----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/Makefile.dep b/Makefile.dep
index e79b1b33c7..c1e1ba5787 100644
--- a/Makefile.dep
+++ b/Makefile.dep
@@ -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
diff --git a/drivers/Makefile b/drivers/Makefile
index 15514ab56f..e5fe1f7e9f 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -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
--
GitLab