From c7d985d371e7fa165ea54a3834c117459e4806b0 Mon Sep 17 00:00:00 2001
From: Oleg Hahm <oleg@hobbykeller.org>
Date: Mon, 23 Dec 2013 23:19:17 +0100
Subject: [PATCH] removed redundant include pathes from Makefiles
---
Makefile | 3 +++
Makefile.base | 3 ---
boards/avsextrem/Makefile | 2 --
boards/chronos/Makefile | 2 --
boards/mbed_lpc1768/Makefile | 2 --
boards/mbed_lpc1768/Makefile.include | 3 +--
boards/msb-430-common/Makefile | 2 --
boards/msb-430/Makefile | 2 --
boards/msb-430h/Makefile | 2 --
boards/msba2-common/Makefile | 1 -
boards/msba2/Makefile | 1 -
boards/native/Makefile | 2 --
boards/native/drivers/Makefile | 2 --
boards/redbee-econotag/Makefile | 2 --
boards/telosb/Makefile | 2 --
boards/wsn430-common/Makefile | 2 --
boards/wsn430-v1_3b/Makefile | 2 --
boards/wsn430-v1_4/Makefile | 2 --
core/Makefile | 2 --
cpu/cc430/Makefile | 1 -
cpu/lpc2387/Makefile | 3 ++-
cpu/lpc2387/gpioint/Makefile | 2 --
cpu/lpc2387/mci/Makefile | 2 --
cpu/lpc2387/rtc/Makefile | 2 --
cpu/msp430-common/Makefile | 1 -
cpu/msp430x16x/Makefile | 3 ++-
cpu/native/Makefile | 2 --
cpu/native/net/Makefile | 2 --
cpu/native/rtc/Makefile | 2 --
drivers/Makefile | 1 -
drivers/cc110x_ng/spi/Makefile | 2 --
sys/Makefile | 3 +--
sys/net/link_layer/protocol-multiplex/Makefile | 2 ++
33 files changed, 11 insertions(+), 56 deletions(-)
diff --git a/Makefile b/Makefile
index 1d41fa5b5e..cc2095343a 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,9 @@ DIRS = $(RIOTCPU)/$(CPU) core drivers sys
.PHONY: all clean doc
+include $(RIOTCPU)/$(CPU)/Makefile.include
+include $(RIOTBOARD)/$(BOARD)/Makefile.include
+
all:
mkdir -p $(BINDIR)
@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;
diff --git a/Makefile.base b/Makefile.base
index 500c6b6a80..dbc33f8811 100644
--- a/Makefile.base
+++ b/Makefile.base
@@ -23,9 +23,6 @@ export CFLAGS += -DVERSION=\"$(GIT_VERSION)\"
.PHONY: clean
-include $(RIOTCPU)/$(CPU)/Makefile.include
-include $(RIOTBOARD)/$(BOARD)/Makefile.include
-
$(BINDIR)$(MODULE).a: $(OBJ) $(ASMOBJ)
@$(AR) -rc $(BINDIR)$(MODULE).a $(OBJ) $(ASMOBJ)
diff --git a/boards/avsextrem/Makefile b/boards/avsextrem/Makefile
index 6d0e8b94aa..9a90303614 100644
--- a/boards/avsextrem/Makefile
+++ b/boards/avsextrem/Makefile
@@ -1,7 +1,5 @@
MODULE =$(BOARD)_base
-include $(RIOTBOARD)/$(BOARD)/Makefile.include
-
DIRS = drivers $(RIOTBOARD)/msba2-common
all: $(BINDIR)$(MODULE).a
diff --git a/boards/chronos/Makefile b/boards/chronos/Makefile
index 9b021711be..08503227da 100644
--- a/boards/chronos/Makefile
+++ b/boards/chronos/Makefile
@@ -1,7 +1,5 @@
MODULE =$(BOARD)_base
-include $(RIOTBOARD)/$(BOARD)/Makefile.include
-
DIRS = drivers
all: $(BINDIR)$(MODULE).a
diff --git a/boards/mbed_lpc1768/Makefile b/boards/mbed_lpc1768/Makefile
index a1a4f9665a..ff5489888b 100644
--- a/boards/mbed_lpc1768/Makefile
+++ b/boards/mbed_lpc1768/Makefile
@@ -1,5 +1,3 @@
MODULE =$(BOARD)_base
-include $(RIOTBOARD)/$(BOARD)/Makefile.include
-
include $(RIOTBASE)/Makefile.base
diff --git a/boards/mbed_lpc1768/Makefile.include b/boards/mbed_lpc1768/Makefile.include
index 1a80e03728..48f3b63bb4 100644
--- a/boards/mbed_lpc1768/Makefile.include
+++ b/boards/mbed_lpc1768/Makefile.include
@@ -23,6 +23,5 @@ export FFLAGS = $(HEXFILE)
export ELFFILE = bin/$(PROJECT).elf
export DEBUGGER_FLAGS = $(ELFFILE)
-INCLUDES += -Iinclude/
-INCLUDES += -I$(RIOTCPU)/$(CPU)/include
+INCLUDES += -Iinclude/ -I$(RIOTCPU)/$(CPU)/include
export OFLAGS = -O binary
diff --git a/boards/msb-430-common/Makefile b/boards/msb-430-common/Makefile
index 9b021711be..08503227da 100644
--- a/boards/msb-430-common/Makefile
+++ b/boards/msb-430-common/Makefile
@@ -1,7 +1,5 @@
MODULE =$(BOARD)_base
-include $(RIOTBOARD)/$(BOARD)/Makefile.include
-
DIRS = drivers
all: $(BINDIR)$(MODULE).a
diff --git a/boards/msb-430/Makefile b/boards/msb-430/Makefile
index d61c7c8f29..0a7ebeb637 100644
--- a/boards/msb-430/Makefile
+++ b/boards/msb-430/Makefile
@@ -1,7 +1,5 @@
MODULE =$(BOARD)_base
-include $(RIOTBOARD)/$(BOARD)/Makefile.include
-
DIRS = $(RIOTBOARD)/msb-430-common
all: $(BINDIR)$(MODULE).a
diff --git a/boards/msb-430h/Makefile b/boards/msb-430h/Makefile
index d61c7c8f29..0a7ebeb637 100644
--- a/boards/msb-430h/Makefile
+++ b/boards/msb-430h/Makefile
@@ -1,7 +1,5 @@
MODULE =$(BOARD)_base
-include $(RIOTBOARD)/$(BOARD)/Makefile.include
-
DIRS = $(RIOTBOARD)/msb-430-common
all: $(BINDIR)$(MODULE).a
diff --git a/boards/msba2-common/Makefile b/boards/msba2-common/Makefile
index 04766aa7f5..08503227da 100644
--- a/boards/msba2-common/Makefile
+++ b/boards/msba2-common/Makefile
@@ -1,5 +1,4 @@
MODULE =$(BOARD)_base
-include $(RIOTBOARD)/$(BOARD)/Makefile.include
DIRS = drivers
diff --git a/boards/msba2/Makefile b/boards/msba2/Makefile
index ab866cfdd9..12fef1c0ed 100644
--- a/boards/msba2/Makefile
+++ b/boards/msba2/Makefile
@@ -1,5 +1,4 @@
MODULE =$(BOARD)_base
-include $(RIOTBOARD)/$(BOARD)/Makefile.include
INCLUDES += -I$(RIOTBASE)/drivers/cc110x
DIRS = $(RIOTBOARD)/msba2-common
diff --git a/boards/native/Makefile b/boards/native/Makefile
index 9b021711be..08503227da 100644
--- a/boards/native/Makefile
+++ b/boards/native/Makefile
@@ -1,7 +1,5 @@
MODULE =$(BOARD)_base
-include $(RIOTBOARD)/$(BOARD)/Makefile.include
-
DIRS = drivers
all: $(BINDIR)$(MODULE).a
diff --git a/boards/native/drivers/Makefile b/boards/native/drivers/Makefile
index ab6caa06bd..9dd5bad5e4 100644
--- a/boards/native/drivers/Makefile
+++ b/boards/native/drivers/Makefile
@@ -1,7 +1,5 @@
MODULE =$(BOARD)_base
-include $(RIOTBOARD)/$(BOARD)/Makefile.include
-
all: $(BINDIR)$(MODULE).a
@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;
diff --git a/boards/redbee-econotag/Makefile b/boards/redbee-econotag/Makefile
index 9b021711be..08503227da 100644
--- a/boards/redbee-econotag/Makefile
+++ b/boards/redbee-econotag/Makefile
@@ -1,7 +1,5 @@
MODULE =$(BOARD)_base
-include $(RIOTBOARD)/$(BOARD)/Makefile.include
-
DIRS = drivers
all: $(BINDIR)$(MODULE).a
diff --git a/boards/telosb/Makefile b/boards/telosb/Makefile
index a1a4f9665a..ff5489888b 100644
--- a/boards/telosb/Makefile
+++ b/boards/telosb/Makefile
@@ -1,5 +1,3 @@
MODULE =$(BOARD)_base
-include $(RIOTBOARD)/$(BOARD)/Makefile.include
-
include $(RIOTBASE)/Makefile.base
diff --git a/boards/wsn430-common/Makefile b/boards/wsn430-common/Makefile
index 9b021711be..08503227da 100644
--- a/boards/wsn430-common/Makefile
+++ b/boards/wsn430-common/Makefile
@@ -1,7 +1,5 @@
MODULE =$(BOARD)_base
-include $(RIOTBOARD)/$(BOARD)/Makefile.include
-
DIRS = drivers
all: $(BINDIR)$(MODULE).a
diff --git a/boards/wsn430-v1_3b/Makefile b/boards/wsn430-v1_3b/Makefile
index fa371cab29..7f7fba05ea 100644
--- a/boards/wsn430-v1_3b/Makefile
+++ b/boards/wsn430-v1_3b/Makefile
@@ -1,7 +1,5 @@
MODULE =$(BOARD)_base
-include $(RIOTBOARD)/$(BOARD)/Makefile.include
-
DIRS = $(RIOTBOARD)/wsn430-common
all: $(BINDIR)$(MODULE).a
diff --git a/boards/wsn430-v1_4/Makefile b/boards/wsn430-v1_4/Makefile
index fa371cab29..7f7fba05ea 100644
--- a/boards/wsn430-v1_4/Makefile
+++ b/boards/wsn430-v1_4/Makefile
@@ -1,7 +1,5 @@
MODULE =$(BOARD)_base
-include $(RIOTBOARD)/$(BOARD)/Makefile.include
-
DIRS = $(RIOTBOARD)/wsn430-common
all: $(BINDIR)$(MODULE).a
diff --git a/core/Makefile b/core/Makefile
index 57938d4829..d420149bd2 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1,5 +1,3 @@
MODULE =core
-INCLUDES = -Iinclude -I$(RIOTBASE)/sys/include -I$(RIOTCPU)/$(CPU)/include
-
include $(RIOTBASE)/Makefile.base
diff --git a/cpu/cc430/Makefile b/cpu/cc430/Makefile
index d08377bd38..3e10d1237a 100644
--- a/cpu/cc430/Makefile
+++ b/cpu/cc430/Makefile
@@ -1,6 +1,5 @@
MODULE = cpu
-INCLUDES += -I$(RIOTCPU)/$(CPU)/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/cc110x_ng/include
DIRS = $(RIOTCPU)/msp430-common
all: $(BINDIR)$(MODULE).a
diff --git a/cpu/lpc2387/Makefile b/cpu/lpc2387/Makefile
index 461827d5f9..8b9db75619 100644
--- a/cpu/lpc2387/Makefile
+++ b/cpu/lpc2387/Makefile
@@ -1,6 +1,7 @@
MODULE =cpu
-INCLUDES = -I../include -Idrivers/include -I../arm_common/include -I../../sys/lib -I../../drivers/include -I../../core/include -I../../sys/include -I../../hal/include -I../../..
+include $(RIOTCPU)/$(CPU)/Makefile.include
+
DIRS = $(RIOTCPU)/arm_common $(RIOTCPU)/lpc_common
ifneq (,$(findstring gpioint,$(USEMODULE)))
DIRS += gpioint
diff --git a/cpu/lpc2387/gpioint/Makefile b/cpu/lpc2387/gpioint/Makefile
index 758cd9f320..edd98724dd 100644
--- a/cpu/lpc2387/gpioint/Makefile
+++ b/cpu/lpc2387/gpioint/Makefile
@@ -1,5 +1,3 @@
-INCLUDES = -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/sys/include -I../../net -I../include -I../../lib -I../../../.. -I../../../cpu/ -I../../../core/include -I../../
-
MODULE =gpioint
include $(MAKEBASE)/Makefile.base
diff --git a/cpu/lpc2387/mci/Makefile b/cpu/lpc2387/mci/Makefile
index 9034267a5b..22fd2a480b 100644
--- a/cpu/lpc2387/mci/Makefile
+++ b/cpu/lpc2387/mci/Makefile
@@ -1,5 +1,3 @@
-INCLUDES = -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/sys/include -I../../net -I../include -I../../lib -I../../../.. -I../../../cpu/ -I../../../core/include -I../../
-
MODULE =mci
include $(MAKEBASE)/Makefile.base
diff --git a/cpu/lpc2387/rtc/Makefile b/cpu/lpc2387/rtc/Makefile
index 8cd5c1e0af..64278b51d6 100644
--- a/cpu/lpc2387/rtc/Makefile
+++ b/cpu/lpc2387/rtc/Makefile
@@ -1,5 +1,3 @@
-INCLUDES = -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/core/include
-
MODULE =rtc
include $(MAKEBASE)/Makefile.base
diff --git a/cpu/msp430-common/Makefile b/cpu/msp430-common/Makefile
index 0a92437f97..4d745160cd 100644
--- a/cpu/msp430-common/Makefile
+++ b/cpu/msp430-common/Makefile
@@ -1,6 +1,5 @@
MODULE =msp430_common
-INCLUDES += -Iinclude -I$(RIOTBASE)/core/include/ -I$(RIOTBOARD)/$(BOARD)/include
DIRS =
all: $(BINDIR)$(MODULE).a
diff --git a/cpu/msp430x16x/Makefile b/cpu/msp430x16x/Makefile
index 0d95efd3a9..3b9fcd10ac 100644
--- a/cpu/msp430x16x/Makefile
+++ b/cpu/msp430x16x/Makefile
@@ -1,6 +1,7 @@
MODULE =cpu
-INCLUDES = -I../include -I$(RIOTBASE)/core/include
+include $(RIOTCPU)/$(CPU)/Makefile.include
+
DIRS = $(RIOTCPU)/msp430-common/
all: $(BINDIR)$(MODULE).a
diff --git a/cpu/native/Makefile b/cpu/native/Makefile
index d5d520f74b..d8e6b930b1 100644
--- a/cpu/native/Makefile
+++ b/cpu/native/Makefile
@@ -1,7 +1,5 @@
MODULE = cpu
-INCLUDES += -I../include -I$(RIOTBASE)/core/include
-
EXCLUDES := -I$(RIOTBASE)/sys/posix/%
DIRS =
diff --git a/cpu/native/net/Makefile b/cpu/native/net/Makefile
index 3ce631f49c..8679594811 100644
--- a/cpu/native/net/Makefile
+++ b/cpu/native/net/Makefile
@@ -1,5 +1,3 @@
-INCLUDES += -I$(RIOTBASE)/core/include -I$(RIOTBASE)/sys/include
-
EXCLUDES := -I$(RIOTBASE)/sys/posix/%
MODULE = nativenet
diff --git a/cpu/native/rtc/Makefile b/cpu/native/rtc/Makefile
index 8cd5c1e0af..64278b51d6 100644
--- a/cpu/native/rtc/Makefile
+++ b/cpu/native/rtc/Makefile
@@ -1,5 +1,3 @@
-INCLUDES = -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/core/include
-
MODULE =rtc
include $(MAKEBASE)/Makefile.base
diff --git a/drivers/Makefile b/drivers/Makefile
index 709eb35d7a..4a5d79a370 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -1,5 +1,4 @@
MODULE = drivers
-INCLUDES = -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(CURDIR)/include -Iinclude -I$(RIOTBASE)/sys/net/include
DIRS=
ifneq (,$(findstring powermon,$(USEMODULE)))
diff --git a/drivers/cc110x_ng/spi/Makefile b/drivers/cc110x_ng/spi/Makefile
index 644fb0062e..c7b442df9f 100644
--- a/drivers/cc110x_ng/spi/Makefile
+++ b/drivers/cc110x_ng/spi/Makefile
@@ -1,5 +1,3 @@
-INCLUDES = -I$(RIOTBASE)/sys/include -I../../net -I../include -I../../lib -I../../../.. -I../../../cpu/ -I$(RIOTBASE)/core/include -I../../ -Iinclude/
-
MODULE =cc110x_spi
include $(MAKEBASE)/Makefile.base
diff --git a/sys/Makefile b/sys/Makefile
index 020f0c24ec..58020bfd19 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -1,5 +1,3 @@
-export INCLUDES = -Iinclude -I$(CURDIR)/include -I$(RIOTBASE)/sys/net/include -I$(RIOTBASE)/drivers/include -I$(RIOTCPU)/$(CPU)/include -I$(RIOTBASE)/core/include
-
MODULE =sys
ifneq (,$(findstring auto_init,$(USEMODULE)))
DIRS += auto_init
@@ -17,6 +15,7 @@ ifneq (,$(findstring ps,$(USEMODULE)))
DIRS += ps
endif
ifneq (,$(findstring posix,$(USEMODULE)))
+ INCLUDES += -I$(RIOTBASE)/sys/posix/include
DIRS += posix
endif
ifneq (,$(findstring shell,$(USEMODULE)))
diff --git a/sys/net/link_layer/protocol-multiplex/Makefile b/sys/net/link_layer/protocol-multiplex/Makefile
index 10d40e8e0e..764e02c5b2 100644
--- a/sys/net/link_layer/protocol-multiplex/Makefile
+++ b/sys/net/link_layer/protocol-multiplex/Makefile
@@ -1,3 +1,5 @@
+INCLUDES += -I$(RIOTBASE)/sys/net/include
+
MODULE:=protocol_multiplex
include $(RIOTBASE)/Makefile.base
--
GitLab