From c80615913fb9c073f96f8f6fc697ce40db0c922e Mon Sep 17 00:00:00 2001
From: Adam Dunkels <adam@thingsquare.com>
Date: Tue, 26 Nov 2013 16:17:39 +0100
Subject: [PATCH] Include the core/net and core/net/ip modules in the
 core/net/ipv4 module

---
 core/net/ipv4/Makefile.core-net-ipv4 | 6 ++++++
 platform/sky/contiki-sky-main.c      | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/core/net/ipv4/Makefile.core-net-ipv4 b/core/net/ipv4/Makefile.core-net-ipv4
index 416f82eb7..87f1fde6b 100644
--- a/core/net/ipv4/Makefile.core-net-ipv4
+++ b/core/net/ipv4/Makefile.core-net-ipv4
@@ -1,3 +1,9 @@
 core-net-ipv4_src = \
 uaodv-rt.c  uip.c     uip-fw-drv.c    uip-over-mesh.c \
 uaodv.c  uip_arp.c   uip-fw.c  uip-neighbor.c
+
+MODULES += core/net core/net/ip
+include $(CONTIKI)/core/net/Makefile.core-net
+include $(CONTIKI)/core/net/ip/Makefile.core-net-ip
+
+
diff --git a/platform/sky/contiki-sky-main.c b/platform/sky/contiki-sky-main.c
index a169f6d8c..9fea4e698 100644
--- a/platform/sky/contiki-sky-main.c
+++ b/platform/sky/contiki-sky-main.c
@@ -79,7 +79,7 @@ extern int msp430_dco_required;
 #if WITH_UIP
 #include "net/ip/uip.h"
 #include "net/ipv4/uip-fw.h"
-#include "net/uip-fw-drv.h"
+#include "net/ipv4/uip-fw-drv.h"
 #include "net/ipv4/uip-over-mesh.h"
 static struct uip_fw_netif slipif =
   {UIP_FW_NETIF(192,168,1,2, 255,255,255,255, slip_send)};