diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-09-07 08:45:38 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-09-07 08:45:38 -0600 |
| commit | c4d5a48feb70656a5a4c5bfda665d5e1eb93e943 (patch) | |
| tree | 69d248548fcedc0feef28a7b197425de3e8cb20a /apps/graphics | |
| parent | 26b2fe3e5bfff38e941312edf4a6fe94a9e4dd43 (diff) | |
| download | nuttx-c4d5a48feb70656a5a4c5bfda665d5e1eb93e943.tar.gz nuttx-c4d5a48feb70656a5a4c5bfda665d5e1eb93e943.tar.bz2 nuttx-c4d5a48feb70656a5a4c5bfda665d5e1eb93e943.zip | |
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
Diffstat (limited to 'apps/graphics')
| -rw-r--r-- | apps/graphics/screenshot/Makefile | 3 | ||||
| -rw-r--r-- | apps/graphics/tiff/Makefile | 20 |
2 files changed, 12 insertions, 11 deletions
diff --git a/apps/graphics/screenshot/Makefile b/apps/graphics/screenshot/Makefile index 0d1e2128d..34641002e 100644 --- a/apps/graphics/screenshot/Makefile +++ b/apps/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/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 |