diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-09-06 11:17:05 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-09-06 11:17:05 -0600 |
| commit | f146a8370a95b488297c44a561badc474f158c00 (patch) | |
| tree | a1146b32ebb443de464ab4a1854076482b242465 /apps/examples/nsh/Makefile | |
| parent | a4d7e282806939ce47853db9de0e80471b0e256f (diff) | |
| download | nuttx-f146a8370a95b488297c44a561badc474f158c00.tar.gz nuttx-f146a8370a95b488297c44a561badc474f158c00.tar.bz2 nuttx-f146a8370a95b488297c44a561badc474f158c00.zip | |
Several fixes for errors introduced by last check-ins
Diffstat (limited to 'apps/examples/nsh/Makefile')
| -rw-r--r-- | apps/examples/nsh/Makefile | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/apps/examples/nsh/Makefile b/apps/examples/nsh/Makefile index f38d477fc..f16a40549 100644 --- a/apps/examples/nsh/Makefile +++ b/apps/examples/nsh/Makefile @@ -39,30 +39,33 @@ include $(APPDIR)/Make.defs # NuttShell (NSH) Example -ASRCS = -CSRCS = nsh_main.c +ASRCS = +CSRCS = nsh_main.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 -ROOTDEPPATH = --dep-path . +CONFIG_NSH_PROGNAME ?= nsh$(EXEEXT) +PROGNAME = $(CONFIG_NSH_PROGNAME) + +ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend distclean |