From cf17bb441f57d07534a04e0c0e3f288257626cee Mon Sep 17 00:00:00 2001
From: Adam Dunkels <adam@thingsquare.com>
Date: Fri, 22 Nov 2013 09:46:11 +0100
Subject: [PATCH] First stab at implementing the MODULES mechanism

---
 Makefile.include | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/Makefile.include b/Makefile.include
index 7310cb2dc..f8c9c8eed 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -67,7 +67,7 @@ LIBS    = memb.c mmem.c timer.c list.c etimer.c ctimer.c energest.c rtimer.c sti
           print-stats.c ifft.c crc16.c random.c ringbuf.c settings.c
 DEV     = nullradio.c
 
-include $(CONTIKI)/core/net/Makefile.uip
+#include $(CONTIKI)/core/net/Makefile.uip
 include $(CONTIKI)/core/net/rpl/Makefile.rpl
 
 CTK     = ctk.c
@@ -121,6 +121,16 @@ else
   include $(target_makefile)
 endif
 
+ifdef MODULES
+  MODULESSUBST = ${subst /,-,$(MODULES)}
+  MODULEDIRS = ${wildcard ${addprefix $(CONTIKI)/, $(MODULES)}}
+  MODULEINCLUDES = ${foreach m, $(MODULESSUBST), ${wildcard ${foreach d, $(MODULEDIRS), $(d)/Makefile.$(m)}}}
+  -include $(MODULEINCLUDES)
+  MODULES_SOURCES = ${foreach m, $(MODULESSUBST), $($(m)_src)}
+  CONTIKI_SOURCEFILES += $(MODULES_SOURCES)
+  APPDS += $(MODULEDIRS)
+endif
+
 ifdef PLATFORMAPPS
   PLATFORMAPPDS = ${wildcard ${foreach DIR, $(APPDIRS), ${addprefix $(DIR)/, $(PLATFORMAPPS)}}} \
              ${wildcard ${addprefix $(CONTIKI)/apps/, $(PLATFORMAPPS)} \