diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-09-07 09:17:23 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-09-07 09:17:23 -0600 |
| commit | 14ba1f33ae8f55a3c7f556cf28647c7116b6c3c4 (patch) | |
| tree | 20444f1055f8c11f92fa29978ed0b2bd3a9559f6 /apps/system/vi | |
| parent | fb7a08922178beb0cb053a00d1377366d4279e87 (diff) | |
| download | nuttx-14ba1f33ae8f55a3c7f556cf28647c7116b6c3c4.tar.gz nuttx-14ba1f33ae8f55a3c7f556cf28647c7116b6c3c4.tar.bz2 nuttx-14ba1f33ae8f55a3c7f556cf28647c7116b6c3c4.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/system/vi')
| -rw-r--r-- | apps/system/vi/Makefile | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/apps/system/vi/Makefile b/apps/system/vi/Makefile index 9a0709006..16514ba54 100644 --- a/apps/system/vi/Makefile +++ b/apps/system/vi/Makefile @@ -38,7 +38,7 @@ include $(APPDIR)/Make.defs ifeq ($(WINTOOL),y) -INCDIROPT = -w +INCDIROPT = -w endif # VI-Workalike Editor @@ -46,31 +46,32 @@ endif CONFIG_SYSTEM_VI_STACKSIZE ?= 2048 CONFIG_SYSTEM_VI_PRIORITY ?= 100 -APPNAME = vi -PRIORITY = $(CONFIG_SYSTEM_VI_PRIORITY) -STACKSIZE = $(CONFIG_SYSTEM_VI_STACKSIZE) +APPNAME = vi +PRIORITY = $(CONFIG_SYSTEM_VI_PRIORITY) +STACKSIZE = $(CONFIG_SYSTEM_VI_STACKSIZE) -ASRCS = -CSRCS = vi.c +ASRCS = +CSRCS = +MAINSRC = vi.c -AOBJS = $(ASRCS:.S=$(OBJEXT)) -COBJS = $(CSRCS:.c=$(OBJEXT)) +AOBJS = $(ASRCS:.S=$(OBJEXT)) +COBJS = $(CSRCS:.c=$(OBJEXT)) MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) -SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) -OBJS = $(AOBJS) $(COBJS) +SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) +OBJS = $(AOBJS) $(COBJS) ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif 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 @@ -83,13 +84,13 @@ endif CONFIG_XYZ_PROGNAME ?= vi$(EXEEXT) PROGNAME = $(CONFIG_XYZ_PROGNAME) -ROOTDEPPATH = --dep-path . +ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = -all: .built +all: .built .PHONY: context depend clean distclean $(AOBJS): %$(OBJEXT): %.S |