From 4283b1515d69bd212fa810b91f795dd510e6696c Mon Sep 17 00:00:00 2001
From: Martine Lenders <mlenders@inf.fu-berlin.de>
Date: Tue, 18 Aug 2015 17:23:40 +0200
Subject: [PATCH] gnrc_rpl: fix dependencies

The dependency conditional for RPL was at the very end of
`Makefile.dep`, giving depending modules no chance to pull in their
dependencies.

Also it pulled in the deprecated module `net_help`, though it did not
use any of it's functions (it just included `inet_pton.h` for `AF_INET6`).
---
 Makefile.dep                          | 18 ++++++++----------
 sys/include/net/ng_rpl.h              |  1 -
 sys/net/routing/ng_rpl/ng_rpl_dodag.c |  1 +
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/Makefile.dep b/Makefile.dep
index fa45d3d2c8..25ba8fe1ee 100644
--- a/Makefile.dep
+++ b/Makefile.dep
@@ -35,6 +35,14 @@ ifneq (,$(filter ng_zep,$(USEMODULE)))
   USEMODULE += vtimer
 endif
 
+ifneq (,$(filter ng_rpl,$(USEMODULE)))
+  USEMODULE += fib
+  USEMODULE += gnrc
+  USEMODULE += ng_ipv6_router_default
+  USEMODULE += trickle
+  USEMODULE += vtimer
+endif
+
 ifneq (,$(filter ieee802154,$(USEMODULE)))
   ifneq (,$(filter ng_ipv6, $(USEMODULE)))
     USEMODULE += ng_sixlowpan
@@ -262,13 +270,3 @@ endif
 ifneq (,$(filter hih6130,$(USEMODULE)))
   USEMODULE += vtimer
 endif
-
-ifneq (,$(filter ng_rpl,$(USEMODULE)))
-  USEMODULE += timex
-  USEMODULE += vtimer
-  USEMODULE += ng_ipv6_router_default
-  USEMODULE += trickle
-  USEMODULE += net_help
-  USEMODULE += universal_address
-  USEMODULE += fib
-endif
diff --git a/sys/include/net/ng_rpl.h b/sys/include/net/ng_rpl.h
index 67717a1ab6..dacc4cfe5d 100644
--- a/sys/include/net/ng_rpl.h
+++ b/sys/include/net/ng_rpl.h
@@ -36,7 +36,6 @@
 #include "net/ng_rpl/structs.h"
 #include "net/ng_rpl/dodag.h"
 #include "net/ng_rpl/of_manager.h"
-#include "inet_ntop.h"
 #include "net/fib.h"
 #include "vtimer.h"
 #include "trickle.h"
diff --git a/sys/net/routing/ng_rpl/ng_rpl_dodag.c b/sys/net/routing/ng_rpl/ng_rpl_dodag.c
index 6da4b1703d..fb8190dfa1 100644
--- a/sys/net/routing/ng_rpl/ng_rpl_dodag.c
+++ b/sys/net/routing/ng_rpl/ng_rpl_dodag.c
@@ -16,6 +16,7 @@
  */
 
 #include <stdbool.h>
+#include "inet_pton.h"
 #include "net/ng_rpl/dodag.h"
 #include "net/ng_rpl/structs.h"
 #include "utlist.h"