Aksal/nuttx-apps
1
0
Fork 1
mirror of https://github.com/apache/nuttx-apps.git synced 2026-08-24 15:09:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

apps/ make-related fixes. Now builds kernel mode file system

Browse source
This commit is contained in:
Gregory Nutt 2014-09-06 12:28:30 -06:00
parent 1c279a2c0b
commit b9a650ae8c
4 changed files with 49 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

45
examples/hello/Makefile
View file

@ -39,36 +39,45 @@ include $(APPDIR)/Make.defs
# Hello, World! built-in application info
APPNAME = hello
PRIORITY = SCHED_PRIORITY_DEFAULT
STACKSIZE = 2048
APPNAME = hello
PRIORITY = SCHED_PRIORITY_DEFAULT
STACKSIZE = 2048
# Hello, World! Example
ASRCS =
CSRCS = hello_main.c
ASRCS =
CSRCS = hello_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 .
ifeq ($(WINTOOL),y)
INSTALL_DIR = "${shell cygpath -w $(BIN_DIR)}"
else
INSTALL_DIR = $(BIN_DIR)
endif
CONFIG_EXAMPLES_HELLO_PROGNAME ?= hello$(EXEEXT)
PROGNAME = $(CONFIG_EXAMPLES_HELLO_PROGNAME)
ROOTDEPPATH = --dep-path .
# Common build
VPATH =
VPATH =
all: .built
.PHONY: clean depend distclean
@ -84,11 +93,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:

14
examples/nsh/Makefile
View file

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