Skip to content
Snippets Groups Projects
Commit 593ee623 authored by Oleg Hahm's avatar Oleg Hahm
Browse files

simplify and unify include pathes

additional:
* exporting include path in sys is mandatory for subfolders
* removed duplicate object file in linker call
parent 8d157130
No related branches found
No related tags found
No related merge requests found
Showing
with 7 additions and 45 deletions
...@@ -15,4 +15,3 @@ include $(RIOTBASE)/Makefile.dep ...@@ -15,4 +15,3 @@ include $(RIOTBASE)/Makefile.dep
export USEMODULE export USEMODULE
export INCLUDES += -I$(RIOTBASE)/core/include
...@@ -12,7 +12,7 @@ export AS = $(PREFIX)as ...@@ -12,7 +12,7 @@ export AS = $(PREFIX)as
export LINK = $(PREFIX)gcc export LINK = $(PREFIX)gcc
export SIZE = $(PREFIX)size export SIZE = $(PREFIX)size
export OBJCOPY = $(PREFIX)objcopy export OBJCOPY = $(PREFIX)objcopy
export LINKFLAGS = -mmcu=$(MCU) -lgcc $(BINDIR)/startup.o export LINKFLAGS = -mmcu=$(MCU) -lgcc
TERMPROG = $(RIOTBASE)/dist/tools/pyterm/pyterm.py TERMPROG = $(RIOTBASE)/dist/tools/pyterm/pyterm.py
export HEXFILE = bin/$(PROJECT).hex export HEXFILE = bin/$(PROJECT).hex
...@@ -36,5 +36,5 @@ endif ...@@ -36,5 +36,5 @@ endif
export FFLAGS += "prog $(HEXFILE)" export FFLAGS += "prog $(HEXFILE)"
export USEMODULE += msp430_common export USEMODULE += msp430_common
export INCLUDES += -I $(RIOTCPU)/msp430-common/include/ -I$(RIOTBOARD)/msb-430-common/include export INCLUDES += -I $(RIOTCPU)/msp430-common/include/ -I$(RIOTBOARD)/msb-430-common/include -I$(RIOTBOARD)/msb-430-common/drivers/include
export OFLAGS = -O ihex export OFLAGS = -O ihex
MODULE =core MODULE =core
INCLUDES += -Iinclude/ -I../sys/include -I../sys/lib -I$(RIOTBASE)/drivers/include -I$(RIOTCPU)/$(CPU)/include INCLUDES = -Iinclude -I$(RIOTBASE)/sys/include -I$(RIOTCPU)/$(CPU)/include
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base
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)))
...@@ -45,6 +46,3 @@ include $(RIOTBASE)/Makefile.base ...@@ -45,6 +46,3 @@ include $(RIOTBASE)/Makefile.base
clean:: clean::
@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ; @for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ;
INCLUDES = -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -Iinclude/ -I$(RIOTBASE)/sys/net/include
MODULE =at86rf231 MODULE =at86rf231
DIRS = DIRS =
......
MODULE =cc110x MODULE =cc110x
INCLUDES += -I$(RIOTBASE)/sys/net/include
include $(MAKEBASE)/Makefile.base include $(MAKEBASE)/Makefile.base
INCLUDES = -I$(RIOTBASE)/sys/include -I../../net -I../include -I../../lib -I../../../.. -I../../../cpu/ -I$(RIOTBASE)/core/include -I../../ -Iinclude/
MODULE =cc110x_ng MODULE =cc110x_ng
DIRS = DIRS =
......
INCLUDES = -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -Iinclude/ -I$(RIOTBASE)/sys/net/include
MODULE =cc2420 MODULE =cc2420
DIRS = DIRS =
......
INCLUDES = -I$(RIOTBASE)/core/include -I../include/ -I$(RIOTBASE)/sys/include -I$(RIOTBOARD)/$(BOARD)/include
MODULE =lm75a MODULE =lm75a
include $(MAKEBASE)/Makefile.base include $(MAKEBASE)/Makefile.base
INCLUDES = -I$(RIOTBASE)/core/include -I../include/
MODULE =ltc4150 MODULE =ltc4150
include $(MAKEBASE)/Makefile.base include $(MAKEBASE)/Makefile.base
INCLUDES += -I$(RIOTBASE)/core/include -I../include -I$(RIOTBOARD)/$(BOARD)
MODULE =sht11 MODULE =sht11
include $(MAKEBASE)/Makefile.base include $(MAKEBASE)/Makefile.base
INCLUDES = -I$(RIOTBASE)/core/include -I../include/ -I$(RIOTBASE)/sys/include
MODULE =srf02 MODULE =srf02
include $(MAKEBASE)/Makefile.base include $(MAKEBASE)/Makefile.base
INCLUDES = -I$(RIOTBASE)/core/include -I../include/ -I$(RIOTBASE)/sys/include
MODULE =srf08 MODULE =srf08
include $(MAKEBASE)/Makefile.base include $(MAKEBASE)/Makefile.base
INCLUDES += -Iinclude -I$(RIOTBASE)/drivers/ -I$(RIOTBASE)/drivers/include -Ilib -I$(RIOTCPU)/$(CPU)/include -Inet -I../core/include 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)))
...@@ -10,27 +10,12 @@ endif ...@@ -10,27 +10,12 @@ endif
ifneq (,$(findstring lib,$(USEMODULE))) ifneq (,$(findstring lib,$(USEMODULE)))
DIRS += lib DIRS += lib
endif endif
ifneq (,$(findstring cmdd,$(USEMODULE)))
DIRS += cmdd
endif
ifneq (,$(findstring mprint,$(USEMODULE)))
DIRS += mprint
endif
ifneq (,$(findstring ping,$(USEMODULE))) ifneq (,$(findstring ping,$(USEMODULE)))
DIRS += ping DIRS += ping
endif endif
ifneq (,$(findstring ps,$(USEMODULE))) ifneq (,$(findstring ps,$(USEMODULE)))
DIRS += ps DIRS += ps
endif endif
ifneq (,$(findstring sync_read,$(USEMODULE)))
DIRS += sync_read
endif
ifneq (,$(findstring sysmon,$(USEMODULE)))
DIRS += sysmon
endif
ifneq (,$(findstring mqueue,$(USEMODULE)))
DIRS += mqueue
endif
ifneq (,$(findstring posix,$(USEMODULE))) ifneq (,$(findstring posix,$(USEMODULE)))
DIRS += posix DIRS += posix
endif endif
...@@ -55,9 +40,6 @@ endif ...@@ -55,9 +40,6 @@ endif
ifneq (,$(findstring destiny,$(USEMODULE))) ifneq (,$(findstring destiny,$(USEMODULE)))
DIRS += net/transport_layer/destiny DIRS += net/transport_layer/destiny
endif endif
ifneq (,$(findstring net_mm,$(USEMODULE)))
DIRS += net/mm
endif
ifneq (,$(findstring net_help,$(USEMODULE))) ifneq (,$(findstring net_help,$(USEMODULE)))
DIRS += net/crosslayer/net_help DIRS += net/crosslayer/net_help
endif endif
......
MODULE = auto_init MODULE = auto_init
INCLUDES += -I$(RIOTBASE)/drivers/cc110x -I$(RIOTBASE)/drivers/cc110x_ng/include
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base
INCLUDES = -I../include -I$(RIOTBASE)/core/include
MODULE = bloom MODULE = bloom
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base
......
INCLUDES = -I../include -I$(RIOTBASE)/core/include
MODULE =config MODULE =config
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base
......
INCLUDES = -I../include
MODULE = hashes MODULE = hashes
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base
File moved
File moved
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment