From bb4885abdcfea21eb00882f9c927606a97a38bc8 Mon Sep 17 00:00:00 2001
From: Niclas Finne <nfi@sics.se>
Date: Sun, 11 Mar 2012 01:42:45 +0100
Subject: [PATCH] Avoid including APPS twice. Thanks to David Kopf for
 reporting this.

---
 Makefile.include | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/Makefile.include b/Makefile.include
index d427d8c6b..cf2d67d2c 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -107,11 +107,8 @@ PROJECT_OBJECTFILES = ${addprefix $(OBJECTDIR)/,${call oname, $(PROJECT_SOURCEFI
 ifdef APPS
   APPDIRS += ${wildcard ${addprefix $(CONTIKI)/apps/, $(APPS)} \
 	     ${addprefix $(CONTIKI)/platform/$(TARGET)/apps/, $(APPS)} \
-	     ${addprefix , $(APPS)}}
-  APPINCLUDES = ${foreach APP, $(APPS),  ${wildcard ${foreach DIR, $(APPDIRS), $(DIR)/Makefile.$(APP)} \
-                 $(CONTIKI)/apps/$(APP)/Makefile.$(APP) \
-                 $(CONTIKI)/platform/$(TARGET)/apps/$(APP)/Makefile.$(APP) \
-	         $(APP)/Makefile.$(APP)}}
+	     $(APPS)}
+  APPINCLUDES = ${foreach APP, $(APPS), ${wildcard ${foreach DIR, $(APPDIRS), $(DIR)/Makefile.$(APP)}}}
   -include $(APPINCLUDES)
   APP_SOURCES = ${foreach APP, $(APPS), $($(APP)_src)}
   DSC_SOURCES = ${foreach APP, $(APPS), $($(APP)_dsc)}