summaryrefslogtreecommitdiff
path: root/apps/system
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-09-06 08:00:47 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-09-06 08:00:47 -0600
commit5a79aa40e5a82a8358df0ab581f436df1e204134 (patch)
tree4d168ff54ec4177c03d24c074a82f5734da2b3a5 /apps/system
parent0c6521fb7bcde9542ccb41d84aaf075f9871e8df (diff)
downloadnuttx-5a79aa40e5a82a8358df0ab581f436df1e204134.tar.gz
nuttx-5a79aa40e5a82a8358df0ab581f436df1e204134.tar.bz2
nuttx-5a79aa40e5a82a8358df0ab581f436df1e204134.zip
Add an install target to all makefiles. For the import build, the top-level Makefile now does two passes: (1) builds libapp.a, then (2) installs the programs (not yet finished)
Diffstat (limited to 'apps/system')
-rw-r--r--apps/system/Makefile2
-rw-r--r--apps/system/cdcacm/Makefile4
-rw-r--r--apps/system/cle/Makefile2
-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/Makefile2
-rw-r--r--apps/system/i2c/Makefile4
-rw-r--r--apps/system/inifile/Makefile2
-rw-r--r--apps/system/install/Makefile4
-rw-r--r--apps/system/mdio/Makefile4
-rw-r--r--apps/system/nxplayer/Makefile6
-rw-r--r--apps/system/poweroff/Makefile4
-rw-r--r--apps/system/prun/Makefile6
-rw-r--r--apps/system/ramtest/Makefile4
-rw-r--r--apps/system/ramtron/Makefile4
-rw-r--r--apps/system/readline/Makefile2
-rw-r--r--apps/system/sdcard/Makefile4
-rw-r--r--apps/system/stackmonitor/Makefile4
-rw-r--r--apps/system/sudoku/Makefile4
-rw-r--r--apps/system/sysinfo/Makefile4
-rw-r--r--apps/system/usbmonitor/Makefile4
-rw-r--r--apps/system/usbmsc/Makefile4
-rw-r--r--apps/system/vi/Makefile4
-rw-r--r--apps/system/zmodem/Makefile4
25 files changed, 94 insertions, 0 deletions
diff --git a/apps/system/Makefile b/apps/system/Makefile
index f5d35bfc6..e0806ebda 100644
--- a/apps/system/Makefile
+++ b/apps/system/Makefile
@@ -69,6 +69,8 @@ $(foreach SDIR, $(INSTALLED_DIRS), $(eval $(call SDIR_template,$(SDIR),distclean
nothing:
+install:
+
context:
depend: $(foreach SDIR, $(INSTALLED_DIRS), $(SDIR)_depend)
diff --git a/apps/system/cdcacm/Makefile b/apps/system/cdcacm/Makefile
index 283add323..18ba2508e 100644
--- a/apps/system/cdcacm/Makefile
+++ b/apps/system/cdcacm/Makefile
@@ -94,8 +94,12 @@ $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME1)_main.bdat: $(DEPCONFIG) Makefile
$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME2)_main.bdat: $(DEPCONFIG) Makefile
$(call REGISTER,$(APPNAME2),$(PRIORITY2),$(STACKSIZE2),$(APPNAME2)_main)
+install:
+
context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME1)_main.bdat $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME2)_main.bdat
else
+install:
+
context:
endif
diff --git a/apps/system/cle/Makefile b/apps/system/cle/Makefile
index 78b1ffd35..33fd03afa 100644
--- a/apps/system/cle/Makefile
+++ b/apps/system/cle/Makefile
@@ -81,6 +81,8 @@ $(COBJS): %$(OBJEXT): %.c
$(call ARCHIVE, $(BIN), $(OBJS))
$(Q) touch .built
+install:
+
context:
# Create dependencies
diff --git a/apps/system/composite/Makefile b/apps/system/composite/Makefile
index a4ca37871..64f3d74ab 100644
--- a/apps/system/composite/Makefile
+++ b/apps/system/composite/Makefile
@@ -94,8 +94,12 @@ $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME1)_main.bdat: $(DEPCONFIG) Makefile
$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME2)_main.bdat: $(DEPCONFIG) Makefile
$(call REGISTER,$(APPNAME2),$(PRIORITY2),$(STACKSIZE2),$(APPNAME2)_main)
+install:
+
context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME1)_main.bdat $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME2)_main.bdat
else
+install:
+
context:
endif
diff --git a/apps/system/flash_eraseall/Makefile b/apps/system/flash_eraseall/Makefile
index 6b51aed35..04edb966b 100644
--- a/apps/system/flash_eraseall/Makefile
+++ b/apps/system/flash_eraseall/Makefile
@@ -97,8 +97,12 @@ ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
+install:
+
context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
else
+install:
+
context:
endif
diff --git a/apps/system/free/Makefile b/apps/system/free/Makefile
index 737d111af..325b6abaa 100644
--- a/apps/system/free/Makefile
+++ b/apps/system/free/Makefile
@@ -93,8 +93,12 @@ ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
+install:
+
context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
else
+install:
+
context:
endif
diff --git a/apps/system/hex2bin/Makefile b/apps/system/hex2bin/Makefile
index f7a710a74..61e0a69ee 100644
--- a/apps/system/hex2bin/Makefile
+++ b/apps/system/hex2bin/Makefile
@@ -116,6 +116,8 @@ else
rhex2mem:
endif
+install:
+
context: rhex2bin rhex2mem
.depend: Makefile $(SRCS)
diff --git a/apps/system/i2c/Makefile b/apps/system/i2c/Makefile
index 4cad67ecf..ef52e3153 100644
--- a/apps/system/i2c/Makefile
+++ b/apps/system/i2c/Makefile
@@ -84,8 +84,12 @@ ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
+install:
+
context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
else
+install:
+
context:
endif
diff --git a/apps/system/inifile/Makefile b/apps/system/inifile/Makefile
index d51ba1b7d..6e823b9bb 100644
--- a/apps/system/inifile/Makefile
+++ b/apps/system/inifile/Makefile
@@ -76,6 +76,8 @@ $(COBJS): %$(OBJEXT): %.c
$(call ARCHIVE, $(BIN), $(OBJS))
$(Q) touch .built
+install:
+
context:
.depend: Makefile $(SRCS)
diff --git a/apps/system/install/Makefile b/apps/system/install/Makefile
index fb7c4de05..9c7fc8dbd 100644
--- a/apps/system/install/Makefile
+++ b/apps/system/install/Makefile
@@ -97,8 +97,12 @@ ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
+install:
+
context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
else
+install:
+
context:
endif
diff --git a/apps/system/mdio/Makefile b/apps/system/mdio/Makefile
index 8a9fea23a..10220f350 100644
--- a/apps/system/mdio/Makefile
+++ b/apps/system/mdio/Makefile
@@ -87,8 +87,12 @@ ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
+install:
+
context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
else
+install:
+
context:
endif
diff --git a/apps/system/nxplayer/Makefile b/apps/system/nxplayer/Makefile
index 812b9e7bf..501600023 100644
--- a/apps/system/nxplayer/Makefile
+++ b/apps/system/nxplayer/Makefile
@@ -100,11 +100,17 @@ ifeq ($(CONFIG_NXPLAYER_COMMAND_LINE),y)
$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
+install:
+
context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
else
+install:
+
context:
endif
else
+install:
+
context:
endif
diff --git a/apps/system/poweroff/Makefile b/apps/system/poweroff/Makefile
index 382911875..5203db0be 100644
--- a/apps/system/poweroff/Makefile
+++ b/apps/system/poweroff/Makefile
@@ -97,8 +97,12 @@ ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
+install:
+
context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
else
+install:
+
context:
endif
diff --git a/apps/system/prun/Makefile b/apps/system/prun/Makefile
index 6d5d0a768..430b48d4d 100644
--- a/apps/system/prun/Makefile
+++ b/apps/system/prun/Makefile
@@ -102,11 +102,17 @@ ifeq ($(CONFIG_SYSTEM_PEXEC),y)
$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
+install:
+
context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
else
+install:
+
context:
endif
else
+install:
+
context:
endif
diff --git a/apps/system/ramtest/Makefile b/apps/system/ramtest/Makefile
index c6df8bde4..9d8d6e8ab 100644
--- a/apps/system/ramtest/Makefile
+++ b/apps/system/ramtest/Makefile
@@ -90,8 +90,12 @@ ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
$(BUILTIN_REGISTRY)$(DELIM)ramtest.bdat: $(DEPCONFIG) Makefile
$(call REGISTER,"ramtest",$(PRIORITY),$(STACKSIZE),ramtest_main)
+install:
+
context: $(BUILTIN_REGISTRY)$(DELIM)ramtest.bdat
else
+install:
+
context:
endif
diff --git a/apps/system/ramtron/Makefile b/apps/system/ramtron/Makefile
index 4ac47431a..fea0d4939 100644
--- a/apps/system/ramtron/Makefile
+++ b/apps/system/ramtron/Makefile
@@ -97,8 +97,12 @@ ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
+install:
+
context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
else
+install:
+
context:
endif
diff --git a/apps/system/readline/Makefile b/apps/system/readline/Makefile
index 1f60f45fc..191c36cb9 100644
--- a/apps/system/readline/Makefile
+++ b/apps/system/readline/Makefile
@@ -89,6 +89,8 @@ $(COBJS): %$(OBJEXT): %.c
# Context build phase target
+install:
+
context:
# Dependency build phase target
diff --git a/apps/system/sdcard/Makefile b/apps/system/sdcard/Makefile
index 87dfb697b..acf8381d3 100644
--- a/apps/system/sdcard/Makefile
+++ b/apps/system/sdcard/Makefile
@@ -97,8 +97,12 @@ ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
+install:
+
context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
else
+install:
+
context:
endif
diff --git a/apps/system/stackmonitor/Makefile b/apps/system/stackmonitor/Makefile
index 5e7102c4f..f2b73365d 100644
--- a/apps/system/stackmonitor/Makefile
+++ b/apps/system/stackmonitor/Makefile
@@ -93,8 +93,12 @@ $(BUILTIN_REGISTRY)$(DELIM)stackmonitor_start.bdat: $(DEPCONFIG) Makefile
$(BUILTIN_REGISTRY)$(DELIM)stackmonitor_stop.bdat: $(DEPCONFIG) Makefile
$(call REGISTER,"stkmon_stop",$(PRIORITY),$(STACKSIZE),stackmonitor_stop)
+install:
+
context: $(BUILTIN_REGISTRY)$(DELIM)stackmonitor_start.bdat $(BUILTIN_REGISTRY)$(DELIM)stackmonitor_stop.bdat
else
+install:
+
context:
endif
diff --git a/apps/system/sudoku/Makefile b/apps/system/sudoku/Makefile
index c0500f371..664bb5c77 100644
--- a/apps/system/sudoku/Makefile
+++ b/apps/system/sudoku/Makefile
@@ -93,8 +93,12 @@ ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
$(BUILTIN_REGISTRY)$(DELIM)sudoku.bdat: $(DEPCONFIG) Makefile
$(call REGISTER,"sudoku",$(PRIORITY),$(STACKSIZE),sudoku_main)
+install:
+
context: $(BUILTIN_REGISTRY)$(DELIM)sudoku.bdat
else
+install:
+
context:
endif
diff --git a/apps/system/sysinfo/Makefile b/apps/system/sysinfo/Makefile
index 32edf1ab8..9c213ae28 100644
--- a/apps/system/sysinfo/Makefile
+++ b/apps/system/sysinfo/Makefile
@@ -98,8 +98,12 @@ ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
+install:
+
context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
else
+install:
+
context:
endif
diff --git a/apps/system/usbmonitor/Makefile b/apps/system/usbmonitor/Makefile
index 4516d31d6..f712a1d91 100644
--- a/apps/system/usbmonitor/Makefile
+++ b/apps/system/usbmonitor/Makefile
@@ -93,8 +93,12 @@ $(BUILTIN_REGISTRY)$(DELIM)usbmonitor_start.bdat: $(DEPCONFIG) Makefile
$(BUILTIN_REGISTRY)$(DELIM)usbmonitor_stop.bdat: $(DEPCONFIG) Makefile
$(call REGISTER,"usbmon_stop",$(PRIORITY),$(STACKSIZE),usbmonitor_stop)
+install:
+
context: $(BUILTIN_REGISTRY)$(DELIM)usbmonitor_start.bdat $(BUILTIN_REGISTRY)$(DELIM)usbmonitor_stop.bdat
else
+install:
+
context:
endif
diff --git a/apps/system/usbmsc/Makefile b/apps/system/usbmsc/Makefile
index 7ee0765eb..2f6073d70 100644
--- a/apps/system/usbmsc/Makefile
+++ b/apps/system/usbmsc/Makefile
@@ -97,8 +97,12 @@ $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME1)_main.bdat: $(DEPCONFIG) Makefile
$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME2)_main.bdat: $(DEPCONFIG) Makefile
$(call REGISTER,$(APPNAME2),$(PRIORITY2),$(STACKSIZE2),$(APPNAME2)_main)
+install:
+
context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME1)_main.bdat $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME2)_main.bdat
else
+install:
+
context:
endif
diff --git a/apps/system/vi/Makefile b/apps/system/vi/Makefile
index 80ea483c8..8eba9d788 100644
--- a/apps/system/vi/Makefile
+++ b/apps/system/vi/Makefile
@@ -94,8 +94,12 @@ ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
+install:
+
context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
else
+install:
+
context:
endif
diff --git a/apps/system/zmodem/Makefile b/apps/system/zmodem/Makefile
index 8607863ba..602ad2541 100644
--- a/apps/system/zmodem/Makefile
+++ b/apps/system/zmodem/Makefile
@@ -96,8 +96,12 @@ $(BUILTIN_REGISTRY)$(DELIM)sz.bdat: $(DEPCONFIG) Makefile
$(BUILTIN_REGISTRY)$(DELIM)rz.bdat: $(DEPCONFIG) Makefile
$(call REGISTER,"rz",$(PRIORITY),$(STACKSIZE),rz_main)
+install:
+
context: $(BUILTIN_REGISTRY)$(DELIM)sz.bdat $(BUILTIN_REGISTRY)$(DELIM)rz.bdat
else
+install:
+
context:
endif