sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Several fixes for errors introduced by last check-ins

Browse Source
This commit is contained in:
Gregory Nutt 2014-09-06 11:17:05 -06:00
parent 72cd42282c
commit e34a96e3b9
5 changed files with 37 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/adc/Makefile
View File

@ -94,7 +94,7 @@ else
install: install:
endif endif
`
ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)

9
examples/hello/Kconfig
View File

@ -10,4 +10,13 @@ config EXAMPLES_HELLO
Enable the \"Hello, World!\" example Enable the \"Hello, World!\" example
if EXAMPLES_HELLO if EXAMPLES_HELLO
config EXAMPLES_HELLO_PROGNAME
string "Program name"
default "hello"
depends on BUILD_KERNEL
---help---
This is the name of the program that will be use when the NSH ELF
program is installed.
endif endif

10
examples/nrf24l01_term/Makefile
View File

@ -83,10 +83,6 @@ $(COBJS): %$(OBJEXT): %.c
$(call ARCHIVE, $(BIN), $(OBJS)) $(call ARCHIVE, $(BIN), $(OBJS))
@touch .built @touch .built
#ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
ifeq ($(CONFIG_BUILD_KERNEL),y) ifeq ($(CONFIG_BUILD_KERNEL),y)
$(INSTALL_DIR)/$(PROGNAME): $(OBJS) $(INSTALL_DIR)/$(PROGNAME): $(OBJS)
@echo "LD: $<" @echo "LD: $<"
@ -99,8 +95,12 @@ install:
endif endif
#ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
else #else
#context: #context:
#endif #endif

8
examples/nsh/Kconfig
View File

@ -13,6 +13,14 @@ config EXAMPLES_NSH
if EXAMPLES_NSH if EXAMPLES_NSH
config EXAMPLES_NSH_PROGNAME
string "Program name"
default "nsh"
depends on BUILD_KERNEL
---help---
This is the name of the program that will be use when the NSH ELF
program is installed.
config EXAMPLES_NSH_CXXINITIALIZE config EXAMPLES_NSH_CXXINITIALIZE
bool "C++ Initialization" bool "C++ Initialization"
default n default n

25
examples/nsh/Makefile
View File

@ -39,30 +39,33 @@ include $(APPDIR)/Make.defs
# NuttShell (NSH) Example # NuttShell (NSH) Example
ASRCS = ASRCS =
CSRCS = nsh_main.c CSRCS = nsh_main.c
AOBJS = $(ASRCS:.S=$(OBJEXT)) AOBJS = $(ASRCS:.S=$(OBJEXT))
COBJS = $(CSRCS:.c=$(OBJEXT)) COBJS = $(CSRCS:.c=$(OBJEXT))
SRCS = $(ASRCS) $(CSRCS) SRCS = $(ASRCS) $(CSRCS)
OBJS = $(AOBJS) $(COBJS) OBJS = $(AOBJS) $(COBJS)
ifeq ($(CONFIG_WINDOWS_NATIVE),y) ifeq ($(CONFIG_WINDOWS_NATIVE),y)
BIN = ..\..\libapps$(LIBEXT) BIN = ..\..\libapps$(LIBEXT)
else else
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
BIN = ..\\..\\libapps$(LIBEXT) BIN = ..\\..\\libapps$(LIBEXT)
else else
BIN = ../../libapps$(LIBEXT) BIN = ../../libapps$(LIBEXT)
endif endif
endif endif
ROOTDEPPATH = --dep-path . CONFIG_NSH_PROGNAME ?= nsh$(EXEEXT)
PROGNAME = $(CONFIG_NSH_PROGNAME)
ROOTDEPPATH = --dep-path .
# Common build # Common build
VPATH = VPATH =
all: .built all: .built
.PHONY: clean depend distclean .PHONY: clean depend distclean