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

make: detect their module name automatically

Browse Source 
For many modules the `Makefile` contains a line like
```
MODULE:=$(shell basename $(CURDIR))
```
This conclusively shows that we do not have to set the module name
manually.

This PR removes the need to set the module name manually, if it is the
same as the basename. E.g. for `…/sys/vtimer/Makefile` the variable
make `MODULE` will still be `vtimer`, because it is the basename of the
Makefile.
This commit is contained in:
René Kijewski 2014-06-17 03:34:17 +02:00
parent 997dcd7e88
commit 840c0f0a57
48 changed files with 2 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.base
View File

@ -2,6 +2,8 @@ ifeq (, $(__RIOTBUILD_FLAG))
$(error You cannot build a module on its own. Use "make" in your application's directory instead.) $(error You cannot build a module on its own. Use "make" in your application's directory instead.)
endif endif
MODULE ?= $(shell basename $(CURDIR))
ASMSRC = $(wildcard *.s) ASMSRC = $(wildcard *.s)
ASSMSRC = $(wildcard *.S) ASSMSRC = $(wildcard *.S)
ASMOBJ = $(ASMSRC:%.s=$(BINDIR)$(MODULE)/%.o) ASMOBJ = $(ASMSRC:%.s=$(BINDIR)$(MODULE)/%.o)

2
core/Makefile
View File

@ -1,3 +1 @@
MODULE =core
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

2
cpu/arm_common/Makefile
View File

@ -1,4 +1,2 @@
MODULE =arm_common
CFLAGS += $(CFLAGS_BASIC) CFLAGS += $(CFLAGS_BASIC)
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

4
cpu/cortex-m3_common/Makefile
View File

@ -1,5 +1 @@
# define the module that is build
MODULE = cortex-m3_common
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

2
cpu/lpc2387/gpioint/Makefile
View File

@ -1,3 +1 @@
MODULE =gpioint
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

2
cpu/lpc2387/i2c/Makefile
View File

@ -1,3 +1 @@
MODULE =i2c
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

2
cpu/lpc2387/mci/Makefile
View File

@ -1,3 +1 @@
MODULE =mci
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

2
cpu/lpc2387/rtc/Makefile
View File

@ -1,3 +1 @@
MODULE =rtc
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

2
cpu/lpc_common/Makefile
View File

@ -1,3 +1 @@
MODULE =lpc_common
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

2
cpu/native/rtc/Makefile
View File

@ -1,5 +1,3 @@
MODULE =rtc
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base
$(BINDIR)$(MODULE)/%.o: %.c $(BINDIR)$(MODULE)/%.o: %.c

3
cpu/sam3x8e/periph/Makefile
View File

@ -1,4 +1 @@
MODULE = periph
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

2
drivers/Makefile
View File

@ -1,5 +1,3 @@
MODULE = drivers
DIRS= DIRS=
ifneq (,$(filter powermon,$(USEMODULE))) ifneq (,$(filter powermon,$(USEMODULE)))
DIRS += powermon DIRS += powermon

2
drivers/at86rf231/Makefile
View File

@ -1,3 +1 @@
MODULE =at86rf231
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

2
drivers/cc110x/Makefile
View File

@ -1,3 +1 @@
MODULE =cc110x
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

2
drivers/cc110x_ng/Makefile
View File

@ -1,5 +1,3 @@
MODULE =cc110x_ng
DIRS = DIRS =
ifneq (,$(filter msb-430h,$(BOARD))) ifneq (,$(filter msb-430h,$(BOARD)))
DIRS += spi DIRS += spi

2
drivers/cc2420/Makefile
View File

@ -1,3 +1 @@
MODULE =cc2420
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

1
drivers/lm75a/Makefile
View File

@ -1,2 +1 @@
MODULE =lm75a
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

1
drivers/ltc4150/Makefile
View File

@ -1,2 +1 @@
MODULE =ltc4150
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

1
drivers/sht11/Makefile
View File

@ -1,2 +1 @@
MODULE =sht11
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

1
drivers/srf02/Makefile
View File

@ -1,2 +1 @@
MODULE =srf02
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

1
drivers/srf08/Makefile
View File

@ -1,2 +1 @@
MODULE =srf08
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

2
sys/auto_init/Makefile
View File

@ -1,5 +1,3 @@
MODULE = auto_init
ifneq (,$(filter net_if,$(USEMODULE))) ifneq (,$(filter net_if,$(USEMODULE)))
INCLUDES += -I$(RIOTBASE)/sys/net/include/ INCLUDES += -I$(RIOTBASE)/sys/net/include/
endif endif

2
sys/bloom/Makefile
View File

@ -1,3 +1 @@
MODULE = bloom
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

2
sys/config/Makefile
View File

@ -1,3 +1 @@
MODULE =config
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

2
sys/crypto/Makefile
View File

@ -1,3 +1 @@
MODULE = crypto
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

2
sys/hashes/Makefile
View File

@ -1,3 +1 @@
MODULE = hashes
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

2
sys/lib/Makefile
View File

@ -1,3 +1 @@
MODULE =lib
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

2
sys/net/ccn_lite/Makefile
View File

@ -1,3 +1 @@
MODULE := ccn_lite
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

2
sys/net/crosslayer/net_help/Makefile
View File

@ -1,3 +1 @@
MODULE:=$(shell basename $(CURDIR))
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

2
sys/net/link_layer/ieee802154/Makefile
View File

@ -1,3 +1 @@
MODULE:=$(shell basename $(CURDIR))
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

1
sys/net/link_layer/net_if/Makefile
View File

@ -1,4 +1,3 @@
MODULE:=$(shell basename $(CURDIR))
INCLUDES += -I$(RIOTBASE)/drivers/include \ INCLUDES += -I$(RIOTBASE)/drivers/include \
-I$(RIOTBASE)/drivers/cc110x_ng/include \ -I$(RIOTBASE)/drivers/cc110x_ng/include \
-I$(RIOTBASE)/sys/net/include -I$(RIOTBASE)/sys/net/include

1
sys/net/network_layer/sixlowpan/Makefile
View File

@ -1,2 +1 @@
MODULE:=$(shell basename $(CURDIR))
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

2
sys/net/routing/Makefile
View File

@ -1,3 +1 @@
MODULE:=$(shell basename $(CURDIR))
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

2
sys/net/routing/rpl/Makefile
View File

@ -1,3 +1 @@
MODULE:=$(shell basename $(CURDIR))
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

2
sys/net/transport_layer/destiny/Makefile
View File

@ -1,3 +1 @@
MODULE:=$(shell basename $(CURDIR))
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

2
sys/ping/Makefile
View File

@ -1,3 +1 @@
MODULE =ping
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

2
sys/posix/Makefile
View File

@ -1,3 +1 @@
MODULE = posix
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

2
sys/posix/pnet/Makefile
View File

@ -1,3 +1 @@
MODULE =pnet
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

2
sys/posix/pthread/Makefile
View File

@ -1,3 +1 @@
MODULE = pthread
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

2
sys/ps/Makefile
View File

@ -1,3 +1 @@
MODULE =ps
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

2
sys/quad_math/Makefile
View File

@ -1,3 +1 @@
MODULE = quad_math
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

2
sys/random/Makefile
View File

@ -1,3 +1 @@
MODULE = random
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

2
sys/shell/Makefile
View File

@ -1,3 +1 @@
MODULE = shell
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

2
sys/timex/Makefile
View File

@ -1,3 +1 @@
MODULE = timex
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

2
sys/transceiver/Makefile
View File

@ -1,5 +1,3 @@
MODULE =transceiver
ifneq (,$(filter cc2420,$(USEMODULE))) ifneq (,$(filter cc2420,$(USEMODULE)))
INCLUDES += -I$(RIOTBASE)/sys/net/include INCLUDES += -I$(RIOTBASE)/sys/net/include
endif endif

2
sys/uart0/Makefile
View File

@ -1,3 +1 @@
MODULE = uart0
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

2
sys/vtimer/Makefile
View File

@ -1,3 +1 @@
MODULE =vtimer
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

2
tests/unittests/tests-core/Makefile
View File

@ -1,3 +1 @@
MODULE = tests-core
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base