diff --git a/Makefile.modules b/Makefile.modules index fa326974881f4d06d938891c5e7e5aa29f3cd8e7..0c378806e7e7e8f28f9088e4e58dac0ab8329d86 100644 --- a/Makefile.modules +++ b/Makefile.modules @@ -1,4 +1,3 @@ -export MAKEBASE =$(RIOTBASE) UNDEF += $(BINDIR)startup.o include $(RIOTBASE)/Makefile.pseudomodules diff --git a/cpu/arm_common/Makefile.include b/cpu/arm_common/Makefile.include index 4ffd7b0de8356c7e3afaaada5add18008792c848..2314e46239831b2b007b8d4721484fb67d06baa3 100644 --- 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 diff --git a/cpu/cc430/Makefile.include b/cpu/cc430/Makefile.include index ae7de8cc19464d7ae4e809da7d8dd26a8c97e83d..cbad77615809d89dc70d902075a5ff6972d6f5c7 100644 --- 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 diff --git a/cpu/lpc1768/Makefile.include b/cpu/lpc1768/Makefile.include index bacb82189b023b2cb34b389f89176f118ad1714d..d3ef771ec2f294ccdc760cedf8b730df96a1356d 100644 --- 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 diff --git a/cpu/lpc2387/gpioint/Makefile b/cpu/lpc2387/gpioint/Makefile index 695bc04395a36c737a6234f426e9743c113ab47a..960dd49c72c66d24dd5973584ad1f89a986bcf2f 100644 --- a/cpu/lpc2387/gpioint/Makefile +++ b/cpu/lpc2387/gpioint/Makefile @@ -1,3 +1,3 @@ MODULE =gpioint -include $(MAKEBASE)/Makefile.base +include $(RIOTBASE)/Makefile.base diff --git a/cpu/lpc2387/i2c/Makefile b/cpu/lpc2387/i2c/Makefile index e1c5af410ed7f6a561e2835bc2622b6f12ac99ea..5a2dc6bbd52b56504202b25cf8482896cf4f90cb 100644 --- a/cpu/lpc2387/i2c/Makefile +++ b/cpu/lpc2387/i2c/Makefile @@ -1,3 +1,3 @@ MODULE =i2c -include $(MAKEBASE)/Makefile.base +include $(RIOTBASE)/Makefile.base diff --git a/cpu/lpc2387/mci/Makefile b/cpu/lpc2387/mci/Makefile index 970c9d87f53bdf057cfc66e97f87daff8fa9a9ae..43164be73383fd45c02c7eb37fbf6ee61b52f484 100644 --- a/cpu/lpc2387/mci/Makefile +++ b/cpu/lpc2387/mci/Makefile @@ -1,3 +1,3 @@ MODULE =mci -include $(MAKEBASE)/Makefile.base +include $(RIOTBASE)/Makefile.base diff --git a/cpu/lpc2387/rtc/Makefile b/cpu/lpc2387/rtc/Makefile index 4d24181c9931b49adb796a5926373525c84b8314..042b6118085ea60c1df20be3fd1f607139fd58c8 100644 --- a/cpu/lpc2387/rtc/Makefile +++ b/cpu/lpc2387/rtc/Makefile @@ -1,3 +1,3 @@ MODULE =rtc -include $(MAKEBASE)/Makefile.base +include $(RIOTBASE)/Makefile.base diff --git a/cpu/mc1322x/Makefile.include b/cpu/mc1322x/Makefile.include index 9bc7621575ea308b23e73d048d303f2a379b7f79..20f8afee4ba50f714c4c4585da168501c6b01f4d 100644 --- 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 diff --git a/cpu/mc1322x/adc/Makefile b/cpu/mc1322x/adc/Makefile index 4e1bdca68c47e189c478e5797e2cbd8dc699e0d0..a4edfd7d060d3411dcd5d2203fd2569b52cdd98f 100644 --- 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 diff --git a/cpu/mc1322x/asm/Makefile b/cpu/mc1322x/asm/Makefile index 6f90f688342635b0c8ae4d3707a9461f0b682960..82c3626ff91364fb0a295a1caa96efe240300a44 100644 --- 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 diff --git a/cpu/mc1322x/maca/Makefile b/cpu/mc1322x/maca/Makefile index a6cf750214f34d8f8b68e8b157cd4a6f9fb1debc..373dd437fc3a378ae69f7c4b258fba7fc1e41eaa 100644 --- 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 diff --git a/cpu/msp430-common/Makefile.include b/cpu/msp430-common/Makefile.include index e08934176769c210095c4637baba43cd24b0aa0c..caa62451a9795b06d5537387aec81e2461986da7 100644 --- 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/ diff --git a/cpu/native/net/Makefile b/cpu/native/net/Makefile index 6f69094f824606f80fb16d7387f5a119c7d8ed63..0c4702e0a20f53b17b4dd442b3e8f438db1b6a20 100644 --- 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 diff --git a/cpu/native/rtc/Makefile b/cpu/native/rtc/Makefile index 13b8ace18bb1c13b838cd563fc7d3bebf03d98cc..717274edc2243a8497eb880c00ca07ebb40df698 100644 --- 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 diff --git a/drivers/cc110x/Makefile b/drivers/cc110x/Makefile index da9308bbd52828163d725585287e5d69aeffd5e1..da43c6b942f400eea445c7fd2aea8bb321a109ff 100644 --- a/drivers/cc110x/Makefile +++ b/drivers/cc110x/Makefile @@ -1,3 +1,3 @@ MODULE =cc110x -include $(MAKEBASE)/Makefile.base +include $(RIOTBASE)/Makefile.base diff --git a/drivers/cc110x_ng/spi/Makefile b/drivers/cc110x_ng/spi/Makefile index d73874dec2dcab2e5d138d6aabd4caf9899ba5fd..a66970b0331649e0d7f26453861877e90856412c 100644 --- 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 diff --git a/drivers/lm75a/Makefile b/drivers/lm75a/Makefile index f96cb2a3d60e1da96f52d83e4de3543617028b4e..b1095f7fc04b6c937b9ba43029311f85ecf67a0e 100644 --- a/drivers/lm75a/Makefile +++ b/drivers/lm75a/Makefile @@ -1,2 +1,2 @@ MODULE =lm75a -include $(MAKEBASE)/Makefile.base +include $(RIOTBASE)/Makefile.base diff --git a/drivers/ltc4150/Makefile b/drivers/ltc4150/Makefile index 29b91b361afda077b498dec684956b3221ea4d40..42881d61956354831bae076c4c70db7f30d70732 100644 --- a/drivers/ltc4150/Makefile +++ b/drivers/ltc4150/Makefile @@ -1,2 +1,2 @@ MODULE =ltc4150 -include $(MAKEBASE)/Makefile.base +include $(RIOTBASE)/Makefile.base diff --git a/drivers/sht11/Makefile b/drivers/sht11/Makefile index 1f88712aa4da5aa4d6d34a6e673ba7291ed0b495..0ccc6b38b25883f36443a24ea1cb71a7bd412342 100644 --- a/drivers/sht11/Makefile +++ b/drivers/sht11/Makefile @@ -1,2 +1,2 @@ MODULE =sht11 -include $(MAKEBASE)/Makefile.base +include $(RIOTBASE)/Makefile.base diff --git a/drivers/srf02/Makefile b/drivers/srf02/Makefile index 31ac029367330b7c4175086c8086f6eaa97fb506..6e23e8fe1adf1a239aad3baa953f6d5a0092676a 100644 --- a/drivers/srf02/Makefile +++ b/drivers/srf02/Makefile @@ -1,2 +1,2 @@ MODULE =srf02 -include $(MAKEBASE)/Makefile.base +include $(RIOTBASE)/Makefile.base diff --git a/drivers/srf08/Makefile b/drivers/srf08/Makefile index 92e653175490155d5f4813c6e27023da05009765..ec63204246985584e06883e98c892c207fc9a08d 100644 --- a/drivers/srf08/Makefile +++ b/drivers/srf08/Makefile @@ -1,2 +1,2 @@ MODULE =srf08 -include $(MAKEBASE)/Makefile.base +include $(RIOTBASE)/Makefile.base diff --git a/sys/transceiver/Makefile b/sys/transceiver/Makefile index 2828e7bb28cd580809b8c46b8ca638c6c5e4bdce..6b3ed1b85f172f347f7b5922b0a4efe3bd277e3e 100644 --- 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 diff --git a/sys/uart0/Makefile b/sys/uart0/Makefile index 04f1ef49f3051fa3a2436ad9cfb707445fb3f003..64c07fc24f7608aa2cb174182f6943f0b87f6364 100644 --- a/sys/uart0/Makefile +++ b/sys/uart0/Makefile @@ -1,3 +1,3 @@ MODULE = uart0 -include $(MAKEBASE)/Makefile.base +include $(RIOTBASE)/Makefile.base