make: replace MAKEBASE with RIOTBASE

closes https://github.com/RIOT-OS/RIOT/issues/959
9 years ago · 91814e52ae
parent dea33bd8b6
commit 91814e52ae
24 changed files with 23 additions and 24 deletions
--- a/Makefile.modules
+++ b/Makefile.modules
@ -1,4 +1,3 @@
-export MAKEBASE =$(RIOTBASE)
 UNDEF += $(BINDIR)startup.o

 include $(RIOTBASE)/Makefile.pseudomodules
--- a/cpu/arm_common/Makefile.include
+++ b/cpu/arm_common/Makefile.include
@ -1,3 +1,3 @@
-INCLUDES += -I$(MAKEBASE)/cpu/arm_common/include/
+INCLUDES += -I$(RIOTBASE)/cpu/arm_common/include/

 export UNDEF += $(BINDIR)syscalls.o
--- a/cpu/cc430/Makefile.include
+++ b/cpu/cc430/Makefile.include
@ -1,3 +1,3 @@
-INCLUDES += -I$(MAKEBASE)/cpu/cc430/include/
+INCLUDES += -I$(RIOTBASE)/cpu/cc430/include/

 include $(RIOTCPU)/msp430-common/Makefile.include
--- a/cpu/lpc1768/Makefile.include
+++ b/cpu/lpc1768/Makefile.include
@ -1,3 +1,3 @@
-INCLUDES += -I$(MAKEBASE)/cpu/lpc1768/include
+INCLUDES += -I$(RIOTBASE)/cpu/lpc1768/include

 export UNDEF += $(BINDIR)syscalls.o
--- a/cpu/lpc2387/gpioint/Makefile
+++ b/cpu/lpc2387/gpioint/Makefile
@ -1,3 +1,3 @@
 MODULE =gpioint

-include $(MAKEBASE)/Makefile.base
+include $(RIOTBASE)/Makefile.base
--- a/cpu/lpc2387/i2c/Makefile
+++ b/cpu/lpc2387/i2c/Makefile
@ -1,3 +1,3 @@
 MODULE =i2c

-include $(MAKEBASE)/Makefile.base
+include $(RIOTBASE)/Makefile.base
--- a/cpu/lpc2387/mci/Makefile
+++ b/cpu/lpc2387/mci/Makefile
@ -1,3 +1,3 @@
 MODULE =mci

-include $(MAKEBASE)/Makefile.base
+include $(RIOTBASE)/Makefile.base
--- a/cpu/lpc2387/rtc/Makefile
+++ b/cpu/lpc2387/rtc/Makefile
@ -1,3 +1,3 @@
 MODULE =rtc

-include $(MAKEBASE)/Makefile.base
+include $(RIOTBASE)/Makefile.base
--- a/cpu/mc1322x/Makefile.include
+++ b/cpu/mc1322x/Makefile.include
@ -1,4 +1,4 @@
-INCLUDES += -I$(MAKEBASE)/cpu/mc1322x/include
+INCLUDES += -I$(RIOTBASE)/cpu/mc1322x/include

 include $(RIOTCPU)/arm_common/Makefile.include

--- a/cpu/mc1322x/adc/Makefile
+++ b/cpu/mc1322x/adc/Makefile
@ -2,4 +2,4 @@ INCLUDES = -I$(RIOTBASE)/cpu/mc1322x/adc/include

 MODULE =mc1322x_adc

-include $(MAKEBASE)/Makefile.base
+include $(RIOTBASE)/Makefile.base
--- a/cpu/mc1322x/asm/Makefile
+++ b/cpu/mc1322x/asm/Makefile
@ -2,4 +2,4 @@ INCLUDES = -I$(RIOTBASE)/cpu/mc1322x/asm/include

 MODULE =mc1322x_asm

-include $(MAKEBASE)/Makefile.base
+include $(RIOTBASE)/Makefile.base
--- a/cpu/mc1322x/maca/Makefile
+++ b/cpu/mc1322x/maca/Makefile
@ -2,4 +2,4 @@ INCLUDES = -I$(RIOTBASE)/cpu/mc1322x/include -I$(RIOTBASE)/cpu/mc1322x/maca/incl

 MODULE =mc1322x

-include $(MAKEBASE)/Makefile.base
+include $(RIOTBASE)/Makefile.base
--- a/cpu/msp430-common/Makefile.include
+++ b/cpu/msp430-common/Makefile.include
@ -1 +1 @@
-INCLUDES += -I$(MAKEBASE)/cpu/msp430-common/include/
+INCLUDES += -I$(RIOTBASE)/cpu/msp430-common/include/
--- a/cpu/native/net/Makefile
+++ b/cpu/native/net/Makefile
@ -1,6 +1,6 @@
 MODULE = nativenet

-include $(MAKEBASE)/Makefile.base
+include $(RIOTBASE)/Makefile.base

 $(BINDIR)%.o: %.c
 	$(AD)$(CC) $(CFLAGS) $(NATIVEINCLUDES) -c $*.c -o $(BINDIR)$*.o
--- a/cpu/native/rtc/Makefile
+++ b/cpu/native/rtc/Makefile
@ -1,6 +1,6 @@
 MODULE =rtc

-include $(MAKEBASE)/Makefile.base
+include $(RIOTBASE)/Makefile.base

 $(BINDIR)%.o: %.c
 	$(AD)$(CC) $(CFLAGS) $(NATIVEINCLUDES) -c $*.c -o $(BINDIR)$*.o
--- a/drivers/cc110x/Makefile
+++ b/drivers/cc110x/Makefile
@ -1,3 +1,3 @@
 MODULE =cc110x

-include $(MAKEBASE)/Makefile.base
+include $(RIOTBASE)/Makefile.base
--- a/drivers/cc110x_ng/spi/Makefile
+++ b/drivers/cc110x_ng/spi/Makefile
@ -2,4 +2,4 @@ MODULE =cc110x_spi

 INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng

-include $(MAKEBASE)/Makefile.base
+include $(RIOTBASE)/Makefile.base
--- a/drivers/lm75a/Makefile
+++ b/drivers/lm75a/Makefile
@ -1,2 +1,2 @@
 MODULE =lm75a
-include $(MAKEBASE)/Makefile.base
+include $(RIOTBASE)/Makefile.base
--- a/drivers/ltc4150/Makefile
+++ b/drivers/ltc4150/Makefile
@ -1,2 +1,2 @@
 MODULE =ltc4150
-include $(MAKEBASE)/Makefile.base
+include $(RIOTBASE)/Makefile.base
--- a/drivers/sht11/Makefile
+++ b/drivers/sht11/Makefile
@ -1,2 +1,2 @@
 MODULE =sht11
-include $(MAKEBASE)/Makefile.base
+include $(RIOTBASE)/Makefile.base
--- a/drivers/srf02/Makefile
+++ b/drivers/srf02/Makefile
@ -1,2 +1,2 @@
 MODULE =srf02
-include $(MAKEBASE)/Makefile.base
+include $(RIOTBASE)/Makefile.base
--- a/drivers/srf08/Makefile
+++ b/drivers/srf08/Makefile
@ -1,2 +1,2 @@
 MODULE =srf08
-include $(MAKEBASE)/Makefile.base
+include $(RIOTBASE)/Makefile.base
--- a/sys/transceiver/Makefile
+++ b/sys/transceiver/Makefile
@ -12,4 +12,4 @@ ifneq (,$(filter mc1322x,$(USEMODULE)))
 	INCLUDES += -I$(RIOTBASE)/sys/net/include
 endif

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

-include $(MAKEBASE)/Makefile.base
+include $(RIOTBASE)/Makefile.base