diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-09-06 12:28:30 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-09-06 12:28:30 -0600 |
| commit | a70b7580eb7648e6012adc90a3f367c30dc79b98 (patch) | |
| tree | 883303cfffa9e14c7daef5d489e20b8119c25166 /apps/examples/nsh | |
| parent | 90404eaed5070b512325a3215933447d0620ce9a (diff) | |
| download | nuttx-a70b7580eb7648e6012adc90a3f367c30dc79b98.tar.gz nuttx-a70b7580eb7648e6012adc90a3f367c30dc79b98.tar.bz2 nuttx-a70b7580eb7648e6012adc90a3f367c30dc79b98.zip | |
apps/ make-related fixes. Now builds kernel mode file system
Diffstat (limited to 'apps/examples/nsh')
| -rw-r--r-- | apps/examples/nsh/Makefile | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/apps/examples/nsh/Makefile b/apps/examples/nsh/Makefile index 40b8c8561..843a15be7 100644 --- a/apps/examples/nsh/Makefile +++ b/apps/examples/nsh/Makefile @@ -58,6 +58,12 @@ else endif endif +ifeq ($(WINTOOL),y) + INSTALL_DIR = "${shell cygpath -w $(BIN_DIR)}" +else + INSTALL_DIR = $(BIN_DIR) +endif + CONFIG_EXAMPLES_NSH_PROGNAME ?= nsh$(EXEEXT) PROGNAME = $(CONFIG_EXAMPLES_NSH_PROGNAME) @@ -81,11 +87,11 @@ $(COBJS): %$(OBJEXT): %.c @touch .built ifeq ($(CONFIG_BUILD_KERNEL),y) -$(INSTALL_DIR)/$(PROGNAME): $(OBJS) - @echo "LD: $<" - $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $(ARCHCRT0OBJ) $^ $(LDLIBS) +$(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) + @echo "LD: $(PROGNAME)" + $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(LDLIBS) -install: $(INSTALL_DIR)/$(PROGNAME) +install: $(BIN_DIR)/$(PROGNAME) else install: |