make: detect their module name automatically

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.
2014-06-17 03:34:17 +02:00 · 2014-06-17 03:34:17 +02:00 · 840c0f0a57
parent 997dcd7e88
commit 840c0f0a57
48 changed files with 2 additions and 90 deletions
--- a/Makefile.base
+++ b/Makefile.base
@ -2,6 +2,8 @@ ifeq (, $(__RIOTBUILD_FLAG))
    $(error You cannot build a module on its own. Use "make" in your application's directory instead.)
 endif

+MODULE ?= $(shell basename $(CURDIR))
+
 ASMSRC = $(wildcard *.s)
 ASSMSRC = $(wildcard *.S)
 ASMOBJ = $(ASMSRC:%.s=$(BINDIR)$(MODULE)/%.o)
--- a/core/Makefile
+++ b/core/Makefile
@ -1,3 +1 @@
-MODULE =core
-
 include $(RIOTBASE)/Makefile.base
--- a/cpu/arm_common/Makefile
+++ b/cpu/arm_common/Makefile
@ -1,4 +1,2 @@
-MODULE =arm_common
-
 CFLAGS += $(CFLAGS_BASIC)
 include $(RIOTBASE)/Makefile.base
--- a/cpu/cortex-m3_common/Makefile
+++ b/cpu/cortex-m3_common/Makefile
@ -1,5 +1 @@
-
-# define the module that is build
-MODULE = cortex-m3_common
-
 include $(RIOTBASE)/Makefile.base
--- a/cpu/lpc2387/gpioint/Makefile
+++ b/cpu/lpc2387/gpioint/Makefile
@ -1,3 +1 @@
-MODULE =gpioint
-
 include $(RIOTBASE)/Makefile.base
--- a/cpu/lpc2387/i2c/Makefile
+++ b/cpu/lpc2387/i2c/Makefile
@ -1,3 +1 @@
-MODULE =i2c
-
 include $(RIOTBASE)/Makefile.base
--- a/cpu/lpc2387/mci/Makefile
+++ b/cpu/lpc2387/mci/Makefile
@ -1,3 +1 @@
-MODULE =mci
-
 include $(RIOTBASE)/Makefile.base
--- a/cpu/lpc2387/rtc/Makefile
+++ b/cpu/lpc2387/rtc/Makefile
@ -1,3 +1 @@
-MODULE =rtc
-
 include $(RIOTBASE)/Makefile.base
--- a/cpu/lpc_common/Makefile
+++ b/cpu/lpc_common/Makefile
@ -1,3 +1 @@
-MODULE =lpc_common
-
 include $(RIOTBASE)/Makefile.base
--- a/cpu/native/rtc/Makefile
+++ b/cpu/native/rtc/Makefile
@ -1,5 +1,3 @@
-MODULE =rtc
-
 include $(RIOTBASE)/Makefile.base

 $(BINDIR)$(MODULE)/%.o: %.c
--- a/cpu/sam3x8e/periph/Makefile
+++ b/cpu/sam3x8e/periph/Makefile
@ -1,4 +1 @@
-
-MODULE = periph
-
 include $(RIOTBASE)/Makefile.base
--- a/drivers/Makefile
+++ b/drivers/Makefile
@ -1,5 +1,3 @@
-MODULE = drivers
-
 DIRS=
 ifneq (,$(filter powermon,$(USEMODULE)))
    DIRS += powermon
--- a/drivers/at86rf231/Makefile
+++ b/drivers/at86rf231/Makefile
@ -1,3 +1 @@
-MODULE =at86rf231
-
 include $(RIOTBASE)/Makefile.base
--- a/drivers/cc110x/Makefile
+++ b/drivers/cc110x/Makefile
@ -1,3 +1 @@
-MODULE =cc110x
-
 include $(RIOTBASE)/Makefile.base
--- a/drivers/cc110x_ng/Makefile
+++ b/drivers/cc110x_ng/Makefile
@ -1,5 +1,3 @@
-MODULE =cc110x_ng
-
 DIRS =
 ifneq (,$(filter msb-430h,$(BOARD)))
 	DIRS += spi
--- a/drivers/cc2420/Makefile
+++ b/drivers/cc2420/Makefile
@ -1,3 +1 @@
-MODULE =cc2420
-
 include $(RIOTBASE)/Makefile.base
--- a/drivers/lm75a/Makefile
+++ b/drivers/lm75a/Makefile
@ -1,2 +1 @@
-MODULE =lm75a
 include $(RIOTBASE)/Makefile.base
--- a/drivers/ltc4150/Makefile
+++ b/drivers/ltc4150/Makefile
@ -1,2 +1 @@
-MODULE =ltc4150
 include $(RIOTBASE)/Makefile.base
--- a/drivers/sht11/Makefile
+++ b/drivers/sht11/Makefile
@ -1,2 +1 @@
-MODULE =sht11
 include $(RIOTBASE)/Makefile.base
--- a/drivers/srf02/Makefile
+++ b/drivers/srf02/Makefile
@ -1,2 +1 @@
-MODULE =srf02
 include $(RIOTBASE)/Makefile.base
--- a/drivers/srf08/Makefile
+++ b/drivers/srf08/Makefile
@ -1,2 +1 @@
-MODULE =srf08
 include $(RIOTBASE)/Makefile.base
--- a/sys/auto_init/Makefile
+++ b/sys/auto_init/Makefile
@ -1,5 +1,3 @@
-MODULE = auto_init
-
 ifneq (,$(filter net_if,$(USEMODULE)))
 	INCLUDES += -I$(RIOTBASE)/sys/net/include/
 endif
--- a/sys/bloom/Makefile
+++ b/sys/bloom/Makefile
@ -1,3 +1 @@
-MODULE = bloom
-
 include $(RIOTBASE)/Makefile.base
--- a/sys/config/Makefile
+++ b/sys/config/Makefile
@ -1,3 +1 @@
-MODULE =config
-
 include $(RIOTBASE)/Makefile.base
--- a/sys/crypto/Makefile
+++ b/sys/crypto/Makefile
@ -1,3 +1 @@
-MODULE = crypto
-
 include $(RIOTBASE)/Makefile.base
--- a/sys/hashes/Makefile
+++ b/sys/hashes/Makefile
@ -1,3 +1 @@
-MODULE = hashes
-
 include $(RIOTBASE)/Makefile.base
--- a/sys/lib/Makefile
+++ b/sys/lib/Makefile
@ -1,3 +1 @@
-MODULE =lib
-
 include $(RIOTBASE)/Makefile.base
--- a/sys/net/ccn_lite/Makefile
+++ b/sys/net/ccn_lite/Makefile
@ -1,3 +1 @@
-MODULE := ccn_lite
-
 include $(RIOTBASE)/Makefile.base
--- a/sys/net/crosslayer/net_help/Makefile
+++ b/sys/net/crosslayer/net_help/Makefile
@ -1,3 +1 @@
-MODULE:=$(shell basename $(CURDIR))
-
 include $(RIOTBASE)/Makefile.base
--- a/sys/net/link_layer/ieee802154/Makefile
+++ b/sys/net/link_layer/ieee802154/Makefile
@ -1,3 +1 @@
-MODULE:=$(shell basename $(CURDIR))
-
 include $(RIOTBASE)/Makefile.base
--- a/sys/net/link_layer/net_if/Makefile
+++ b/sys/net/link_layer/net_if/Makefile
@ -1,4 +1,3 @@
-MODULE:=$(shell basename $(CURDIR))
 INCLUDES += -I$(RIOTBASE)/drivers/include \
 			-I$(RIOTBASE)/drivers/cc110x_ng/include \
 			-I$(RIOTBASE)/sys/net/include
--- a/sys/net/network_layer/sixlowpan/Makefile
+++ b/sys/net/network_layer/sixlowpan/Makefile
@ -1,2 +1 @@
-MODULE:=$(shell basename $(CURDIR))
 include $(RIOTBASE)/Makefile.base
--- a/sys/net/routing/Makefile
+++ b/sys/net/routing/Makefile
@ -1,3 +1 @@
-MODULE:=$(shell basename $(CURDIR))
-
 include $(RIOTBASE)/Makefile.base
--- a/sys/net/routing/rpl/Makefile
+++ b/sys/net/routing/rpl/Makefile
@ -1,3 +1 @@
-MODULE:=$(shell basename $(CURDIR))
-
 include $(RIOTBASE)/Makefile.base
--- a/sys/net/transport_layer/destiny/Makefile
+++ b/sys/net/transport_layer/destiny/Makefile
@ -1,3 +1 @@
-MODULE:=$(shell basename $(CURDIR))
-
 include $(RIOTBASE)/Makefile.base
--- a/sys/ping/Makefile
+++ b/sys/ping/Makefile
@ -1,3 +1 @@
-MODULE =ping
-
 include $(RIOTBASE)/Makefile.base
--- a/sys/posix/Makefile
+++ b/sys/posix/Makefile
@ -1,3 +1 @@
-MODULE = posix
-
 include $(RIOTBASE)/Makefile.base
--- a/sys/posix/pnet/Makefile
+++ b/sys/posix/pnet/Makefile
@ -1,3 +1 @@
-MODULE =pnet
-
 include $(RIOTBASE)/Makefile.base
--- a/sys/posix/pthread/Makefile
+++ b/sys/posix/pthread/Makefile
@ -1,3 +1 @@
-MODULE = pthread
-
 include $(RIOTBASE)/Makefile.base
--- a/sys/ps/Makefile
+++ b/sys/ps/Makefile
@ -1,3 +1 @@
-MODULE =ps
-
 include $(RIOTBASE)/Makefile.base
--- a/sys/quad_math/Makefile
+++ b/sys/quad_math/Makefile
@ -1,3 +1 @@
-MODULE = quad_math
-
 include $(RIOTBASE)/Makefile.base
--- a/sys/random/Makefile
+++ b/sys/random/Makefile
@ -1,3 +1 @@
-MODULE = random
-
 include $(RIOTBASE)/Makefile.base
--- a/sys/shell/Makefile
+++ b/sys/shell/Makefile
@ -1,3 +1 @@
-MODULE = shell
-
 include $(RIOTBASE)/Makefile.base
--- a/sys/timex/Makefile
+++ b/sys/timex/Makefile
@ -1,3 +1 @@
-MODULE = timex
-
 include $(RIOTBASE)/Makefile.base
--- a/sys/transceiver/Makefile
+++ b/sys/transceiver/Makefile
@ -1,5 +1,3 @@
-MODULE =transceiver
-
 ifneq (,$(filter cc2420,$(USEMODULE)))
 	INCLUDES += -I$(RIOTBASE)/sys/net/include
 endif
--- a/sys/uart0/Makefile
+++ b/sys/uart0/Makefile
@ -1,3 +1 @@
-MODULE = uart0
-
 include $(RIOTBASE)/Makefile.base
--- a/sys/vtimer/Makefile
+++ b/sys/vtimer/Makefile
@ -1,3 +1 @@
-MODULE =vtimer
-
 include $(RIOTBASE)/Makefile.base
--- a/tests/unittests/tests-core/Makefile
+++ b/tests/unittests/tests-core/Makefile
@ -1,3 +1 @@
-MODULE = tests-core
-
 include $(RIOTBASE)/Makefile.base