fixing for #79: relocating rpl folder

564eb457 · Oleg Hahm · 39a4dc68 · 564eb457 · 564eb457 · 564eb457
Commit 564eb457 authored 11 years ago by Oleg Hahm
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -77,7 +77,7 @@ ifneq (,$(findstring sixlowpan,$(USEMODULE)))
    DIRS += net/sixlowpan
 endif
 ifneq (,$(findstring rpl,$(USEMODULE)))
-    DIRS += net/sixlowpan/rpl
+    DIRS += net/rpl
 endif
 ifneq (,$(findstring ieee802154,$(USEMODULE)))
    DIRS += net/ieee802154

--- a/sys/net/sixlowpan/rpl/Makefile
+++ b/sys/net/sixlowpan/rpl/Makefile
--- a/sys/net/sixlowpan/rpl/etx_beaconing.c
+++ b/sys/net/sixlowpan/rpl/etx_beaconing.c
--- a/sys/net/sixlowpan/rpl/etx_beaconing.h
+++ b/sys/net/sixlowpan/rpl/etx_beaconing.h
--- a/sys/net/sixlowpan/rpl/of0.c
+++ b/sys/net/sixlowpan/rpl/of0.c
--- a/sys/net/sixlowpan/rpl/of0.h
+++ b/sys/net/sixlowpan/rpl/of0.h
--- a/sys/net/sixlowpan/rpl/of_mrhof.c
+++ b/sys/net/sixlowpan/rpl/of_mrhof.c
--- a/sys/net/sixlowpan/rpl/of_mrhof.h
+++ b/sys/net/sixlowpan/rpl/of_mrhof.h
--- a/sys/net/sixlowpan/rpl/rpl.c
+++ b/sys/net/sixlowpan/rpl/rpl.c
--- a/sys/net/sixlowpan/rpl/rpl.h
+++ b/sys/net/sixlowpan/rpl/rpl.h
--- a/sys/net/sixlowpan/rpl/rpl_dodag.c
+++ b/sys/net/sixlowpan/rpl/rpl_dodag.c
--- a/sys/net/sixlowpan/rpl/rpl_dodag.h
+++ b/sys/net/sixlowpan/rpl/rpl_dodag.h
--- a/sys/net/sixlowpan/rpl/rpl_structs.h
+++ b/sys/net/sixlowpan/rpl/rpl_structs.h
--- a/sys/net/sixlowpan/rpl/trickle.c
+++ b/sys/net/sixlowpan/rpl/trickle.c
@@ -22,7 +22,7 @@
 #include <math.h>
 #include "inttypes.h"
 #include "trickle.h"
-#include "sixlowpan/rpl/rpl.h"
+#include "rpl/rpl.h"

 //TODO in pointer umwandeln, speicher mit malloc holen
 char * timer_over_buf;

--- a/sys/net/sixlowpan/rpl/trickle.h
+++ b/sys/net/sixlowpan/rpl/trickle.h