From 14ba1f33ae8f55a3c7f556cf28647c7116b6c3c4 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Sun, 7 Sep 2014 09:17:23 -0600
Subject: Changes to many Makefiles.  For kernel buil object containing main
 cannot go into library because of name collisions.  The object file must be
 handled as a special case in every Makefile

---
 apps/system/nxplayer/Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'apps/system/nxplayer')

diff --git a/apps/system/nxplayer/Makefile b/apps/system/nxplayer/Makefile
index d0f5de6ec..a5a473c93 100644
--- a/apps/system/nxplayer/Makefile
+++ b/apps/system/nxplayer/Makefile
@@ -54,8 +54,12 @@ APPNAME = nxplayer
 PRIORITY = SCHED_PRIORITY_DEFAULT
 STACKSIZE = 2048
 
+ifeq ($(CONFIG_BUILD_KERNEL),y)
+MAINSRC = nxplayer_main.c
+else
 ifeq ($(CONFIG_NXPLAYER_COMMAND_LINE),y)
-CSRCS   += nxplayer_main.c
+MAINSRC = nxplayer_main.c
+endif
 endif
 
 AOBJS = $(ASRCS:.S=$(OBJEXT))
-- 
cgit v1.2.3