From c4d5a48feb70656a5a4c5bfda665d5e1eb93e943 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sun, 7 Sep 2014 08:45:38 -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/graphics/tiff/Makefile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'apps/graphics/tiff/Makefile') diff --git a/apps/graphics/tiff/Makefile b/apps/graphics/tiff/Makefile index 3f04b4f30..bc109bd5d 100644 --- a/apps/graphics/tiff/Makefile +++ b/apps/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 -- cgit v1.2.3