From d86509db660e6e4a47064ba8c28fa29e1e39d88f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Kijewski?= <rene.kijewski@fu-berlin.de>
Date: Fri, 14 Feb 2014 00:30:34 +0100
Subject: [PATCH] Use `filter` instead of `findstring`
See #672
---
Makefile.dep | 70 ++++++++++++++++++++++++++--------------------------
sys/Makefile | 64 +++++++++++++++++++++++------------------------
2 files changed, 67 insertions(+), 67 deletions(-)
diff --git a/Makefile.dep b/Makefile.dep
index 682d8108f5..e79b1b33c7 100644
--- a/Makefile.dep
+++ b/Makefile.dep
@@ -1,104 +1,104 @@
-ifneq (,$(findstring pnet, $(USEMODULE)))
- ifeq (,$(findstring posix, $(USEMODULE)))
+ifneq (,$(filter pnet,$(USEMODULE)))
+ ifeq (,$(filter posix,$(USEMODULE)))
USEMODULE += posix
endif
- ifeq (,$(findstring destiny, $(USEMODULE)))
+ ifeq (,$(filter destiny,$(USEMODULE)))
USEMODULE += destiny
endif
- ifeq (,$(findstring net_help, $(USEMODULE)))
+ ifeq (,$(filter net_help,$(USEMODULE)))
USEMODULE += net_help
endif
endif
-ifneq (,$(findstring posix, $(USEMODULE)))
- ifeq (,$(findstring uart0, $(USEMODULE)))
+ifneq (,$(filter posix,$(USEMODULE)))
+ ifeq (,$(filter uart0,$(USEMODULE)))
USEMODULE += uart0
endif
endif
-ifneq (,$(findstring uart0,$(USEMODULE)))
- ifeq (,$(findstring lib,$(USEMODULE)))
+ifneq (,$(filter uart0,$(USEMODULE)))
+ ifeq (,$(filter lib,$(USEMODULE)))
USEMODULE += lib
endif
- ifeq (,$(findstring posix,$(USEMODULE)))
+ ifeq (,$(filter posix,$(USEMODULE)))
USEMODULE += posix
endif
endif
-ifneq (,$(findstring cc110x,$(USEMODULE)))
- ifeq (,$(findstring protocol_multiplex,$(USEMODULE)))
+ifneq (,$(filter cc110x,$(USEMODULE)))
+ ifeq (,$(filter protocol_multiplex,$(USEMODULE)))
USEMODULE += protocol_multiplex
endif
- ifeq (,$(findstring vtimer, $(USEMODULE)))
+ ifeq (,$(filter vtimer,$(USEMODULE)))
USEMODULE += vtimer
endif
endif
-ifneq (,$(findstring cc110x_ng,$(USEMODULE)))
- ifeq (,$(findstring transceiver,$(USEMODULE)))
+ifneq (,$(filter cc110x_ng,$(USEMODULE)))
+ ifeq (,$(filter transceiver,$(USEMODULE)))
USEMODULE += transceiver
endif
- ifeq (,$(findstring hwtimer,$(USEMODULE)))
+ ifeq (,$(filter hwtimer,$(USEMODULE)))
USEMODULE += hwtimer
endif
endif
-ifneq (,$(findstring cc2420,$(USEMODULE)))
- ifeq (,$(findstring transceiver,$(USEMODULE)))
+ifneq (,$(filter cc2420,$(USEMODULE)))
+ ifeq (,$(filter transceiver,$(USEMODULE)))
USEMODULE += transceiver
endif
- ifeq (,$(findstring ieee802154,$(USEMODULE)))
+ ifeq (,$(filter ieee802154,$(USEMODULE)))
USEMODULE += ieee802154
endif
endif
-ifneq (,$(findstring at86rf231,$(USEMODULE)))
- ifeq (,$(findstring transceiver,$(USEMODULE)))
+ifneq (,$(filter at86rf231,$(USEMODULE)))
+ ifeq (,$(filter transceiver,$(USEMODULE)))
USEMODULE += transceiver
endif
- ifeq (,$(findstring ieee802154,$(USEMODULE)))
+ ifeq (,$(filter ieee802154,$(USEMODULE)))
USEMODULE += ieee802154
endif
- ifeq (,$(findstring vtimer, $(USEMODULE)))
+ ifeq (,$(filter vtimer,$(USEMODULE)))
USEMODULE += vtimer
endif
endif
-ifneq (,$(findstring destiny,$(USEMODULE)))
- ifeq (,$(findstring sixlowpan,$(USEMODULE)))
+ifneq (,$(filter destiny,$(USEMODULE)))
+ ifeq (,$(filter sixlowpan,$(USEMODULE)))
USEMODULE += sixlowpan
endif
- ifeq (,$(findstring net_help,$(USEMODULE)))
+ ifeq (,$(filter net_help,$(USEMODULE)))
USEMODULE += net_help
endif
- ifeq (,$(findstring vtimer, $(USEMODULE)))
+ ifeq (,$(filter vtimer,$(USEMODULE)))
USEMODULE += vtimer
endif
endif
-ifneq (,$(findstring sixlowpan,$(USEMODULE)))
- ifeq (,$(findstring ieee802154,$(USEMODULE)))
+ifneq (,$(filter sixlowpan,$(USEMODULE)))
+ ifeq (,$(filter ieee802154,$(USEMODULE)))
USEMODULE += ieee802154
endif
- ifeq (,$(findstring net_help,$(USEMODULE)))
+ ifeq (,$(filter net_help,$(USEMODULE)))
USEMODULE += net_help
endif
- ifeq (,$(findstring semaphore, $(USEMODULE)))
+ ifeq (,$(filter semaphore,$(USEMODULE)))
USEMODULE += semaphore
endif
- ifeq (,$(findstring transceiver, $(USEMODULE)))
+ ifeq (,$(filter transceiver,$(USEMODULE)))
USEMODULE += transceiver
endif
- ifeq (,$(findstring vtimer, $(USEMODULE)))
+ ifeq (,$(filter vtimer,$(USEMODULE)))
USEMODULE += vtimer
endif
endif
-ifneq (,$(findstring vtimer,$(USEMODULE)))
- ifeq (,$(findstring hwtimer,$(USEMODULE)))
+ifneq (,$(filter vtimer,$(USEMODULE)))
+ ifeq (,$(filter hwtimer,$(USEMODULE)))
USEMODULE += hwtimer
endif
- ifeq (,$(findstring timex,$(USEMODULE)))
+ ifeq (,$(filter timex,$(USEMODULE)))
USEMODULE += timex
endif
endif
diff --git a/sys/Makefile b/sys/Makefile
index f87aff2e08..81b1d444c0 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -1,96 +1,96 @@
-MODULE =sys
-ifneq (,$(findstring auto_init,$(USEMODULE)))
+MODULE = sys
+ifneq (,$(filter auto_init,$(USEMODULE)))
DIRS += auto_init
endif
-ifneq (,$(findstring config,$(USEMODULE)))
+ifneq (,$(filter config,$(USEMODULE)))
DIRS += config
endif
-ifneq (,$(findstring lib,$(USEMODULE)))
+ifneq (,$(filter lib,$(USEMODULE)))
DIRS += lib
endif
-ifneq (,$(findstring ping,$(USEMODULE)))
+ifneq (,$(filter ping,$(USEMODULE)))
DIRS += ping
endif
-ifneq (,$(findstring ps,$(USEMODULE)))
+ifneq (,$(filter ps,$(USEMODULE)))
DIRS += ps
endif
-ifneq (,$(findstring posix,$(USEMODULE)))
+ifneq (,$(filter posix,$(USEMODULE)))
INCLUDES += -I$(RIOTBASE)/sys/posix/include
DIRS += posix
endif
-ifneq (,$(findstring pnet,$(USEMODULE)))
+ifneq (,$(filter pnet,$(USEMODULE)))
DIRS += posix/pnet
endif
-ifneq (,$(findstring shell,$(USEMODULE)))
+ifneq (,$(filter shell,$(USEMODULE)))
DIRS += shell
endif
-ifneq (,$(findstring shell_commands,$(USEMODULE)))
+ifneq (,$(filter shell_commands,$(USEMODULE)))
DIRS += shell/commands
endif
-ifneq (,$(findstring timex,$(USEMODULE)))
+ifneq (,$(filter timex,$(USEMODULE)))
DIRS += timex
endif
-ifneq (,$(findstring transceiver,$(USEMODULE)))
+ifneq (,$(filter transceiver,$(USEMODULE)))
DIRS += transceiver
endif
-ifneq (,$(findstring uart0,$(USEMODULE)))
+ifneq (,$(filter uart0,$(USEMODULE)))
DIRS += uart0
endif
-ifneq (,$(findstring vtimer,$(USEMODULE)))
+ifneq (,$(filter vtimer,$(USEMODULE)))
DIRS += vtimer
endif
-ifneq (,$(findstring destiny,$(USEMODULE)))
+ifneq (,$(filter destiny,$(USEMODULE)))
DIRS += net/transport_layer/destiny
endif
-ifneq (,$(findstring net_help,$(USEMODULE)))
+ifneq (,$(filter net_help,$(USEMODULE)))
DIRS += net/crosslayer/net_help
endif
-ifneq (,$(findstring protocol_multiplex,$(USEMODULE)))
+ifneq (,$(filter protocol_multiplex,$(USEMODULE)))
DIRS += net/link_layer/protocol-multiplex
endif
-ifneq (,$(findstring sixlowpan,$(USEMODULE)))
+ifneq (,$(filter sixlowpan,$(USEMODULE)))
DIRS += net/network_layer/sixlowpan
endif
-ifneq (,$(findstring rpl,$(USEMODULE)))
+ifneq (,$(filter rpl,$(USEMODULE)))
DIRS += net/routing/rpl
endif
-ifneq (,$(findstring ieee802154,$(USEMODULE)))
+ifneq (,$(filter ieee802154,$(USEMODULE)))
DIRS += net/link_layer/ieee802154
endif
-ifneq (,$(findstring bloom,$(USEMODULE)))
+ifneq (,$(filter bloom,$(USEMODULE)))
DIRS += bloom
endif
-ifneq (,$(findstring crypto_3des,$(USEMODULE)))
+ifneq (,$(filter crypto_3des,$(USEMODULE)))
DIRS += crypto/3des
endif
-ifneq (,$(findstring crypto_aes,$(USEMODULE)))
+ifneq (,$(filter crypto_aes,$(USEMODULE)))
DIRS += crypto/aes
endif
-ifneq (,$(findstring crypto_rc5,$(USEMODULE)))
+ifneq (,$(filter crypto_rc5,$(USEMODULE)))
DIRS += crypto/rc5
endif
-ifneq (,$(findstring crypto_sha256,$(USEMODULE)))
+ifneq (,$(filter crypto_sha256,$(USEMODULE)))
DIRS += crypto/sha256
endif
-ifneq (,$(findstring crypto_skipjack,$(USEMODULE)))
+ifneq (,$(filter crypto_skipjack,$(USEMODULE)))
DIRS += crypto/skipjack
endif
-ifneq (,$(findstring crypto_twofish,$(USEMODULE)))
+ifneq (,$(filter crypto_twofish,$(USEMODULE)))
DIRS += crypto/twofish
endif
-ifneq (,$(findstring random,$(USEMODULE)))
+ifneq (,$(filter random,$(USEMODULE)))
DIRS += random
endif
-ifneq (,$(findstring hashes,$(USEMODULE)))
+ifneq (,$(filter hashes,$(USEMODULE)))
DIRS += hashes
endif
-ifneq (,$(findstring semaphore,$(USEMODULE)))
+ifneq (,$(filter semaphore,$(USEMODULE)))
DIRS += semaphore
endif
-ifneq (,$(findstring ccn_lite,$(USEMODULE)))
+ifneq (,$(filter ccn_lite,$(USEMODULE)))
DIRS += net/ccn_lite
endif
-ifneq (,$(findstring ccn_lite_client,$(USEMODULE)))
+ifneq (,$(filter ccn_lite_client,$(USEMODULE)))
DIRS += net/ccn_lite/util
endif
--
GitLab