Browse Source

simplify and unify include pathes

additional:
* exporting include path in sys is mandatory for subfolders
* removed duplicate object file in linker call
dev/timer
Oleg Hahm 9 years ago
parent
commit
593ee623b6
  1. 1
      Makefile.modules
  2. 4
      boards/msb-430-common/Makefile.include
  3. 2
      core/Makefile
  4. 4
      drivers/Makefile
  5. 1
      drivers/at86rf231/Makefile
  6. 3
      drivers/cc110x/Makefile
  7. 1
      drivers/cc110x_ng/Makefile
  8. 1
      drivers/cc2420/Makefile
  9. 2
      drivers/lm75a/Makefile
  10. 2
      drivers/ltc4150/Makefile
  11. 2
      drivers/sht11/Makefile
  12. 2
      drivers/srf02/Makefile
  13. 2
      drivers/srf08/Makefile
  14. 20
      sys/Makefile
  15. 2
      sys/auto_init/Makefile
  16. 1
      sys/bloom/Makefile
  17. 1
      sys/config/Makefile
  18. 1
      sys/hashes/Makefile
  19. 0
      sys/include/hash_string.h
  20. 0
      sys/include/hashtable.h
  21. 0
      sys/include/hashtable_private.h
  22. 0
      sys/include/ringbuffer.h
  23. 1
      sys/lib/Makefile
  24. 2
      sys/net/ccn_lite/Makefile
  25. 3
      sys/net/ccn_lite/util/Makefile
  26. 3
      sys/net/crosslayer/net_help/Makefile
  27. 1
      sys/net/link_layer/ieee802154/Makefile
  28. 1
      sys/net/link_layer/protocol-multiplex/Makefile
  29. 3
      sys/net/network_layer/sixlowpan/Makefile
  30. 3
      sys/net/routing/rpl/Makefile
  31. 2
      sys/net/transport_layer/destiny/Makefile
  32. 1
      sys/ping/Makefile
  33. 1
      sys/posix/Makefile
  34. 1
      sys/ps/Makefile
  35. 1
      sys/semaphore/Makefile
  36. 1
      sys/shell/Makefile
  37. 1
      sys/shell/commands/Makefile
  38. 1
      sys/timex/Makefile
  39. 2
      sys/transceiver/Makefile
  40. 2
      sys/uart0/Makefile
  41. 1
      sys/vtimer/Makefile

1
Makefile.modules

@ -15,4 +15,3 @@ include $(RIOTBASE)/Makefile.dep
export USEMODULE
export INCLUDES += -I$(RIOTBASE)/core/include

4
boards/msb-430-common/Makefile.include

@ -12,7 +12,7 @@ export AS = $(PREFIX)as
export LINK = $(PREFIX)gcc
export SIZE = $(PREFIX)size
export OBJCOPY = $(PREFIX)objcopy
export LINKFLAGS = -mmcu=$(MCU) -lgcc $(BINDIR)/startup.o
export LINKFLAGS = -mmcu=$(MCU) -lgcc
TERMPROG = $(RIOTBASE)/dist/tools/pyterm/pyterm.py
export HEXFILE = bin/$(PROJECT).hex
@ -36,5 +36,5 @@ endif
export FFLAGS += "prog $(HEXFILE)"
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

2
core/Makefile

@ -1,5 +1,5 @@
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

4
drivers/Makefile

@ -1,4 +1,5 @@
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)))
@ -45,6 +46,3 @@ include $(RIOTBASE)/Makefile.base
clean::
@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ;

1
drivers/at86rf231/Makefile

@ -1,4 +1,3 @@
INCLUDES = -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -Iinclude/ -I$(RIOTBASE)/sys/net/include
MODULE =at86rf231
DIRS =

3
drivers/cc110x/Makefile

@ -1,7 +1,4 @@
MODULE =cc110x
INCLUDES += -I$(RIOTBASE)/sys/net/include
include $(MAKEBASE)/Makefile.base

1
drivers/cc110x_ng/Makefile

@ -1,4 +1,3 @@
INCLUDES = -I$(RIOTBASE)/sys/include -I../../net -I../include -I../../lib -I../../../.. -I../../../cpu/ -I$(RIOTBASE)/core/include -I../../ -Iinclude/
MODULE =cc110x_ng
DIRS =

1
drivers/cc2420/Makefile

@ -1,4 +1,3 @@
INCLUDES = -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -Iinclude/ -I$(RIOTBASE)/sys/net/include
MODULE =cc2420
DIRS =

2
drivers/lm75a/Makefile

@ -1,5 +1,3 @@
INCLUDES = -I$(RIOTBASE)/core/include -I../include/ -I$(RIOTBASE)/sys/include -I$(RIOTBOARD)/$(BOARD)/include
MODULE =lm75a
include $(MAKEBASE)/Makefile.base

2
drivers/ltc4150/Makefile

@ -1,5 +1,3 @@
INCLUDES = -I$(RIOTBASE)/core/include -I../include/
MODULE =ltc4150
include $(MAKEBASE)/Makefile.base

2
drivers/sht11/Makefile

@ -1,5 +1,3 @@
INCLUDES += -I$(RIOTBASE)/core/include -I../include -I$(RIOTBOARD)/$(BOARD)
MODULE =sht11
include $(MAKEBASE)/Makefile.base

2
drivers/srf02/Makefile

@ -1,5 +1,3 @@
INCLUDES = -I$(RIOTBASE)/core/include -I../include/ -I$(RIOTBASE)/sys/include
MODULE =srf02
include $(MAKEBASE)/Makefile.base

2
drivers/srf08/Makefile

@ -1,5 +1,3 @@
INCLUDES = -I$(RIOTBASE)/core/include -I../include/ -I$(RIOTBASE)/sys/include
MODULE =srf08
include $(MAKEBASE)/Makefile.base

20
sys/Makefile

@ -1,4 +1,4 @@
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
ifneq (,$(findstring auto_init,$(USEMODULE)))
@ -10,27 +10,12 @@ endif
ifneq (,$(findstring lib,$(USEMODULE)))
DIRS += lib
endif
ifneq (,$(findstring cmdd,$(USEMODULE)))
DIRS += cmdd
endif
ifneq (,$(findstring mprint,$(USEMODULE)))
DIRS += mprint
endif
ifneq (,$(findstring ping,$(USEMODULE)))
DIRS += ping
endif
ifneq (,$(findstring ps,$(USEMODULE)))
DIRS += ps
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)))
DIRS += posix
endif
@ -55,9 +40,6 @@ endif
ifneq (,$(findstring destiny,$(USEMODULE)))
DIRS += net/transport_layer/destiny
endif
ifneq (,$(findstring net_mm,$(USEMODULE)))
DIRS += net/mm
endif
ifneq (,$(findstring net_help,$(USEMODULE)))
DIRS += net/crosslayer/net_help
endif

2
sys/auto_init/Makefile

@ -1,4 +1,6 @@
MODULE = auto_init
INCLUDES += -I$(RIOTBASE)/drivers/cc110x -I$(RIOTBASE)/drivers/cc110x_ng/include
include $(RIOTBASE)/Makefile.base

1
sys/bloom/Makefile

@ -1,4 +1,3 @@
INCLUDES = -I../include -I$(RIOTBASE)/core/include
MODULE = bloom
include $(RIOTBASE)/Makefile.base

1
sys/config/Makefile

@ -1,4 +1,3 @@
INCLUDES = -I../include -I$(RIOTBASE)/core/include
MODULE =config
include $(RIOTBASE)/Makefile.base

1
sys/hashes/Makefile

@ -1,4 +1,3 @@
INCLUDES = -I../include
MODULE = hashes
include $(RIOTBASE)/Makefile.base

0
sys/lib/hash_string.h → sys/include/hash_string.h

0
sys/lib/hashtable.h → sys/include/hashtable.h

0
sys/lib/hashtable_private.h → sys/include/hashtable_private.h

0
sys/lib/ringbuffer.h → sys/include/ringbuffer.h

1
sys/lib/Makefile

@ -1,4 +1,3 @@
INCLUDES = -I../include -I../drivers/include -I../lib -I$(RIOTCPU)/$(CPU)/include -I../net -I../../core/include
MODULE =lib
include $(RIOTBASE)/Makefile.base

2
sys/net/ccn_lite/Makefile

@ -1,4 +1,4 @@
MODULE := ccn_lite
INCLUDES = -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/sys/net -I$(RIOTBASE)/cpu/arm_common/include/ -I$(RIOTBASE)/drivers/cc110x_ng/include/ -I$(RIOTBASE)/sys/net/include/
INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include/
include $(RIOTBASE)/Makefile.base

3
sys/net/ccn_lite/util/Makefile

@ -1,4 +1,3 @@
MODULE := ccn_lite_client
INCLUDES = -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/sys/net -I$(RIOTBASE)/cpu/arm_common/include/ -I$(RIOTBASE)/drivers/cc110x_ng/include/ -I$(RIOTBASE)/sys/net/ccn_lite/ -I$(RIOTBASE)/sys/net/include
INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include/
include $(RIOTBASE)/Makefile.base

3
sys/net/crosslayer/net_help/Makefile

@ -1,4 +1,5 @@
MODULE:=$(shell basename $(CURDIR))
INCLUDES += -I$(RIOTBASE)/sys/net/include -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include
INCLUDES += -I$(RIOTBASE)/drivers/cc110x -I$(RIOTBASE)/drivers/cc110x_ng/include
include $(RIOTBASE)/Makefile.base

1
sys/net/link_layer/ieee802154/Makefile

@ -1,4 +1,3 @@
MODULE:=$(shell basename $(CURDIR))
INCLUDES = -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/sys/net/include
include $(RIOTBASE)/Makefile.base

1
sys/net/link_layer/protocol-multiplex/Makefile

@ -1,4 +1,3 @@
MODULE:=protocol_multiplex
INCLUDES = -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/sys/net/include
include $(RIOTBASE)/Makefile.base

3
sys/net/network_layer/sixlowpan/Makefile

@ -1,4 +1,3 @@
MODULE:=$(shell basename $(CURDIR))
INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_ng/include -I$(RIOTBASE)/cpu/arm_common/include -I$(RIOTBASE)/sys/net/include/
INCLUDES += -I$(RIOTBASE)/drivers/cc110x -I$(RIOTBASE)/drivers/cc110x_ng/include
include $(RIOTBASE)/Makefile.base

3
sys/net/routing/rpl/Makefile

@ -1,4 +1,5 @@
MODULE:=$(shell basename $(CURDIR))
INCLUDES += -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/sys/net/include
INCLUDES += -I$(RIOTBASE)/drivers/cc110x -I$(RIOTBASE)/drivers/cc110x_ng/include
include $(RIOTBASE)/Makefile.base

2
sys/net/transport_layer/destiny/Makefile

@ -1,4 +1,4 @@
MODULE:=$(shell basename $(CURDIR))
INCLUDES = -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/sys/net/include -I$(RIOTBASE)/drivers/cc110x_ng/include -I$(RIOTBASE)/drivers/cc110x
INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include -I$(RIOTBASE)/drivers/cc110x
include $(RIOTBASE)/Makefile.base

1
sys/ping/Makefile

@ -1,4 +1,3 @@
INCLUDES = -I../include -I$(RIOTBASE)/core/include/ -I$(RIOTBASE)/drivers/include
MODULE =ping
include $(RIOTBASE)/Makefile.base

1
sys/posix/Makefile

@ -1,4 +1,3 @@
INCLUDES = -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -Iinclude
MODULE =posix
include $(RIOTBASE)/Makefile.base

1
sys/ps/Makefile

@ -1,4 +1,3 @@
INCLUDES = -I../include -I$(RIOTBASE)/core/include/ -I$(RIOTBASE)/drivers/include
MODULE =ps
include $(RIOTBASE)/Makefile.base

1
sys/semaphore/Makefile

@ -1,4 +1,3 @@
INCLUDES = -I../include -I$(RIOTBASE)/core/include
MODULE = semaphore
include $(RIOTBASE)/Makefile.base

1
sys/shell/Makefile

@ -1,7 +1,6 @@
SRC = shell.c
OBJ = $(SRC:%.c=$(BINDIR)%.o)
DEP = $(SRC:%.c=$(BINDIR)%.d)
INCLUDES = -I../include
MODULE =shell

1
sys/shell/commands/Makefile

@ -1,5 +1,4 @@
SRC = shell_commands.c sc_id.c
INCLUDES = -I../../../core/include -I../../include -I../../../drivers/include/
ifneq (,$(findstring cc110x_ng,$(USEMODULE)))
INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include/

1
sys/timex/Makefile

@ -1,4 +1,3 @@
INCLUDES = -I../include
MODULE = timex
include $(RIOTBASE)/Makefile.base

2
sys/transceiver/Makefile

@ -1,6 +1,6 @@
MODULE =transceiver
INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include
INCLUDES += -I$(RIOTBASE)/drivers/cc110x -I$(RIOTBASE)/drivers/cc110x_ng/include -I$(RIOTBASE)/drivers/cc2420/include -I$(RIOTBASE)/drivers/at86rf231/include
include $(MAKEBASE)/Makefile.base

2
sys/uart0/Makefile

@ -1,5 +1,3 @@
INCLUDES = -I../include -I../drivers/include -I../lib -I$(RIOTCPU)/$(CPU)/include -I../net -I../../core/include
MODULE =uart0
include $(MAKEBASE)/Makefile.base

1
sys/vtimer/Makefile

@ -1,4 +1,3 @@
INCLUDES = -I../include -I$(RIOTBASE)/core/include/ -I$(RIOTBASE)/drivers/include
MODULE =vtimer
include $(RIOTBASE)/Makefile.base

Loading…
Cancel
Save