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

Use filter instead of findstring

Browse Source 
See #672
This commit is contained in:
René Kijewski 2014-02-14 00:30:34 +01:00
parent 4a3d2d6b6d
commit d86509db66
2 changed files with 67 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
Makefile.dep
View File

@ -1,104 +1,104 @@
ifneq (,$(findstring pnet, $(USEMODULE))) ifneq (,$(filter pnet,$(USEMODULE)))
ifeq (,$(findstring posix, $(USEMODULE))) ifeq (,$(filter posix,$(USEMODULE)))
USEMODULE += posix USEMODULE += posix
endif endif
ifeq (,$(findstring destiny, $(USEMODULE))) ifeq (,$(filter destiny,$(USEMODULE)))
USEMODULE += destiny USEMODULE += destiny
endif endif
ifeq (,$(findstring net_help, $(USEMODULE))) ifeq (,$(filter net_help,$(USEMODULE)))
USEMODULE += net_help USEMODULE += net_help
endif endif
endif endif
ifneq (,$(findstring posix, $(USEMODULE))) ifneq (,$(filter posix,$(USEMODULE)))
ifeq (,$(findstring uart0, $(USEMODULE))) ifeq (,$(filter uart0,$(USEMODULE)))
USEMODULE += uart0 USEMODULE += uart0
endif endif
endif endif
ifneq (,$(findstring uart0,$(USEMODULE))) ifneq (,$(filter uart0,$(USEMODULE)))
ifeq (,$(findstring lib,$(USEMODULE))) ifeq (,$(filter lib,$(USEMODULE)))
USEMODULE += lib USEMODULE += lib
endif endif
ifeq (,$(findstring posix,$(USEMODULE))) ifeq (,$(filter posix,$(USEMODULE)))
USEMODULE += posix USEMODULE += posix
endif endif
endif endif
ifneq (,$(findstring cc110x,$(USEMODULE))) ifneq (,$(filter cc110x,$(USEMODULE)))
ifeq (,$(findstring protocol_multiplex,$(USEMODULE))) ifeq (,$(filter protocol_multiplex,$(USEMODULE)))
USEMODULE += protocol_multiplex USEMODULE += protocol_multiplex
endif endif
ifeq (,$(findstring vtimer, $(USEMODULE))) ifeq (,$(filter vtimer,$(USEMODULE)))
USEMODULE += vtimer USEMODULE += vtimer
endif endif
endif endif
ifneq (,$(findstring cc110x_ng,$(USEMODULE))) ifneq (,$(filter cc110x_ng,$(USEMODULE)))
ifeq (,$(findstring transceiver,$(USEMODULE))) ifeq (,$(filter transceiver,$(USEMODULE)))
USEMODULE += transceiver USEMODULE += transceiver
endif endif
ifeq (,$(findstring hwtimer,$(USEMODULE))) ifeq (,$(filter hwtimer,$(USEMODULE)))
USEMODULE += hwtimer USEMODULE += hwtimer
endif endif
endif endif
ifneq (,$(findstring cc2420,$(USEMODULE))) ifneq (,$(filter cc2420,$(USEMODULE)))
ifeq (,$(findstring transceiver,$(USEMODULE))) ifeq (,$(filter transceiver,$(USEMODULE)))
USEMODULE += transceiver USEMODULE += transceiver
endif endif
ifeq (,$(findstring ieee802154,$(USEMODULE))) ifeq (,$(filter ieee802154,$(USEMODULE)))
USEMODULE += ieee802154 USEMODULE += ieee802154
endif endif
endif endif
ifneq (,$(findstring at86rf231,$(USEMODULE))) ifneq (,$(filter at86rf231,$(USEMODULE)))
ifeq (,$(findstring transceiver,$(USEMODULE))) ifeq (,$(filter transceiver,$(USEMODULE)))
USEMODULE += transceiver USEMODULE += transceiver
endif endif
ifeq (,$(findstring ieee802154,$(USEMODULE))) ifeq (,$(filter ieee802154,$(USEMODULE)))
USEMODULE += ieee802154 USEMODULE += ieee802154
endif endif
ifeq (,$(findstring vtimer, $(USEMODULE))) ifeq (,$(filter vtimer,$(USEMODULE)))
USEMODULE += vtimer USEMODULE += vtimer
endif endif
endif endif
ifneq (,$(findstring destiny,$(USEMODULE))) ifneq (,$(filter destiny,$(USEMODULE)))
ifeq (,$(findstring sixlowpan,$(USEMODULE))) ifeq (,$(filter sixlowpan,$(USEMODULE)))
USEMODULE += sixlowpan USEMODULE += sixlowpan
endif endif
ifeq (,$(findstring net_help,$(USEMODULE))) ifeq (,$(filter net_help,$(USEMODULE)))
USEMODULE += net_help USEMODULE += net_help
endif endif
ifeq (,$(findstring vtimer, $(USEMODULE))) ifeq (,$(filter vtimer,$(USEMODULE)))
USEMODULE += vtimer USEMODULE += vtimer
endif endif
endif endif
ifneq (,$(findstring sixlowpan,$(USEMODULE))) ifneq (,$(filter sixlowpan,$(USEMODULE)))
ifeq (,$(findstring ieee802154,$(USEMODULE))) ifeq (,$(filter ieee802154,$(USEMODULE)))
USEMODULE += ieee802154 USEMODULE += ieee802154
endif endif
ifeq (,$(findstring net_help,$(USEMODULE))) ifeq (,$(filter net_help,$(USEMODULE)))
USEMODULE += net_help USEMODULE += net_help
endif endif
ifeq (,$(findstring semaphore, $(USEMODULE))) ifeq (,$(filter semaphore,$(USEMODULE)))
USEMODULE += semaphore USEMODULE += semaphore
endif endif
ifeq (,$(findstring transceiver, $(USEMODULE))) ifeq (,$(filter transceiver,$(USEMODULE)))
USEMODULE += transceiver USEMODULE += transceiver
endif endif
ifeq (,$(findstring vtimer, $(USEMODULE))) ifeq (,$(filter vtimer,$(USEMODULE)))
USEMODULE += vtimer USEMODULE += vtimer
endif endif
endif endif
ifneq (,$(findstring vtimer,$(USEMODULE))) ifneq (,$(filter vtimer,$(USEMODULE)))
ifeq (,$(findstring hwtimer,$(USEMODULE))) ifeq (,$(filter hwtimer,$(USEMODULE)))
USEMODULE += hwtimer USEMODULE += hwtimer
endif endif
ifeq (,$(findstring timex,$(USEMODULE))) ifeq (,$(filter timex,$(USEMODULE)))
USEMODULE += timex USEMODULE += timex
endif endif
endif endif

64
sys/Makefile
View File

@ -1,96 +1,96 @@
MODULE =sys MODULE = sys
ifneq (,$(findstring auto_init,$(USEMODULE))) ifneq (,$(filter auto_init,$(USEMODULE)))
DIRS += auto_init DIRS += auto_init
endif endif
ifneq (,$(findstring config,$(USEMODULE))) ifneq (,$(filter config,$(USEMODULE)))
DIRS += config DIRS += config
endif endif
ifneq (,$(findstring lib,$(USEMODULE))) ifneq (,$(filter lib,$(USEMODULE)))
DIRS += lib DIRS += lib
endif endif
ifneq (,$(findstring ping,$(USEMODULE))) ifneq (,$(filter ping,$(USEMODULE)))
DIRS += ping DIRS += ping
endif endif
ifneq (,$(findstring ps,$(USEMODULE))) ifneq (,$(filter ps,$(USEMODULE)))
DIRS += ps DIRS += ps
endif endif
ifneq (,$(findstring posix,$(USEMODULE))) ifneq (,$(filter posix,$(USEMODULE)))
INCLUDES += -I$(RIOTBASE)/sys/posix/include INCLUDES += -I$(RIOTBASE)/sys/posix/include
DIRS += posix DIRS += posix
endif endif
ifneq (,$(findstring pnet,$(USEMODULE))) ifneq (,$(filter pnet,$(USEMODULE)))
DIRS += posix/pnet DIRS += posix/pnet
endif endif
ifneq (,$(findstring shell,$(USEMODULE))) ifneq (,$(filter shell,$(USEMODULE)))
DIRS += shell DIRS += shell
endif endif
ifneq (,$(findstring shell_commands,$(USEMODULE))) ifneq (,$(filter shell_commands,$(USEMODULE)))
DIRS += shell/commands DIRS += shell/commands
endif endif
ifneq (,$(findstring timex,$(USEMODULE))) ifneq (,$(filter timex,$(USEMODULE)))
DIRS += timex DIRS += timex
endif endif
ifneq (,$(findstring transceiver,$(USEMODULE))) ifneq (,$(filter transceiver,$(USEMODULE)))
DIRS += transceiver DIRS += transceiver
endif endif
ifneq (,$(findstring uart0,$(USEMODULE))) ifneq (,$(filter uart0,$(USEMODULE)))
DIRS += uart0 DIRS += uart0
endif endif
ifneq (,$(findstring vtimer,$(USEMODULE))) ifneq (,$(filter vtimer,$(USEMODULE)))
DIRS += vtimer DIRS += vtimer
endif endif
ifneq (,$(findstring destiny,$(USEMODULE))) ifneq (,$(filter destiny,$(USEMODULE)))
DIRS += net/transport_layer/destiny DIRS += net/transport_layer/destiny
endif endif
ifneq (,$(findstring net_help,$(USEMODULE))) ifneq (,$(filter net_help,$(USEMODULE)))
DIRS += net/crosslayer/net_help DIRS += net/crosslayer/net_help
endif endif
ifneq (,$(findstring protocol_multiplex,$(USEMODULE))) ifneq (,$(filter protocol_multiplex,$(USEMODULE)))
DIRS += net/link_layer/protocol-multiplex DIRS += net/link_layer/protocol-multiplex
endif endif
ifneq (,$(findstring sixlowpan,$(USEMODULE))) ifneq (,$(filter sixlowpan,$(USEMODULE)))
DIRS += net/network_layer/sixlowpan DIRS += net/network_layer/sixlowpan
endif endif
ifneq (,$(findstring rpl,$(USEMODULE))) ifneq (,$(filter rpl,$(USEMODULE)))
DIRS += net/routing/rpl DIRS += net/routing/rpl
endif endif
ifneq (,$(findstring ieee802154,$(USEMODULE))) ifneq (,$(filter ieee802154,$(USEMODULE)))
DIRS += net/link_layer/ieee802154 DIRS += net/link_layer/ieee802154
endif endif
ifneq (,$(findstring bloom,$(USEMODULE))) ifneq (,$(filter bloom,$(USEMODULE)))
DIRS += bloom DIRS += bloom
endif endif
ifneq (,$(findstring crypto_3des,$(USEMODULE))) ifneq (,$(filter crypto_3des,$(USEMODULE)))
DIRS += crypto/3des DIRS += crypto/3des
endif endif
ifneq (,$(findstring crypto_aes,$(USEMODULE))) ifneq (,$(filter crypto_aes,$(USEMODULE)))
DIRS += crypto/aes DIRS += crypto/aes
endif endif
ifneq (,$(findstring crypto_rc5,$(USEMODULE))) ifneq (,$(filter crypto_rc5,$(USEMODULE)))
DIRS += crypto/rc5 DIRS += crypto/rc5
endif endif
ifneq (,$(findstring crypto_sha256,$(USEMODULE))) ifneq (,$(filter crypto_sha256,$(USEMODULE)))
DIRS += crypto/sha256 DIRS += crypto/sha256
endif endif
ifneq (,$(findstring crypto_skipjack,$(USEMODULE))) ifneq (,$(filter crypto_skipjack,$(USEMODULE)))
DIRS += crypto/skipjack DIRS += crypto/skipjack
endif endif
ifneq (,$(findstring crypto_twofish,$(USEMODULE))) ifneq (,$(filter crypto_twofish,$(USEMODULE)))
DIRS += crypto/twofish DIRS += crypto/twofish
endif endif
ifneq (,$(findstring random,$(USEMODULE))) ifneq (,$(filter random,$(USEMODULE)))
DIRS += random DIRS += random
endif endif
ifneq (,$(findstring hashes,$(USEMODULE))) ifneq (,$(filter hashes,$(USEMODULE)))
DIRS += hashes DIRS += hashes
endif endif
ifneq (,$(findstring semaphore,$(USEMODULE))) ifneq (,$(filter semaphore,$(USEMODULE)))
DIRS += semaphore DIRS += semaphore
endif endif
ifneq (,$(findstring ccn_lite,$(USEMODULE))) ifneq (,$(filter ccn_lite,$(USEMODULE)))
DIRS += net/ccn_lite DIRS += net/ccn_lite
endif endif
ifneq (,$(findstring ccn_lite_client,$(USEMODULE))) ifneq (,$(filter ccn_lite_client,$(USEMODULE)))
DIRS += net/ccn_lite/util DIRS += net/ccn_lite/util
endif endif