summaryrefslogtreecommitdiff
path: root/apps/examples
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-09-07 06:17:46 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-09-07 06:17:46 -0600
commit4e07afd09beb927fc064a2b8495f58db9f51c394 (patch)
tree119958048e4f6ab2f02e28db1f661599ee8b30c7 /apps/examples
parentabcda1fb8e419141400202d77c6ff1c3d4d81265 (diff)
downloadnuttx-4e07afd09beb927fc064a2b8495f58db9f51c394.tar.gz
nuttx-4e07afd09beb927fc064a2b8495f58db9f51c394.tar.bz2
nuttx-4e07afd09beb927fc064a2b8495f58db9f51c394.zip
Fix apps/examples/hello/Makefile
Diffstat (limited to 'apps/examples')
-rw-r--r--apps/examples/hello/Makefile15
1 files changed, 11 insertions, 4 deletions
diff --git a/apps/examples/hello/Makefile b/apps/examples/hello/Makefile
index 3a5c3df98..56405cdbb 100644
--- a/apps/examples/hello/Makefile
+++ b/apps/examples/hello/Makefile
@@ -46,14 +46,20 @@ STACKSIZE = 2048
# Hello, World! Example
ASRCS =
-CSRCS = hello_main.c
+CSRCS =
+MAINSRC = hello_main.c
AOBJS = $(ASRCS:.S=$(OBJEXT))
COBJS = $(CSRCS:.c=$(OBJEXT))
+MAINOBJ = $(MAINSRC:.c=$(OBJEXT))
-SRCS = $(ASRCS) $(CSRCS)
+SRCS = $(ASRCS) $(CSRCS) $(MAINSRC)
OBJS = $(AOBJS) $(COBJS)
+ifneq ($(CONFIG_BUILD_KERNEL),y)
+ OBJS += $(MAINOBJ)
+endif
+
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
BIN = ..\..\libapps$(LIBEXT)
else
@@ -93,9 +99,10 @@ $(COBJS): %$(OBJEXT): %.c
@touch .built
ifeq ($(CONFIG_BUILD_KERNEL),y)
-$(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS)
+$(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ)
@echo "LD: $(PROGNAME)"
- $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(LDLIBS)
+ $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS)
+ $(Q) $(NM) -u $(INSTALL_DIR)$(DELIM)$(PROGNAME)
install: $(BIN_DIR)$(DELIM)$(PROGNAME)