sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Gregory Nutt 2014-09-07 08:45:38 -06:00
parent 4f14d3b8c4
commit bbded7e15f
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
graphics/screenshot/Makefile
View File

@ -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))

20
graphics/tiff/Makefile
View File

@ -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