From bbded7e15f960fc775533a98673cd5e1ffdd6256 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Sun, 7 Sep 2014 08:45:38 -0600
Subject: [PATCH] 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

---
 graphics/screenshot/Makefile |  3 ++-
 graphics/tiff/Makefile       | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/graphics/screenshot/Makefile b/graphics/screenshot/Makefile
index 0d1e2128d..34641002e 100644
--- a/graphics/screenshot/Makefile
+++ b/graphics/screenshot/Makefile
@@ -44,7 +44,8 @@ endif
 # TIFF Screenshot utility
 
 ASRCS =
-CSRCS = screenshot_main.c
+CSRCS =
+MAINSRC = screenshot_main.c
 
 AOBJS = $(ASRCS:.S=$(OBJEXT))
 COBJS = $(CSRCS:.c=$(OBJEXT))
diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index 3f04b4f30..bc109bd5d 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -39,22 +39,22 @@ include $(APPDIR)/Make.defs
 
 # NuttX TIFF Creation Tool
 
-ASRCS		=
-CSRCS		= tiff_addstrip.c tiff_finalize.c tiff_initialize.c tiff_utils.c
+ASRCS =
+CSRCS = tiff_addstrip.c tiff_finalize.c tiff_initialize.c tiff_utils.c
 
-AOBJS		= $(ASRCS:.S=$(OBJEXT))
-COBJS		= $(CSRCS:.c=$(OBJEXT))
+AOBJS = $(ASRCS:.S=$(OBJEXT))
+COBJS = $(CSRCS:.c=$(OBJEXT))
 
-SRCS		= $(ASRCS) $(CSRCS)
-OBJS		= $(AOBJS) $(COBJS)
+SRCS = $(ASRCS) $(CSRCS)
+OBJS = $(AOBJS) $(COBJS)
 
 ifeq ($(CONFIG_WINDOWS_NATIVE),y)
-  BIN		= ..\..\libapps$(LIBEXT)
+  BIN = ..\..\libapps$(LIBEXT)
 else
 ifeq ($(WINTOOL),y)
-  BIN		= ..\\..\\libapps$(LIBEXT)
+  BIN = ..\\..\\libapps$(LIBEXT)
 else
-  BIN		= ../../libapps$(LIBEXT)
+  BIN = ../../libapps$(LIBEXT)
 endif
 endif
 
@@ -62,7 +62,7 @@ ROOTDEPPATH	= --dep-path .
 
 # Common build
 
-VPATH		=
+VPATH =
 
 all: .built
 .PHONY: context clean depend distclean