RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Merge pull request #701 from Kijewski/issue-672

Browse Source 
Use `filter` instead of `findstring`
This commit is contained in:
Oleg Hahm 2014-02-16 12:33:29 +01:00
commit 6c0482b976
19 changed files with 134 additions and 131 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)))
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

4
boards/msb-430h/Makefile.dep
View File

@ -1,5 +1,5 @@
ifneq (,$(findstring cc110x_ng,$(USEMODULE)))
ifeq (,$(findstring cc110x_spi,$(USEMODULE)))
ifneq (,$(filter cc110x_ng,$(USEMODULE)))
ifeq (,$(filter cc110x_spi,$(USEMODULE)))
USEMODULE += cc110x_spi
endif
endif

14
boards/msba2-common/Makefile.dep
View File

@ -1,20 +1,20 @@
ifneq (,$(findstring cc110x,$(USEMODULE)))
ifeq (,$(findstring gpioint,$(USEMODULE)))
ifneq (,$(filter cc110x,$(USEMODULE)))
ifeq (,$(filter gpioint,$(USEMODULE)))
USEMODULE += gpioint
endif
endif
ifneq (,$(findstring cc110x_ng,$(USEMODULE)))
ifeq (,$(findstring cc110x_spi,$(USEMODULE)))
ifneq (,$(filter cc110x_ng,$(USEMODULE)))
ifeq (,$(filter cc110x_spi,$(USEMODULE)))
USEMODULE += cc110x_spi
endif
ifeq (,$(findstring gpioint,$(USEMODULE)))
ifeq (,$(filter gpioint,$(USEMODULE)))
USEMODULE += gpioint
endif
endif
ifneq (,$(findstring ltc4150,$(USEMODULE)))
ifeq (,$(findstring gpioint,$(USEMODULE)))
ifneq (,$(filter ltc4150,$(USEMODULE)))
ifeq (,$(filter gpioint,$(USEMODULE)))
USEMODULE += gpioint
endif
endif

4
boards/native/Makefile.dep
View File

@ -1,5 +1,5 @@
ifneq (,$(findstring ltc4150,$(USEMODULE)))
ifeq (,$(findstring hwtimer,$(USEMODULE)))
ifneq (,$(filter ltc4150,$(USEMODULE)))
ifeq (,$(filter hwtimer,$(USEMODULE)))
USEMODULE += hwtimer
endif
endif

2
boards/native/Makefile.include
View File

@ -43,7 +43,7 @@ endif
endif
# set the tap interface for term/valgrind
ifneq (,$(findstring nativenet,$(USEMODULE)))
ifneq (,$(filter nativenet,$(USEMODULE)))
export PORT ?= tap0
else
export PORT =

4
boards/wsn430-v1_3b/Makefile.dep
View File

@ -1,5 +1,5 @@
ifneq (,$(findstring cc110x_ng,$(USEMODULE)))
ifeq (,$(findstring cc110x_spi,$(USEMODULE)))
ifneq (,$(filter cc110x_ng,$(USEMODULE)))
ifeq (,$(filter cc110x_spi,$(USEMODULE)))
USEMODULE += cc110x_spi
endif
endif

4
boards/wsn430-v1_4/Makefile.include
View File

@ -1,10 +1,10 @@
export INCLUDES += -I$(RIOTBOARD)/wsn430-v1_4/include -I$(RIOTBOARD)/wsn430-common/include
ifeq (,$(findstring cc2420,$(USEMODULE)))
ifeq (,$(filter cc2420,$(USEMODULE)))
USEMODULE += cc2420
endif
ifneq (,$(findstring cc2420,$(USEMODULE)))
ifneq (,$(filter cc2420,$(USEMODULE)))
INCLUDES += -I$(RIOTBASE)/drivers/cc2420/include \
-I$(RIOTBASE)/sys/net/include
endif

8
cpu/lpc2387/Makefile
View File

@ -3,16 +3,16 @@ MODULE =cpu
include $(RIOTCPU)/$(CPU)/Makefile.include
DIRS = $(RIOTCPU)/arm_common $(RIOTCPU)/lpc_common
ifneq (,$(findstring gpioint,$(USEMODULE)))
ifneq (,$(filter gpioint,$(USEMODULE)))
DIRS += gpioint
endif
ifneq (,$(findstring mci,$(USEMODULE)))
ifneq (,$(filter mci,$(USEMODULE)))
DIRS += mci
endif
ifneq (,$(findstring rtc,$(USEMODULE)))
ifneq (,$(filter rtc,$(USEMODULE)))
DIRS += rtc
endif
ifneq (,$(findstring i2c,$(USEMODULE)))
ifneq (,$(filter i2c,$(USEMODULE)))
DIRS += i2c
endif

6
cpu/mc1322x/Makefile
View File

@ -1,10 +1,10 @@
MODULE =cpu
DIRS = $(RIOTCPU)/arm_common
ifneq (,$(findstring mc1322x_adc,$(USEMODULE)))
DIRS += adc
ifneq (,$(filter mc1322x_adc,$(USEMODULE)))
DIRS += adc
endif
ifneq (,$(findstring mc1322x_asm,$(USEMODULE)))
ifneq (,$(filter mc1322x_asm,$(USEMODULE)))
DIRS += asm
endif

4
cpu/native/Makefile
View File

@ -3,10 +3,10 @@ MODULE = cpu
EXCLUDES := -I$(RIOTBASE)/sys/posix/%
DIRS =
ifneq (,$(findstring rtc,$(USEMODULE)))
ifneq (,$(filter rtc,$(USEMODULE)))
DIRS += rtc
endif
ifneq (,$(findstring nativenet,$(USEMODULE)))
ifneq (,$(filter nativenet,$(USEMODULE)))
DIRS += net
endif

29
drivers/Makefile
View File

@ -1,38 +1,37 @@
MODULE = drivers
DIRS=
ifneq (,$(findstring powermon,$(USEMODULE)))
ifneq (,$(filter powermon,$(USEMODULE)))
DIRS += powermon
endif
ifneq (,$(findstring cc2420,$(USEMODULE)))
ifneq (,$(filter cc2420,$(USEMODULE)))
DIRS += cc2420
endif
ifneq (,$(findstring sht11,$(USEMODULE)))
ifneq (,$(filter sht11,$(USEMODULE)))
DIRS += sht11
endif
ifneq (,$(findstring ltc4150,$(USEMODULE)))
ifneq (,$(filter ltc4150,$(USEMODULE)))
DIRS += ltc4150
endif
ifneq (,$(findstring cc110x,$(USEMODULE)))
ifneq (,$(findstring cc110x_ng,$(USEMODULE)))
DIRS += cc110x_ng
else
DIRS += cc110x
endif
ifneq (,$(filter cc110x,$(USEMODULE)))
DIRS += cc110x
endif
ifneq (,$(findstring at86rf231,$(USEMODULE)))
ifneq (,$(filter cc110x_ng,$(USEMODULE)))
DIRS += cc110x_ng
endif
ifneq (,$(filter at86rf231,$(USEMODULE)))
DIRS += at86rf231
endif
ifneq (,$(findstring gps_ublox,$(USEMODULE)))
ifneq (,$(filter gps_ublox,$(USEMODULE)))
DIRS += gps_ublox
endif
ifneq (,$(findstring srf02,$(USEMODULE)))
ifneq (,$(filter srf02,$(USEMODULE)))
DIRS += srf02
endif
ifneq (,$(findstring srf08,$(USEMODULE)))
ifneq (,$(filter srf08,$(USEMODULE)))
DIRS += srf08
endif
ifneq (,$(findstring lm75a,$(USEMODULE)))
ifneq (,$(filter lm75a,$(USEMODULE)))
DIRS += lm75a
endif

6
drivers/cc110x_ng/Makefile
View File

@ -1,13 +1,13 @@
MODULE =cc110x_ng
DIRS =
ifneq (,$(findstring msb-430h,$(BOARD)))
ifneq (,$(filter msb-430h,$(BOARD)))
DIRS += spi
endif
ifneq (,$(findstring msba2,$(BOARD)))
ifneq (,$(filter msba2,$(BOARD)))
DIRS += spi
endif
ifneq (,$(findstring wsn430-v1_3b,$(BOARD)))
ifneq (,$(filter wsn430-v1_3b,$(BOARD)))
DIRS += spi
endif

13
examples/default/Makefile
View File

@ -35,19 +35,20 @@ USEMODULE += shell_commands
USEMODULE += ps
USEMODULE += vtimer
USEMODULE += auto_init
ifneq (,$(findstring msb-430,$(BOARD)))
ifneq (,$(filter msb-430,$(BOARD)))
USEMODULE += sht11
endif
ifneq (,$(findstring chronos,$(BOARD)))
ifneq (,$(filter msb-430h,$(BOARD)))
USEMODULE += sht11
USEMODULE += cc110x_ng
endif
ifneq (,$(findstring wsn430-v1_3b,$(BOARD)))
ifneq (,$(filter chronos,$(BOARD)))
USEMODULE += cc110x_ng
endif
ifneq (,$(findstring msb-430h,$(BOARD)))
ifneq (,$(filter wsn430-v1_3b,$(BOARD)))
USEMODULE += cc110x_ng
endif
ifneq (,$(findstring msba2,$(BOARD)))
ifneq (,$(filter msba2,$(BOARD)))
USEMODULE += sht11
USEMODULE += ltc4150
USEMODULE += rtc
@ -56,7 +57,7 @@ ifneq (,$(findstring msba2,$(BOARD)))
USEMODULE += config
USEMODULE += random
endif
ifneq (,$(findstring native,$(BOARD)))
ifneq (,$(filter native,$(BOARD)))
USEMODULE += ltc4150
USEMODULE += rtc
USEMODULE += nativenet

64
sys/Makefile
View File

@ -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
ifneq (,$(findstring quad_math,$(USEMODULE)))

20
sys/shell/commands/Makefile
View File

@ -1,32 +1,32 @@
SRC = shell_commands.c sc_id.c
ifneq (,$(findstring transceiver,$(USEMODULE)))
ifneq (,$(filter transceiver,$(USEMODULE)))
SRC += sc_transceiver.c
endif
ifneq (,$(findstring cc110x,$(USEMODULE)))
ifeq (,$(findstring transceiver,$(USEMODULE)))
ifneq (,$(filter cc110x,$(USEMODULE)))
ifeq (,$(filter transceiver,$(USEMODULE)))
SRC += sc_cc1100.c
endif
endif
ifneq (,$(findstring mci,$(USEMODULE)))
ifneq (,$(filter mci,$(USEMODULE)))
SRC += sc_disk.c
endif
ifneq (,$(findstring ltc4150,$(USEMODULE)))
ifneq (,$(filter ltc4150,$(USEMODULE)))
SRC += sc_ltc4150.c
endif
ifneq (,$(findstring ps,$(USEMODULE)))
ifneq (,$(filter ps,$(USEMODULE)))
SRC += sc_ps.c
endif
ifneq (,$(findstring rtc,$(USEMODULE)))
ifneq (,$(filter rtc,$(USEMODULE)))
SRC += sc_rtc.c
endif
ifneq (,$(findstring sht11,$(USEMODULE)))
ifneq (,$(filter sht11,$(USEMODULE)))
SRC += sc_sht11.c
endif
ifneq (,$(findstring lpc_common,$(USEMODULE)))
ifneq (,$(filter lpc_common,$(USEMODULE)))
SRC += sc_heap.c
endif
ifneq (,$(findstring random,$(USEMODULE)))
ifneq (,$(filter random,$(USEMODULE)))
SRC += sc_mersenne.c
endif

7
tests/test_bloom/Makefile
View File

@ -7,8 +7,11 @@ export BOARD ?= native
# this has to be the absolute path of the RIOT-base dir
export RIOTBASE = $(CURDIR)/../..
ifneq (,$(findstring msb-430,$(BOARD)))
include $(RIOTBASE)/Makefile.unsupported
ifneq (,$(filter msb-430,$(BOARD)))
include $(RIOTBASE)/Makefile.unsupported
else
ifneq (,$(filter msb-430h,$(BOARD)))
include $(RIOTBASE)/Makefile.unsupported
else
## Modules to include.

2
tests/test_bloom_bytes/Makefile
View File

@ -7,7 +7,7 @@ export BOARD ?= native
# this has to be the absolute path of the RIOT-base dir
export RIOTBASE = $(CURDIR)/../..
ifneq (,$(findstring msb-430,$(BOARD)))
ifneq (,$(filter msb-430,$(BOARD)))
include $(RIOTBASE)/Makefile.unsupported
else

2
tests/test_irq/Makefile
View File

@ -7,7 +7,7 @@ export BOARD ?= native
# this has to be the absolute path of the RIOT-base dir
export RIOTBASE = $(CURDIR)/../..
ifeq (,$(findstring native,$(BOARD)))
ifeq (,$(filter native,$(BOARD)))
include $(RIOTBASE)/Makefile.unsupported
else

2
tests/test_nativenet/Makefile
View File

@ -10,7 +10,7 @@ export BOARD = native
# this has to be the absolute path of the RIOT-base dir
export RIOTBASE = $(CURDIR)/../..
ifeq (,$(findstring native,$(BOARD)))
ifeq (,$(filter native,$(BOARD)))
include $(RIOTBASE)/Makefile.unsupported
else