From 593ee623b655b08e4cef257f080aab7c1f023527 Mon Sep 17 00:00:00 2001 From: Oleg Hahm <oleg@hobbykeller.org> Date: Sat, 21 Dec 2013 16:05:29 +0100 Subject: [PATCH] simplify and unify include pathes additional: * exporting include path in sys is mandatory for subfolders * removed duplicate object file in linker call --- Makefile.modules | 1 - boards/msb-430-common/Makefile.include | 4 ++-- core/Makefile | 2 +- drivers/Makefile | 4 +--- drivers/at86rf231/Makefile | 1 - drivers/cc110x/Makefile | 3 --- drivers/cc110x_ng/Makefile | 1 - drivers/cc2420/Makefile | 1 - drivers/lm75a/Makefile | 2 -- drivers/ltc4150/Makefile | 2 -- drivers/sht11/Makefile | 2 -- drivers/srf02/Makefile | 2 -- drivers/srf08/Makefile | 2 -- sys/Makefile | 20 +------------------ sys/auto_init/Makefile | 2 ++ sys/bloom/Makefile | 1 - sys/config/Makefile | 1 - sys/hashes/Makefile | 1 - sys/{lib => include}/hash_string.h | 0 sys/{lib => include}/hashtable.h | 0 sys/{lib => include}/hashtable_private.h | 0 sys/{lib => include}/ringbuffer.h | 0 sys/lib/Makefile | 1 - sys/net/ccn_lite/Makefile | 2 +- sys/net/ccn_lite/util/Makefile | 3 +-- sys/net/crosslayer/net_help/Makefile | 3 ++- sys/net/link_layer/ieee802154/Makefile | 1 - .../link_layer/protocol-multiplex/Makefile | 1 - sys/net/network_layer/sixlowpan/Makefile | 3 +-- sys/net/routing/rpl/Makefile | 3 ++- sys/net/transport_layer/destiny/Makefile | 2 +- sys/ping/Makefile | 1 - sys/posix/Makefile | 1 - sys/ps/Makefile | 1 - sys/semaphore/Makefile | 1 - sys/shell/Makefile | 1 - sys/shell/commands/Makefile | 1 - sys/timex/Makefile | 1 - sys/transceiver/Makefile | 2 +- sys/uart0/Makefile | 2 -- sys/vtimer/Makefile | 1 - 41 files changed, 16 insertions(+), 67 deletions(-) rename sys/{lib => include}/hash_string.h (100%) rename sys/{lib => include}/hashtable.h (100%) rename sys/{lib => include}/hashtable_private.h (100%) rename sys/{lib => include}/ringbuffer.h (100%) diff --git a/Makefile.modules b/Makefile.modules index 2cc5ff9f88..a0a173467d 100644 --- a/Makefile.modules +++ b/Makefile.modules @@ -15,4 +15,3 @@ include $(RIOTBASE)/Makefile.dep export USEMODULE -export INCLUDES += -I$(RIOTBASE)/core/include diff --git a/boards/msb-430-common/Makefile.include b/boards/msb-430-common/Makefile.include index d21fc1215d..3fc5dc1c4e 100644 --- a/boards/msb-430-common/Makefile.include +++ b/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 diff --git a/core/Makefile b/core/Makefile index 6a5709576b..57938d4829 100644 --- a/core/Makefile +++ b/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 diff --git a/drivers/Makefile b/drivers/Makefile index d2f4914a21..709eb35d7a 100644 --- a/drivers/Makefile +++ b/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 ; - - - diff --git a/drivers/at86rf231/Makefile b/drivers/at86rf231/Makefile index 24a3dea93a..c3b9d94175 100644 --- a/drivers/at86rf231/Makefile +++ b/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 = diff --git a/drivers/cc110x/Makefile b/drivers/cc110x/Makefile index 4589024645..46b179742b 100644 --- a/drivers/cc110x/Makefile +++ b/drivers/cc110x/Makefile @@ -1,7 +1,4 @@ MODULE =cc110x -INCLUDES += -I$(RIOTBASE)/sys/net/include - include $(MAKEBASE)/Makefile.base - diff --git a/drivers/cc110x_ng/Makefile b/drivers/cc110x_ng/Makefile index 997aea9aea..f812c29801 100644 --- a/drivers/cc110x_ng/Makefile +++ b/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 = diff --git a/drivers/cc2420/Makefile b/drivers/cc2420/Makefile index 9c1a751946..786dea6b2d 100644 --- a/drivers/cc2420/Makefile +++ b/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 = diff --git a/drivers/lm75a/Makefile b/drivers/lm75a/Makefile index 6c0a13b1b2..b9c7862ef5 100644 --- a/drivers/lm75a/Makefile +++ b/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 - diff --git a/drivers/ltc4150/Makefile b/drivers/ltc4150/Makefile index 1365fbf926..c87af4187d 100644 --- a/drivers/ltc4150/Makefile +++ b/drivers/ltc4150/Makefile @@ -1,5 +1,3 @@ -INCLUDES = -I$(RIOTBASE)/core/include -I../include/ MODULE =ltc4150 include $(MAKEBASE)/Makefile.base - diff --git a/drivers/sht11/Makefile b/drivers/sht11/Makefile index 51acccc982..71ca4388be 100644 --- a/drivers/sht11/Makefile +++ b/drivers/sht11/Makefile @@ -1,5 +1,3 @@ -INCLUDES += -I$(RIOTBASE)/core/include -I../include -I$(RIOTBOARD)/$(BOARD) MODULE =sht11 include $(MAKEBASE)/Makefile.base - diff --git a/drivers/srf02/Makefile b/drivers/srf02/Makefile index 2f8bb4541c..55d8977687 100644 --- a/drivers/srf02/Makefile +++ b/drivers/srf02/Makefile @@ -1,5 +1,3 @@ -INCLUDES = -I$(RIOTBASE)/core/include -I../include/ -I$(RIOTBASE)/sys/include MODULE =srf02 include $(MAKEBASE)/Makefile.base - diff --git a/drivers/srf08/Makefile b/drivers/srf08/Makefile index b5919cbf30..7980d3ed2b 100644 --- a/drivers/srf08/Makefile +++ b/drivers/srf08/Makefile @@ -1,5 +1,3 @@ -INCLUDES = -I$(RIOTBASE)/core/include -I../include/ -I$(RIOTBASE)/sys/include MODULE =srf08 include $(MAKEBASE)/Makefile.base - diff --git a/sys/Makefile b/sys/Makefile index 433d97beac..020f0c24ec 100644 --- a/sys/Makefile +++ b/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 diff --git a/sys/auto_init/Makefile b/sys/auto_init/Makefile index 8b2b20a9fd..3d5723287c 100644 --- a/sys/auto_init/Makefile +++ b/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 diff --git a/sys/bloom/Makefile b/sys/bloom/Makefile index 8210b99fe8..998fbc6c37 100644 --- a/sys/bloom/Makefile +++ b/sys/bloom/Makefile @@ -1,4 +1,3 @@ -INCLUDES = -I../include -I$(RIOTBASE)/core/include MODULE = bloom include $(RIOTBASE)/Makefile.base diff --git a/sys/config/Makefile b/sys/config/Makefile index a332978997..93a842ac89 100644 --- a/sys/config/Makefile +++ b/sys/config/Makefile @@ -1,4 +1,3 @@ -INCLUDES = -I../include -I$(RIOTBASE)/core/include MODULE =config include $(RIOTBASE)/Makefile.base diff --git a/sys/hashes/Makefile b/sys/hashes/Makefile index c14e137b8b..d105e96ecb 100644 --- a/sys/hashes/Makefile +++ b/sys/hashes/Makefile @@ -1,4 +1,3 @@ -INCLUDES = -I../include MODULE = hashes include $(RIOTBASE)/Makefile.base diff --git a/sys/lib/hash_string.h b/sys/include/hash_string.h similarity index 100% rename from sys/lib/hash_string.h rename to sys/include/hash_string.h diff --git a/sys/lib/hashtable.h b/sys/include/hashtable.h similarity index 100% rename from sys/lib/hashtable.h rename to sys/include/hashtable.h diff --git a/sys/lib/hashtable_private.h b/sys/include/hashtable_private.h similarity index 100% rename from sys/lib/hashtable_private.h rename to sys/include/hashtable_private.h diff --git a/sys/lib/ringbuffer.h b/sys/include/ringbuffer.h similarity index 100% rename from sys/lib/ringbuffer.h rename to sys/include/ringbuffer.h diff --git a/sys/lib/Makefile b/sys/lib/Makefile index 2a10bf68c4..59bee59b8a 100644 --- a/sys/lib/Makefile +++ b/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 diff --git a/sys/net/ccn_lite/Makefile b/sys/net/ccn_lite/Makefile index 6275081efc..fb713d8cf6 100644 --- a/sys/net/ccn_lite/Makefile +++ b/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 diff --git a/sys/net/ccn_lite/util/Makefile b/sys/net/ccn_lite/util/Makefile index cd74302c3b..14c03c12bf 100644 --- a/sys/net/ccn_lite/util/Makefile +++ b/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 diff --git a/sys/net/crosslayer/net_help/Makefile b/sys/net/crosslayer/net_help/Makefile index 026882ed71..0672178a5a 100644 --- a/sys/net/crosslayer/net_help/Makefile +++ b/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 diff --git a/sys/net/link_layer/ieee802154/Makefile b/sys/net/link_layer/ieee802154/Makefile index ef0639c947..c6e31807e8 100644 --- a/sys/net/link_layer/ieee802154/Makefile +++ b/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 diff --git a/sys/net/link_layer/protocol-multiplex/Makefile b/sys/net/link_layer/protocol-multiplex/Makefile index 07e11ad879..10d40e8e0e 100644 --- a/sys/net/link_layer/protocol-multiplex/Makefile +++ b/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 diff --git a/sys/net/network_layer/sixlowpan/Makefile b/sys/net/network_layer/sixlowpan/Makefile index cb1b12da88..619c8e0159 100644 --- a/sys/net/network_layer/sixlowpan/Makefile +++ b/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 diff --git a/sys/net/routing/rpl/Makefile b/sys/net/routing/rpl/Makefile index f3edbc5c6b..0672178a5a 100644 --- a/sys/net/routing/rpl/Makefile +++ b/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 diff --git a/sys/net/transport_layer/destiny/Makefile b/sys/net/transport_layer/destiny/Makefile index 4541761d71..bf374f567b 100644 --- a/sys/net/transport_layer/destiny/Makefile +++ b/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 diff --git a/sys/ping/Makefile b/sys/ping/Makefile index e944af2dce..037060005c 100644 --- a/sys/ping/Makefile +++ b/sys/ping/Makefile @@ -1,4 +1,3 @@ -INCLUDES = -I../include -I$(RIOTBASE)/core/include/ -I$(RIOTBASE)/drivers/include MODULE =ping include $(RIOTBASE)/Makefile.base diff --git a/sys/posix/Makefile b/sys/posix/Makefile index bd15ac0af2..883763c56e 100644 --- a/sys/posix/Makefile +++ b/sys/posix/Makefile @@ -1,4 +1,3 @@ -INCLUDES = -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -Iinclude MODULE =posix include $(RIOTBASE)/Makefile.base diff --git a/sys/ps/Makefile b/sys/ps/Makefile index 11d0680982..9fec450f4c 100644 --- a/sys/ps/Makefile +++ b/sys/ps/Makefile @@ -1,4 +1,3 @@ -INCLUDES = -I../include -I$(RIOTBASE)/core/include/ -I$(RIOTBASE)/drivers/include MODULE =ps include $(RIOTBASE)/Makefile.base diff --git a/sys/semaphore/Makefile b/sys/semaphore/Makefile index 512a8ea92c..923609e5c9 100644 --- a/sys/semaphore/Makefile +++ b/sys/semaphore/Makefile @@ -1,4 +1,3 @@ -INCLUDES = -I../include -I$(RIOTBASE)/core/include MODULE = semaphore include $(RIOTBASE)/Makefile.base diff --git a/sys/shell/Makefile b/sys/shell/Makefile index ff50b2f7aa..0b5b6d05e1 100644 --- a/sys/shell/Makefile +++ b/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 diff --git a/sys/shell/commands/Makefile b/sys/shell/commands/Makefile index 83b0a54213..7b7ccb7ae0 100644 --- a/sys/shell/commands/Makefile +++ b/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/ diff --git a/sys/timex/Makefile b/sys/timex/Makefile index 0275f959ac..76b21cf14d 100644 --- a/sys/timex/Makefile +++ b/sys/timex/Makefile @@ -1,4 +1,3 @@ -INCLUDES = -I../include MODULE = timex include $(RIOTBASE)/Makefile.base diff --git a/sys/transceiver/Makefile b/sys/transceiver/Makefile index 149822e1f1..7d3cafb276 100644 --- a/sys/transceiver/Makefile +++ b/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 diff --git a/sys/uart0/Makefile b/sys/uart0/Makefile index 39ca411fbf..4d873e0393 100644 --- a/sys/uart0/Makefile +++ b/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 diff --git a/sys/vtimer/Makefile b/sys/vtimer/Makefile index adb12a5d81..35f0910438 100644 --- a/sys/vtimer/Makefile +++ b/sys/vtimer/Makefile @@ -1,4 +1,3 @@ -INCLUDES = -I../include -I$(RIOTBASE)/core/include/ -I$(RIOTBASE)/drivers/include MODULE =vtimer include $(RIOTBASE)/Makefile.base -- GitLab