From f7ecc704a47967a028ee9400fb5a5f995404f564 Mon Sep 17 00:00:00 2001
From: Oleg Hahm <oleg@hobbykeller.org>
Date: Mon, 29 Jul 2013 01:24:02 +0200
Subject: [PATCH] fixed includes and include pathes
---
Makefile.dep | 6 ++++++
core/Makefile | 2 +-
drivers/cc110x/Makefile | 4 +---
drivers/cc110x/cc1100-csmaca-mac.c | 2 +-
drivers/cc110x/cc1100.c | 2 +-
drivers/cc110x/cc1100_phy.c | 4 ++--
sys/Makefile | 2 +-
sys/auto_init/Makefile | 1 -
sys/net/sixlowpan/rpl/etx_beaconing.c | 4 ++--
sys/net/sixlowpan/rpl/rpl.h | 2 +-
sys/net/sixlowpan/rpl/rpl_structs.h | 2 +-
sys/transceiver/Makefile | 1 -
12 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/Makefile.dep b/Makefile.dep
index 2e13d5e40e..de8da13ac3 100644
--- a/Makefile.dep
+++ b/Makefile.dep
@@ -13,6 +13,12 @@ ifneq (,$(findstring uart0,$(USEMODULE)))
endif
endif
+ifneq (,$(findstring cc110x,$(USEMODULE)))
+ ifeq (,$(findstring protocol-multiplex,$(USEMODULE)))
+ USEMODULE += protocol-multiplex
+ endif
+endif
+
ifneq (,$(findstring cc110x_ng,$(USEMODULE)))
ifeq (,$(findstring transceiver,$(USEMODULE)))
USEMODULE += transceiver
diff --git a/core/Makefile b/core/Makefile
index 4bf9f52402..6a5709576b 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1,5 +1,5 @@
MODULE =core
-INCLUDES = -Iinclude/ -I../sys/include -I../sys/lib -I../sys/drivers/include -I$(RIOTCPU)/$(CPU)/include/ -I../.. -I../drivers/include/
+INCLUDES += -Iinclude/ -I../sys/include -I../sys/lib -I$(RIOTBASE)/drivers/include -I$(RIOTCPU)/$(CPU)/include
include $(RIOTBASE)/Makefile.base
diff --git a/drivers/cc110x/Makefile b/drivers/cc110x/Makefile
index 43de7a3aa6..85d5f0629d 100644
--- a/drivers/cc110x/Makefile
+++ b/drivers/cc110x/Makefile
@@ -1,6 +1,4 @@
-INCLUDES = -I$(RIOTBASE)/sys/include -I../../net -I../../net/protocol-multiplex -I../include -I../../lib -I../../../.. -I../../../cpu/ -I../../../core/include -I../../
-
-MODULE =cc110x_ng
+MODULE =cc110x
include $(MAKEBASE)/Makefile.base
diff --git a/drivers/cc110x/cc1100-csmaca-mac.c b/drivers/cc110x/cc1100-csmaca-mac.c
index aea7d89459..67ae27b654 100644
--- a/drivers/cc110x/cc1100-csmaca-mac.c
+++ b/drivers/cc110x/cc1100-csmaca-mac.c
@@ -44,7 +44,7 @@ and the mailinglist (subscription via web site)
#include <cc1100.h>
#include <cc1100_phy.h>
#include <cc1100-csmaca-mac.h>
-#include <protocol-multiplex.h>
+#include "protocol-multiplex/protocol-multiplex.h"
#include "hwtimer.h"
#include <vtimer.h>
diff --git a/drivers/cc110x/cc1100.c b/drivers/cc110x/cc1100.c
index 5218eac4b7..6fd400c065 100644
--- a/drivers/cc110x/cc1100.c
+++ b/drivers/cc110x/cc1100.c
@@ -41,7 +41,7 @@
#include "cc1100-defaultSettings.h"
#include "hwtimer.h"
-#include "core/include/bitarithm.h"
+#include "bitarithm.h"
/* TODO: cc1100 port timer */
#ifdef FEUERWARE_CPU_LPC2387
diff --git a/drivers/cc110x/cc1100_phy.c b/drivers/cc110x/cc1100_phy.c
index 1ccc1f43ce..28fc4f76bf 100644
--- a/drivers/cc110x/cc1100_phy.c
+++ b/drivers/cc110x/cc1100_phy.c
@@ -53,7 +53,7 @@ and the mailinglist (subscription via web site)
#include "cc1100_phy.h"
#include "cc1100-defaultSettings.h"
-#include "protocol-multiplex.h"
+#include "protocol-multiplex/protocol-multiplex.h"
#include "kernel.h"
#include "thread.h"
@@ -846,7 +846,7 @@ void cc1100_phy_rx_handler(void)
/* Valid packet. After a wake-up, the radio should be in IDLE.
* So put CC1100 to RX for WOR_TIMEOUT (have to manually put
* the radio back to sleep/WOR).*/
- cc1100_spi_write_reg(CC1100_MCSM0, 0x08); * Turn off FS-Autocal
+ cc1100_spi_write_reg(CC1100_MCSM0, 0x08); /* Turn off FS-Autocal */
cc1100_spi_write_reg(CC1100_MCSM2, 0x07); /* Configure RX_TIME (until end of packet) */
if (radio_mode == CC1100_MODE_CONSTANT_RX) {
diff --git a/sys/Makefile b/sys/Makefile
index 10f9a9b948..000c30dc61 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
+INCLUDES += -Iinclude -I$(RIOTBASE)/drivers/ -I$(RIOTBASE)/drivers/include -Ilib -I$(RIOTCPU)/$(CPU)/include -Inet -I../core/include
MODULE =sys
ifneq (,$(findstring auto_init,$(USEMODULE)))
diff --git a/sys/auto_init/Makefile b/sys/auto_init/Makefile
index d807664555..8b2b20a9fd 100644
--- a/sys/auto_init/Makefile
+++ b/sys/auto_init/Makefile
@@ -1,4 +1,3 @@
-INCLUDES = -I../include -I$(RIOTBASE)/core/include/ -I$(RIOTBASE)/drivers/include
MODULE = auto_init
include $(RIOTBASE)/Makefile.base
diff --git a/sys/net/sixlowpan/rpl/etx_beaconing.c b/sys/net/sixlowpan/rpl/etx_beaconing.c
index a2380b8cea..533655bf06 100644
--- a/sys/net/sixlowpan/rpl/etx_beaconing.c
+++ b/sys/net/sixlowpan/rpl/etx_beaconing.c
@@ -15,8 +15,8 @@
#include <thread.h>
#include <transceiver.h>
-#include "sys/net/sixlowpan/sixlowmac.h"
-#include "sys/net/sixlowpan/ieee802154_frame.h"
+#include "sixlowpan/sixlowmac.h"
+#include "ieee802154/ieee802154_frame.h"
//prototytpes
static uint8_t etx_count_packet_tx(etx_neighbor_t * candidate);
diff --git a/sys/net/sixlowpan/rpl/rpl.h b/sys/net/sixlowpan/rpl/rpl.h
index 7ab2f87206..c38a2bf2ea 100644
--- a/sys/net/sixlowpan/rpl/rpl.h
+++ b/sys/net/sixlowpan/rpl/rpl.h
@@ -20,7 +20,7 @@
#include <vtimer.h>
#include <mutex.h>
#include <transceiver.h>
-#include "sys/net/sixlowpan/sixlowip.h"
+#include "sixlowpan/sixlowip.h"
#include "rpl_dodag.h"
#define CC1100_RADIO_MODE CC1100_MODE_WOR
diff --git a/sys/net/sixlowpan/rpl/rpl_structs.h b/sys/net/sixlowpan/rpl/rpl_structs.h
index 830eac15ae..f0e8f14d8d 100644
--- a/sys/net/sixlowpan/rpl/rpl_structs.h
+++ b/sys/net/sixlowpan/rpl/rpl_structs.h
@@ -16,7 +16,7 @@
*/
#include <string.h>
-#include "sys/net/sixlowpan/sixlowip.h"
+#include "sixlowpan/sixlowip.h"
#ifndef RPL_STRUCTS_H_INCLUDED
#define RPL_STRUCTS_H_INCLUDED
diff --git a/sys/transceiver/Makefile b/sys/transceiver/Makefile
index f3718a1d15..4fcf17425d 100644
--- a/sys/transceiver/Makefile
+++ b/sys/transceiver/Makefile
@@ -1,4 +1,3 @@
-INCLUDES = -I../include -I$(RIOTBAE)/drivers/include -I$(RIOTBASE)/drivers/cc110x_ng/include -I../lib -I$(RIOTCPU)/$(CPU)/include -I../net -I../../core/include -I$(RIOTBASE)/drivers/cc2420/include -I$(RIOTBASE)/sys/net/ieee802154/
MODULE =transceiver
include $(MAKEBASE)/Makefile.base
--
GitLab