Merge pull request #1324 from Kijewski/make-automatic-module-name

make: much less clutter for "standard layout" modules
9 years ago · 6d1365c5d8
parent 227f40cd9e 467b41ad49
commit 6d1365c5d8
73 changed files with 9 additions and 200 deletions
--- a/Makefile.base
+++ b/Makefile.base
@ -2,6 +2,14 @@ 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))
+
+all: $(BINDIR)$(MODULE).a
+	@for i in $(DIRS); do $(MAKE) -C $$i || exit 1; done;
+
+clean::
+	@for i in $(DIRS); do $(MAKE) -C $$i clean; done;
+
 ASMSRC = $(wildcard *.s)
 ASSMSRC = $(wildcard *.S)
 ASMOBJ = $(ASMSRC:%.s=$(BINDIR)$(MODULE)/%.o)
--- a/boards/arduino-due/Makefile
+++ b/boards/arduino-due/Makefile
@ -5,12 +5,4 @@ MODULE = $(BOARD)_base
 # add a list of board specific subdirectories that should also be build
 DIRS =

-.PHONY: all clean
-
-all: $(BINDIR)$(MODULE).a
-	@for i in $(DIRS) ; do $(MAKE) -C $$i ; done ;
-
 include $(RIOTBASE)/Makefile.base
-
-clean::
-	@for i in $(DIRS) ; do $(MAKE) -C $$i clean ; done ;
--- a/boards/avsextrem/Makefile
+++ b/boards/avsextrem/Makefile
@ -2,7 +2,4 @@ MODULE =$(BOARD)_base

 DIRS = drivers $(RIOTBOARD)/msba2-common

-all: $(BINDIR)$(MODULE).a
-	@for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ;
-
 include $(RIOTBASE)/Makefile.base
--- a/boards/chronos/Makefile
+++ b/boards/chronos/Makefile
@ -3,7 +3,4 @@ MODULE =$(BOARD)_base
 INCLUDES += -I$(RIOTBOARD)/$(BOARD)/drivers/include
 DIRS = drivers

-all: $(BINDIR)$(MODULE).a
-	@for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ;
-
 include $(RIOTBASE)/Makefile.base
--- a/boards/msb-430-common/Makefile
+++ b/boards/msb-430-common/Makefile
@ -2,7 +2,4 @@ MODULE =$(BOARD)_base

 DIRS = drivers

-all: $(BINDIR)$(MODULE).a
-	@for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ;
-
 include $(RIOTBASE)/Makefile.base
--- a/boards/msb-430/Makefile
+++ b/boards/msb-430/Makefile
@ -2,7 +2,4 @@ MODULE =$(BOARD)_base

 DIRS = $(RIOTBOARD)/msb-430-common

-all: $(BINDIR)$(MODULE).a
-	@for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ;
-
 include $(RIOTBASE)/Makefile.base
--- a/boards/msb-430h/Makefile
+++ b/boards/msb-430h/Makefile
@ -2,7 +2,4 @@ MODULE =$(BOARD)_base

 DIRS = $(RIOTBOARD)/msb-430-common

-all: $(BINDIR)$(MODULE).a
-	@for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ;
-
 include $(RIOTBASE)/Makefile.base
--- a/boards/msba2-common/Makefile
+++ b/boards/msba2-common/Makefile
@ -2,7 +2,4 @@ MODULE =$(BOARD)_base

 DIRS = drivers

-all: $(BINDIR)$(MODULE).a
-	@for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ;
-
 include $(RIOTBASE)/Makefile.base
--- a/boards/msba2/Makefile
+++ b/boards/msba2/Makefile
@ -3,7 +3,4 @@ INCLUDES += -I$(RIOTBASE)/drivers/cc110x

 DIRS = $(RIOTBOARD)/msba2-common

-all: $(BINDIR)$(MODULE).a
-	@for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ;
-
 include $(RIOTBASE)/Makefile.base
--- a/boards/native/Makefile
+++ b/boards/native/Makefile
@ -2,9 +2,6 @@ MODULE =$(BOARD)_base

 DIRS = drivers

-all: $(BINDIR)$(MODULE).a
-	@for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ;
-
 include $(RIOTBASE)/Makefile.base

 $(BINDIR)$(MODULE)/%.o: %.c
--- a/boards/native/drivers/Makefile
+++ b/boards/native/drivers/Makefile
@ -1,8 +1,5 @@
 MODULE =$(BOARD)_base

-all: $(BINDIR)$(MODULE).a
-	@for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ;
-
 include $(RIOTBASE)/Makefile.base

 $(BINDIR)$(MODULE)/%.o: %.c
--- a/boards/pttu/Makefile
+++ b/boards/pttu/Makefile
@ -3,7 +3,4 @@ INCLUDES += -I$(RIOTBASE)/drivers/cc110x

 DIRS = $(RIOTBOARD)/msba2-common

-all: $(BINDIR)$(MODULE).a
-	@for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ;
-
 include $(RIOTBASE)/Makefile.base
--- a/boards/qemu-i386/Makefile
+++ b/boards/qemu-i386/Makefile
@ -2,10 +2,4 @@ MODULE = qemu-i386_base

 DIRS = $(RIOTBOARD)/x86-multiboot-common

-all: $(BINDIR)$(MODULE).a
-	@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;
-
 include $(RIOTBASE)/Makefile.base
-
-clean::
-	@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ;
--- a/boards/redbee-econotag/Makefile
+++ b/boards/redbee-econotag/Makefile
@ -2,7 +2,4 @@ MODULE =$(BOARD)_base

 DIRS = drivers

-all: $(BINDIR)$(MODULE).a
-	@for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ;
-
 include $(RIOTBASE)/Makefile.base
--- a/boards/udoo/Makefile
+++ b/boards/udoo/Makefile
@ -1,16 +1,7 @@
-
 # tell the Makefile.base which module to build
 MODULE = $(BOARD)_base

 # add a list of board specific subdirectories that should also be build
 DIRS =

-.PHONY: all clean
-
-all: $(BINDIR)$(MODULE).a
-	@for i in $(DIRS) ; do $(MAKE) -C $$i ; done ;
-
 include $(RIOTBASE)/Makefile.base
-
-clean::
-	@for i in $(DIRS) ; do $(MAKE) -C $$i clean ; done ;
--- a/boards/wsn430-common/Makefile
+++ b/boards/wsn430-common/Makefile
@ -2,7 +2,4 @@ MODULE =$(BOARD)_base

 DIRS = drivers

-all: $(BINDIR)$(MODULE).a
-	@for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ;
-
 include $(RIOTBASE)/Makefile.base
--- a/boards/wsn430-v1_3b/Makefile
+++ b/boards/wsn430-v1_3b/Makefile
@ -2,7 +2,4 @@ MODULE =$(BOARD)_base

 DIRS = $(RIOTBOARD)/wsn430-common

-all: $(BINDIR)$(MODULE).a
-	@for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ;
-
 include $(RIOTBASE)/Makefile.base
--- a/boards/wsn430-v1_4/Makefile
+++ b/boards/wsn430-v1_4/Makefile
@ -5,7 +5,4 @@ DIRS = $(RIOTBOARD)/wsn430-common
 INCLUDES += -I$(RIOTBASE)/drivers/cc2420/include \
 			-I$(RIOTBASE)/sys/net/include

-all: $(BINDIR)$(MODULE).a
-	@for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ;
-
 include $(RIOTBASE)/Makefile.base
--- 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/cc430/Makefile
+++ b/cpu/cc430/Makefile
@ -2,7 +2,4 @@ MODULE = cpu

 DIRS = $(RIOTCPU)/msp430-common

-all: $(BINDIR)$(MODULE).a
-	@for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ;
-
 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/lpc1768/Makefile
+++ b/cpu/lpc1768/Makefile
@ -7,8 +7,6 @@ CC_SYMBOLS = -DTARGET_LPC1769 -DTOOLCHAIN_GCC_ARM -DNDEBUG -D__CORTEX_M3
 LD_FLAGS = -mcpu=cortex-m3 -mthumb -Wl,--gc-sections,-Map=$(APPLICATION).map,--cref --specs=nano.specs
 LD_SYS_LIBS = -lc -lgcc -lnosys

-all: $(BINDIR)$(MODULE).a
-
 include $(RIOTBASE)/Makefile.base

 # This is needed for NXP Cortex M devices
--- a/cpu/lpc2387/Makefile
+++ b/cpu/lpc2387/Makefile
@ -16,7 +16,4 @@ ifneq (,$(filter i2c,$(USEMODULE)))
 	DIRS += i2c
 endif

-all: $(BINDIR)$(MODULE).a
-	@for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ;
-
 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/mc1322x/Makefile
+++ b/cpu/mc1322x/Makefile
@ -11,7 +11,4 @@ ifneq (,$(filter mc1322x,$(USEMODULE)))
 	DIRS += maca
 endif

-all: $(BINDIR)$(MODULE).a
-	@for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ;
-
 include $(RIOTBASE)/Makefile.base
--- a/cpu/msp430x16x/Makefile
+++ b/cpu/msp430x16x/Makefile
@ -4,7 +4,4 @@ include $(RIOTCPU)/$(CPU)/Makefile.include

 DIRS = $(RIOTCPU)/msp430-common/

-all: $(BINDIR)$(MODULE).a
-	@for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ;
-
 include $(RIOTBASE)/Makefile.base
--- a/cpu/native/Makefile
+++ b/cpu/native/Makefile
@ -1,6 +1,5 @@
 MODULE = cpu

-DIRS =
 ifneq (,$(filter rtc,$(USEMODULE)))
 	DIRS += rtc
 endif
@ -8,9 +7,6 @@ ifneq (,$(filter nativenet,$(USEMODULE)))
 	DIRS += net
 endif

-all: $(BINDIR)$(MODULE).a
-	@for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ;
-
 include $(RIOTBASE)/Makefile.base

 $(BINDIR)$(MODULE)/%.o: %.c
--- 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/Makefile
+++ b/cpu/sam3x8e/Makefile
@ -1,21 +1,7 @@
-
 # define the module that is build
 MODULE = cpu

 # add a list of subdirectories, that should also be build
-DIRS = periph
-
-.PHONY: all $(CORTEX_COMMON)
-
-# when building the CPU module make sure, the STM std peripheral lib will also be build
-all: $(CORTEX_COMMON) $(BINDIR)$(MODULE).a
-	@for i in $(DIRS) ; do $(MAKE) -C $$i ; done ;
-
-$(CORTEX_COMMON):
-	@$(MAKE) -C $(CORTEX_COMMON)
+DIRS = periph $(CORTEX_COMMON)

 include $(RIOTBASE)/Makefile.base
-
-clean::
-	@for i in $(DIRS) ; do $(MAKE) -C $$i clean ; done ;
-	@$(MAKE) -C $(CORTEX_COMMON) clean
--- 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,6 +1,3 @@
-MODULE = drivers
-
-DIRS=
 ifneq (,$(filter powermon,$(USEMODULE)))
    DIRS += powermon
 endif
@ -35,7 +32,4 @@ ifneq (,$(filter lm75a,$(USEMODULE)))
    DIRS += lm75a
 endif

-all:
-	@for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ;
-
 include $(RIOTBASE)/Makefile.base
--- 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,6 +1,3 @@
-MODULE =cc110x_ng
-
-DIRS =
 ifneq (,$(filter msb-430h,$(BOARD)))
 	DIRS += spi
 endif
@ -11,7 +8,4 @@ ifneq (,$(filter wsn430-v1_3b,$(BOARD)))
 	DIRS += spi
 endif

-all: $(BINDIR)$(MODULE).a
-	@for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ;
-
 include $(RIOTBASE)/Makefile.base
--- 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/Makefile
+++ b/sys/Makefile
@ -1,4 +1,3 @@
-MODULE = sys
 ifneq (,$(filter auto_init,$(USEMODULE)))
    DIRS += auto_init
 endif
@ -93,7 +92,4 @@ ifneq (,$(filter oneway_malloc,$(USEMODULE)))
    DIRS += oneway-malloc
 endif

-all: $(BINDIR)$(MODULE).a
-	@for i in $(DIRS) ; do "$(MAKE)" -C $$i || exit 1; done ;
-
 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