mirror of
https://github.com/RIOT-OS/RIOT.git
synced 2024-12-29 04:50:03 +01:00
removed redundant include pathes from Makefiles
This commit is contained in:
parent
26c50522d5
commit
c7d985d371
3
Makefile
3
Makefile
@ -2,6 +2,9 @@ DIRS = $(RIOTCPU)/$(CPU) core drivers sys
|
|||||||
|
|
||||||
.PHONY: all clean doc
|
.PHONY: all clean doc
|
||||||
|
|
||||||
|
include $(RIOTCPU)/$(CPU)/Makefile.include
|
||||||
|
include $(RIOTBOARD)/$(BOARD)/Makefile.include
|
||||||
|
|
||||||
all:
|
all:
|
||||||
mkdir -p $(BINDIR)
|
mkdir -p $(BINDIR)
|
||||||
@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;
|
@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;
|
||||||
|
@ -23,9 +23,6 @@ export CFLAGS += -DVERSION=\"$(GIT_VERSION)\"
|
|||||||
|
|
||||||
.PHONY: clean
|
.PHONY: clean
|
||||||
|
|
||||||
include $(RIOTCPU)/$(CPU)/Makefile.include
|
|
||||||
include $(RIOTBOARD)/$(BOARD)/Makefile.include
|
|
||||||
|
|
||||||
$(BINDIR)$(MODULE).a: $(OBJ) $(ASMOBJ)
|
$(BINDIR)$(MODULE).a: $(OBJ) $(ASMOBJ)
|
||||||
@$(AR) -rc $(BINDIR)$(MODULE).a $(OBJ) $(ASMOBJ)
|
@$(AR) -rc $(BINDIR)$(MODULE).a $(OBJ) $(ASMOBJ)
|
||||||
|
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
MODULE =$(BOARD)_base
|
MODULE =$(BOARD)_base
|
||||||
|
|
||||||
include $(RIOTBOARD)/$(BOARD)/Makefile.include
|
|
||||||
|
|
||||||
DIRS = drivers $(RIOTBOARD)/msba2-common
|
DIRS = drivers $(RIOTBOARD)/msba2-common
|
||||||
|
|
||||||
all: $(BINDIR)$(MODULE).a
|
all: $(BINDIR)$(MODULE).a
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
MODULE =$(BOARD)_base
|
MODULE =$(BOARD)_base
|
||||||
|
|
||||||
include $(RIOTBOARD)/$(BOARD)/Makefile.include
|
|
||||||
|
|
||||||
DIRS = drivers
|
DIRS = drivers
|
||||||
|
|
||||||
all: $(BINDIR)$(MODULE).a
|
all: $(BINDIR)$(MODULE).a
|
||||||
|
@ -1,5 +1,3 @@
|
|||||||
MODULE =$(BOARD)_base
|
MODULE =$(BOARD)_base
|
||||||
|
|
||||||
include $(RIOTBOARD)/$(BOARD)/Makefile.include
|
|
||||||
|
|
||||||
include $(RIOTBASE)/Makefile.base
|
include $(RIOTBASE)/Makefile.base
|
||||||
|
@ -23,6 +23,5 @@ export FFLAGS = $(HEXFILE)
|
|||||||
export ELFFILE = bin/$(PROJECT).elf
|
export ELFFILE = bin/$(PROJECT).elf
|
||||||
export DEBUGGER_FLAGS = $(ELFFILE)
|
export DEBUGGER_FLAGS = $(ELFFILE)
|
||||||
|
|
||||||
INCLUDES += -Iinclude/
|
INCLUDES += -Iinclude/ -I$(RIOTCPU)/$(CPU)/include
|
||||||
INCLUDES += -I$(RIOTCPU)/$(CPU)/include
|
|
||||||
export OFLAGS = -O binary
|
export OFLAGS = -O binary
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
MODULE =$(BOARD)_base
|
MODULE =$(BOARD)_base
|
||||||
|
|
||||||
include $(RIOTBOARD)/$(BOARD)/Makefile.include
|
|
||||||
|
|
||||||
DIRS = drivers
|
DIRS = drivers
|
||||||
|
|
||||||
all: $(BINDIR)$(MODULE).a
|
all: $(BINDIR)$(MODULE).a
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
MODULE =$(BOARD)_base
|
MODULE =$(BOARD)_base
|
||||||
|
|
||||||
include $(RIOTBOARD)/$(BOARD)/Makefile.include
|
|
||||||
|
|
||||||
DIRS = $(RIOTBOARD)/msb-430-common
|
DIRS = $(RIOTBOARD)/msb-430-common
|
||||||
|
|
||||||
all: $(BINDIR)$(MODULE).a
|
all: $(BINDIR)$(MODULE).a
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
MODULE =$(BOARD)_base
|
MODULE =$(BOARD)_base
|
||||||
|
|
||||||
include $(RIOTBOARD)/$(BOARD)/Makefile.include
|
|
||||||
|
|
||||||
DIRS = $(RIOTBOARD)/msb-430-common
|
DIRS = $(RIOTBOARD)/msb-430-common
|
||||||
|
|
||||||
all: $(BINDIR)$(MODULE).a
|
all: $(BINDIR)$(MODULE).a
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
MODULE =$(BOARD)_base
|
MODULE =$(BOARD)_base
|
||||||
include $(RIOTBOARD)/$(BOARD)/Makefile.include
|
|
||||||
|
|
||||||
DIRS = drivers
|
DIRS = drivers
|
||||||
|
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
MODULE =$(BOARD)_base
|
MODULE =$(BOARD)_base
|
||||||
include $(RIOTBOARD)/$(BOARD)/Makefile.include
|
|
||||||
INCLUDES += -I$(RIOTBASE)/drivers/cc110x
|
INCLUDES += -I$(RIOTBASE)/drivers/cc110x
|
||||||
|
|
||||||
DIRS = $(RIOTBOARD)/msba2-common
|
DIRS = $(RIOTBOARD)/msba2-common
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
MODULE =$(BOARD)_base
|
MODULE =$(BOARD)_base
|
||||||
|
|
||||||
include $(RIOTBOARD)/$(BOARD)/Makefile.include
|
|
||||||
|
|
||||||
DIRS = drivers
|
DIRS = drivers
|
||||||
|
|
||||||
all: $(BINDIR)$(MODULE).a
|
all: $(BINDIR)$(MODULE).a
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
MODULE =$(BOARD)_base
|
MODULE =$(BOARD)_base
|
||||||
|
|
||||||
include $(RIOTBOARD)/$(BOARD)/Makefile.include
|
|
||||||
|
|
||||||
all: $(BINDIR)$(MODULE).a
|
all: $(BINDIR)$(MODULE).a
|
||||||
@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;
|
@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;
|
||||||
|
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
MODULE =$(BOARD)_base
|
MODULE =$(BOARD)_base
|
||||||
|
|
||||||
include $(RIOTBOARD)/$(BOARD)/Makefile.include
|
|
||||||
|
|
||||||
DIRS = drivers
|
DIRS = drivers
|
||||||
|
|
||||||
all: $(BINDIR)$(MODULE).a
|
all: $(BINDIR)$(MODULE).a
|
||||||
|
@ -1,5 +1,3 @@
|
|||||||
MODULE =$(BOARD)_base
|
MODULE =$(BOARD)_base
|
||||||
|
|
||||||
include $(RIOTBOARD)/$(BOARD)/Makefile.include
|
|
||||||
|
|
||||||
include $(RIOTBASE)/Makefile.base
|
include $(RIOTBASE)/Makefile.base
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
MODULE =$(BOARD)_base
|
MODULE =$(BOARD)_base
|
||||||
|
|
||||||
include $(RIOTBOARD)/$(BOARD)/Makefile.include
|
|
||||||
|
|
||||||
DIRS = drivers
|
DIRS = drivers
|
||||||
|
|
||||||
all: $(BINDIR)$(MODULE).a
|
all: $(BINDIR)$(MODULE).a
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
MODULE =$(BOARD)_base
|
MODULE =$(BOARD)_base
|
||||||
|
|
||||||
include $(RIOTBOARD)/$(BOARD)/Makefile.include
|
|
||||||
|
|
||||||
DIRS = $(RIOTBOARD)/wsn430-common
|
DIRS = $(RIOTBOARD)/wsn430-common
|
||||||
|
|
||||||
all: $(BINDIR)$(MODULE).a
|
all: $(BINDIR)$(MODULE).a
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
MODULE =$(BOARD)_base
|
MODULE =$(BOARD)_base
|
||||||
|
|
||||||
include $(RIOTBOARD)/$(BOARD)/Makefile.include
|
|
||||||
|
|
||||||
DIRS = $(RIOTBOARD)/wsn430-common
|
DIRS = $(RIOTBOARD)/wsn430-common
|
||||||
|
|
||||||
all: $(BINDIR)$(MODULE).a
|
all: $(BINDIR)$(MODULE).a
|
||||||
|
@ -1,5 +1,3 @@
|
|||||||
MODULE =core
|
MODULE =core
|
||||||
|
|
||||||
INCLUDES = -Iinclude -I$(RIOTBASE)/sys/include -I$(RIOTCPU)/$(CPU)/include
|
|
||||||
|
|
||||||
include $(RIOTBASE)/Makefile.base
|
include $(RIOTBASE)/Makefile.base
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
MODULE = cpu
|
MODULE = cpu
|
||||||
|
|
||||||
INCLUDES += -I$(RIOTCPU)/$(CPU)/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/cc110x_ng/include
|
|
||||||
DIRS = $(RIOTCPU)/msp430-common
|
DIRS = $(RIOTCPU)/msp430-common
|
||||||
|
|
||||||
all: $(BINDIR)$(MODULE).a
|
all: $(BINDIR)$(MODULE).a
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
MODULE =cpu
|
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
|
DIRS = $(RIOTCPU)/arm_common $(RIOTCPU)/lpc_common
|
||||||
ifneq (,$(findstring gpioint,$(USEMODULE)))
|
ifneq (,$(findstring gpioint,$(USEMODULE)))
|
||||||
DIRS += gpioint
|
DIRS += gpioint
|
||||||
|
@ -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
|
MODULE =gpioint
|
||||||
|
|
||||||
include $(MAKEBASE)/Makefile.base
|
include $(MAKEBASE)/Makefile.base
|
||||||
|
@ -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
|
MODULE =mci
|
||||||
|
|
||||||
include $(MAKEBASE)/Makefile.base
|
include $(MAKEBASE)/Makefile.base
|
||||||
|
@ -1,5 +1,3 @@
|
|||||||
INCLUDES = -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/core/include
|
|
||||||
|
|
||||||
MODULE =rtc
|
MODULE =rtc
|
||||||
|
|
||||||
include $(MAKEBASE)/Makefile.base
|
include $(MAKEBASE)/Makefile.base
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
MODULE =msp430_common
|
MODULE =msp430_common
|
||||||
|
|
||||||
INCLUDES += -Iinclude -I$(RIOTBASE)/core/include/ -I$(RIOTBOARD)/$(BOARD)/include
|
|
||||||
DIRS =
|
DIRS =
|
||||||
|
|
||||||
all: $(BINDIR)$(MODULE).a
|
all: $(BINDIR)$(MODULE).a
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
MODULE =cpu
|
MODULE =cpu
|
||||||
|
|
||||||
INCLUDES = -I../include -I$(RIOTBASE)/core/include
|
include $(RIOTCPU)/$(CPU)/Makefile.include
|
||||||
|
|
||||||
DIRS = $(RIOTCPU)/msp430-common/
|
DIRS = $(RIOTCPU)/msp430-common/
|
||||||
|
|
||||||
all: $(BINDIR)$(MODULE).a
|
all: $(BINDIR)$(MODULE).a
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
MODULE = cpu
|
MODULE = cpu
|
||||||
|
|
||||||
INCLUDES += -I../include -I$(RIOTBASE)/core/include
|
|
||||||
|
|
||||||
EXCLUDES := -I$(RIOTBASE)/sys/posix/%
|
EXCLUDES := -I$(RIOTBASE)/sys/posix/%
|
||||||
|
|
||||||
DIRS =
|
DIRS =
|
||||||
|
@ -1,5 +1,3 @@
|
|||||||
INCLUDES += -I$(RIOTBASE)/core/include -I$(RIOTBASE)/sys/include
|
|
||||||
|
|
||||||
EXCLUDES := -I$(RIOTBASE)/sys/posix/%
|
EXCLUDES := -I$(RIOTBASE)/sys/posix/%
|
||||||
|
|
||||||
MODULE = nativenet
|
MODULE = nativenet
|
||||||
|
@ -1,5 +1,3 @@
|
|||||||
INCLUDES = -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/core/include
|
|
||||||
|
|
||||||
MODULE =rtc
|
MODULE =rtc
|
||||||
|
|
||||||
include $(MAKEBASE)/Makefile.base
|
include $(MAKEBASE)/Makefile.base
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
MODULE = drivers
|
MODULE = drivers
|
||||||
INCLUDES = -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(CURDIR)/include -Iinclude -I$(RIOTBASE)/sys/net/include
|
|
||||||
|
|
||||||
DIRS=
|
DIRS=
|
||||||
ifneq (,$(findstring powermon,$(USEMODULE)))
|
ifneq (,$(findstring powermon,$(USEMODULE)))
|
||||||
|
@ -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
|
MODULE =cc110x_spi
|
||||||
|
|
||||||
include $(MAKEBASE)/Makefile.base
|
include $(MAKEBASE)/Makefile.base
|
||||||
|
@ -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
|
MODULE =sys
|
||||||
ifneq (,$(findstring auto_init,$(USEMODULE)))
|
ifneq (,$(findstring auto_init,$(USEMODULE)))
|
||||||
DIRS += auto_init
|
DIRS += auto_init
|
||||||
@ -17,6 +15,7 @@ ifneq (,$(findstring ps,$(USEMODULE)))
|
|||||||
DIRS += ps
|
DIRS += ps
|
||||||
endif
|
endif
|
||||||
ifneq (,$(findstring posix,$(USEMODULE)))
|
ifneq (,$(findstring posix,$(USEMODULE)))
|
||||||
|
INCLUDES += -I$(RIOTBASE)/sys/posix/include
|
||||||
DIRS += posix
|
DIRS += posix
|
||||||
endif
|
endif
|
||||||
ifneq (,$(findstring shell,$(USEMODULE)))
|
ifneq (,$(findstring shell,$(USEMODULE)))
|
||||||
|
@ -1,3 +1,5 @@
|
|||||||
|
INCLUDES += -I$(RIOTBASE)/sys/net/include
|
||||||
|
|
||||||
MODULE:=protocol_multiplex
|
MODULE:=protocol_multiplex
|
||||||
|
|
||||||
include $(RIOTBASE)/Makefile.base
|
include $(RIOTBASE)/Makefile.base
|
||||||
|
Loading…
Reference in New Issue
Block a user