summaryrefslogtreecommitdiff
path: root/apps/system
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-09-07 07:05:54 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-09-07 07:05:54 -0600
commit5a874f322600b650145dcb55bdf51e66fbf4acef (patch)
tree53ca82ce060bf7a9a219eed794be1c2b4f608340 /apps/system
parent6ba90d01b2bc73b9ffd9a0ca8305f97ed34efb68 (diff)
downloadnuttx-5a874f322600b650145dcb55bdf51e66fbf4acef.tar.gz
nuttx-5a874f322600b650145dcb55bdf51e66fbf4acef.tar.bz2
nuttx-5a874f322600b650145dcb55bdf51e66fbf4acef.zip
If now a kernel build, then add the main object in with all of the rest
Diffstat (limited to 'apps/system')
-rw-r--r--apps/system/cdcacm/Makefile4
-rw-r--r--apps/system/composite/Makefile4
-rw-r--r--apps/system/flash_eraseall/Makefile4
-rw-r--r--apps/system/free/Makefile4
-rw-r--r--apps/system/hex2bin/Makefile4
-rw-r--r--apps/system/i2c/Makefile4
-rw-r--r--apps/system/install/Makefile4
-rw-r--r--apps/system/mdio/Makefile4
-rw-r--r--apps/system/nxplayer/Makefile4
-rw-r--r--apps/system/poweroff/Makefile4
-rw-r--r--apps/system/prun/Makefile4
-rw-r--r--apps/system/ramtest/Makefile4
-rw-r--r--apps/system/ramtron/Makefile4
-rw-r--r--apps/system/sdcard/Makefile4
-rw-r--r--apps/system/sudoku/Makefile4
-rw-r--r--apps/system/sysinfo/Makefile4
-rw-r--r--apps/system/usbmsc/Makefile4
-rw-r--r--apps/system/vi/Makefile4
-rw-r--r--apps/system/zmodem/Makefile4
19 files changed, 76 insertions, 0 deletions
diff --git a/apps/system/cdcacm/Makefile b/apps/system/cdcacm/Makefile
index 8084c4880..c76dc278b 100644
--- a/apps/system/cdcacm/Makefile
+++ b/apps/system/cdcacm/Makefile
@@ -48,6 +48,10 @@ COBJS = $(CSRCS:.c=$(OBJEXT))
SRCS = $(ASRCS) $(CSRCS) $(MAINSRC)
OBJS = $(AOBJS) $(COBJS)
+ifneq ($(CONFIG_BUILD_KERNEL),y)
+ OBJS += $(MAINOBJ)
+endif
+
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
BIN = ..\..\libapps$(LIBEXT)
else
diff --git a/apps/system/composite/Makefile b/apps/system/composite/Makefile
index 6edc5f403..093416b8a 100644
--- a/apps/system/composite/Makefile
+++ b/apps/system/composite/Makefile
@@ -48,6 +48,10 @@ COBJS = $(CSRCS:.c=$(OBJEXT))
SRCS = $(ASRCS) $(CSRCS) $(MAINSRC)
OBJS = $(AOBJS) $(COBJS)
+ifneq ($(CONFIG_BUILD_KERNEL),y)
+ OBJS += $(MAINOBJ)
+endif
+
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
BIN = ..\..\libapps$(LIBEXT)
else
diff --git a/apps/system/flash_eraseall/Makefile b/apps/system/flash_eraseall/Makefile
index 40d0dc43b..5234d8c30 100644
--- a/apps/system/flash_eraseall/Makefile
+++ b/apps/system/flash_eraseall/Makefile
@@ -62,6 +62,10 @@ COBJS = $(CSRCS:.c=$(OBJEXT))
SRCS = $(ASRCS) $(CSRCS) $(MAINSRC)
OBJS = $(AOBJS) $(COBJS)
+ifneq ($(CONFIG_BUILD_KERNEL),y)
+ OBJS += $(MAINOBJ)
+endif
+
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
BIN = ..\..\libapps$(LIBEXT)
else
diff --git a/apps/system/free/Makefile b/apps/system/free/Makefile
index 9f1edf527..7697e6c3d 100644
--- a/apps/system/free/Makefile
+++ b/apps/system/free/Makefile
@@ -58,6 +58,10 @@ COBJS = $(CSRCS:.c=$(OBJEXT))
SRCS = $(ASRCS) $(CSRCS) $(MAINSRC)
OBJS = $(AOBJS) $(COBJS)
+ifneq ($(CONFIG_BUILD_KERNEL),y)
+ OBJS += $(MAINOBJ)
+endif
+
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
BIN = ..\..\libapps$(LIBEXT)
else
diff --git a/apps/system/hex2bin/Makefile b/apps/system/hex2bin/Makefile
index d77768778..674434fd1 100644
--- a/apps/system/hex2bin/Makefile
+++ b/apps/system/hex2bin/Makefile
@@ -56,6 +56,10 @@ COBJS = $(CSRCS:.c=$(OBJEXT))
SRCS = $(ASRCS) $(CSRCS) $(MAINSRC)
OBJS = $(AOBJS) $(COBJS)
+ifneq ($(CONFIG_BUILD_KERNEL),y)
+ OBJS += $(MAINOBJ)
+endif
+
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
BIN = ..\..\libapps$(LIBEXT)
else
diff --git a/apps/system/i2c/Makefile b/apps/system/i2c/Makefile
index a72713298..520248789 100644
--- a/apps/system/i2c/Makefile
+++ b/apps/system/i2c/Makefile
@@ -48,6 +48,10 @@ COBJS = $(CSRCS:.c=$(OBJEXT))
SRCS = $(ASRCS) $(CSRCS) $(MAINSRC)
OBJS = $(AOBJS) $(COBJS)
+ifneq ($(CONFIG_BUILD_KERNEL),y)
+ OBJS += $(MAINOBJ)
+endif
+
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
BIN = ..\..\libapps$(LIBEXT)
else
diff --git a/apps/system/install/Makefile b/apps/system/install/Makefile
index f664f21a1..ccf241f1e 100644
--- a/apps/system/install/Makefile
+++ b/apps/system/install/Makefile
@@ -62,6 +62,10 @@ COBJS = $(CSRCS:.c=$(OBJEXT))
SRCS = $(ASRCS) $(CSRCS) $(MAINSRC)
OBJS = $(AOBJS) $(COBJS)
+ifneq ($(CONFIG_BUILD_KERNEL),y)
+ OBJS += $(MAINOBJ)
+endif
+
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
BIN = ..\..\libapps$(LIBEXT)
else
diff --git a/apps/system/mdio/Makefile b/apps/system/mdio/Makefile
index 4352a5b57..b22abf159 100644
--- a/apps/system/mdio/Makefile
+++ b/apps/system/mdio/Makefile
@@ -54,6 +54,10 @@ COBJS = $(CSRCS:.c=$(OBJEXT))
SRCS = $(ASRCS) $(CSRCS) $(MAINSRC)
OBJS = $(AOBJS) $(COBJS)
+ifneq ($(CONFIG_BUILD_KERNEL),y)
+ OBJS += $(MAINOBJ)
+endif
+
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
BIN = ..\..\libapps$(LIBEXT)
else
diff --git a/apps/system/nxplayer/Makefile b/apps/system/nxplayer/Makefile
index 110319a78..8bbb0523e 100644
--- a/apps/system/nxplayer/Makefile
+++ b/apps/system/nxplayer/Makefile
@@ -64,6 +64,10 @@ COBJS = $(CSRCS:.c=$(OBJEXT))
SRCS = $(ASRCS) $(CSRCS) $(MAINSRC)
OBJS = $(AOBJS) $(COBJS)
+ifneq ($(CONFIG_BUILD_KERNEL),y)
+ OBJS += $(MAINOBJ)
+endif
+
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
BIN = ..\..\libapps$(LIBEXT)
else
diff --git a/apps/system/poweroff/Makefile b/apps/system/poweroff/Makefile
index cd1dc7d81..f1aca05c5 100644
--- a/apps/system/poweroff/Makefile
+++ b/apps/system/poweroff/Makefile
@@ -62,6 +62,10 @@ COBJS = $(CSRCS:.c=$(OBJEXT))
SRCS = $(ASRCS) $(CSRCS) $(MAINSRC)
OBJS = $(AOBJS) $(COBJS)
+ifneq ($(CONFIG_BUILD_KERNEL),y)
+ OBJS += $(MAINOBJ)
+endif
+
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
BIN = ..\..\libapps$(LIBEXT)
else
diff --git a/apps/system/prun/Makefile b/apps/system/prun/Makefile
index 48ba233f4..34bf1eec3 100644
--- a/apps/system/prun/Makefile
+++ b/apps/system/prun/Makefile
@@ -68,6 +68,10 @@ COBJS = $(CSRCS:.c=$(OBJEXT))
SRCS = $(ASRCS) $(CSRCS) $(MAINSRC)
OBJS = $(AOBJS) $(COBJS)
+ifneq ($(CONFIG_BUILD_KERNEL),y)
+ OBJS += $(MAINOBJ)
+endif
+
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
BIN = ..\..\libapps$(LIBEXT)
else
diff --git a/apps/system/ramtest/Makefile b/apps/system/ramtest/Makefile
index b7ef04b39..01f2a96f4 100644
--- a/apps/system/ramtest/Makefile
+++ b/apps/system/ramtest/Makefile
@@ -55,6 +55,10 @@ COBJS = $(CSRCS:.c=$(OBJEXT))
SRCS = $(ASRCS) $(CSRCS) $(MAINSRC)
OBJS = $(AOBJS) $(COBJS)
+ifneq ($(CONFIG_BUILD_KERNEL),y)
+ OBJS += $(MAINOBJ)
+endif
+
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
BIN = ..\..\libapps$(LIBEXT)
else
diff --git a/apps/system/ramtron/Makefile b/apps/system/ramtron/Makefile
index ad0579138..1ae263a48 100644
--- a/apps/system/ramtron/Makefile
+++ b/apps/system/ramtron/Makefile
@@ -62,6 +62,10 @@ COBJS = $(CSRCS:.c=$(OBJEXT))
SRCS = $(ASRCS) $(CSRCS) $(MAINSRC)
OBJS = $(AOBJS) $(COBJS)
+ifneq ($(CONFIG_BUILD_KERNEL),y)
+ OBJS += $(MAINOBJ)
+endif
+
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
BIN = ..\..\libapps$(LIBEXT)
else
diff --git a/apps/system/sdcard/Makefile b/apps/system/sdcard/Makefile
index 961cd54a5..c5e0da4fa 100644
--- a/apps/system/sdcard/Makefile
+++ b/apps/system/sdcard/Makefile
@@ -62,6 +62,10 @@ COBJS = $(CSRCS:.c=$(OBJEXT))
SRCS = $(ASRCS) $(CSRCS) $(MAINSRC)
OBJS = $(AOBJS) $(COBJS)
+ifneq ($(CONFIG_BUILD_KERNEL),y)
+ OBJS += $(MAINOBJ)
+endif
+
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
BIN = ..\..\libapps$(LIBEXT)
else
diff --git a/apps/system/sudoku/Makefile b/apps/system/sudoku/Makefile
index 6cca9af4d..f1bd2cafc 100644
--- a/apps/system/sudoku/Makefile
+++ b/apps/system/sudoku/Makefile
@@ -58,6 +58,10 @@ COBJS = $(CSRCS:.c=$(OBJEXT))
SRCS = $(ASRCS) $(CSRCS) $(MAINSRC)
OBJS = $(AOBJS) $(COBJS)
+ifneq ($(CONFIG_BUILD_KERNEL),y)
+ OBJS += $(MAINOBJ)
+endif
+
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
BIN = ..\..\libapps$(LIBEXT)
else
diff --git a/apps/system/sysinfo/Makefile b/apps/system/sysinfo/Makefile
index ef5c6ca34..fbac32a7c 100644
--- a/apps/system/sysinfo/Makefile
+++ b/apps/system/sysinfo/Makefile
@@ -63,6 +63,10 @@ COBJS = $(CSRCS:.c=$(OBJEXT))
SRCS = $(ASRCS) $(CSRCS) $(MAINSRC)
OBJS = $(AOBJS) $(COBJS)
+ifneq ($(CONFIG_BUILD_KERNEL),y)
+ OBJS += $(MAINOBJ)
+endif
+
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
BIN = ..\..\libapps$(LIBEXT)
else
diff --git a/apps/system/usbmsc/Makefile b/apps/system/usbmsc/Makefile
index 2f62907cf..86ad32fd7 100644
--- a/apps/system/usbmsc/Makefile
+++ b/apps/system/usbmsc/Makefile
@@ -48,6 +48,10 @@ COBJS = $(CSRCS:.c=$(OBJEXT))
SRCS = $(ASRCS) $(CSRCS) $(MAINSRC)
OBJS = $(AOBJS) $(COBJS)
+ifneq ($(CONFIG_BUILD_KERNEL),y)
+ OBJS += $(MAINOBJ)
+endif
+
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
BIN = ..\..\libapps$(LIBEXT)
else
diff --git a/apps/system/vi/Makefile b/apps/system/vi/Makefile
index eb1b10c69..8e4c7c146 100644
--- a/apps/system/vi/Makefile
+++ b/apps/system/vi/Makefile
@@ -59,6 +59,10 @@ COBJS = $(CSRCS:.c=$(OBJEXT))
SRCS = $(ASRCS) $(CSRCS) $(MAINSRC)
OBJS = $(AOBJS) $(COBJS)
+ifneq ($(CONFIG_BUILD_KERNEL),y)
+ OBJS += $(MAINOBJ)
+endif
+
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
BIN = ..\..\libapps$(LIBEXT)
else
diff --git a/apps/system/zmodem/Makefile b/apps/system/zmodem/Makefile
index f544bf309..297f91b48 100644
--- a/apps/system/zmodem/Makefile
+++ b/apps/system/zmodem/Makefile
@@ -58,6 +58,10 @@ COBJS = $(CSRCS:.c=$(OBJEXT))
SRCS = $(ASRCS) $(CSRCS) $(MAINSRC)
OBJS = $(AOBJS) $(COBJS)
+ifneq ($(CONFIG_BUILD_KERNEL),y)
+ OBJS += $(MAINOBJ)
+endif
+
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
BIN = ..\..\libapps$(LIBEXT)
else
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-21 03:17:22 +0000