From 66c3d66d846c1944bce9192f5898e01133d7f722 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Sat, 6 Sep 2014 10:05:01 -0600
Subject: Only one install target per Makefile

---
 apps/system/cdcacm/Makefile         | 6 ++----
 apps/system/composite/Makefile      | 6 ++----
 apps/system/flash_eraseall/Makefile | 6 ++----
 apps/system/free/Makefile           | 6 ++----
 apps/system/i2c/Makefile            | 6 ++----
 apps/system/install/Makefile        | 6 ++----
 apps/system/mdio/Makefile           | 6 ++----
 apps/system/nxplayer/Makefile       | 8 ++------
 apps/system/poweroff/Makefile       | 6 ++----
 apps/system/prun/Makefile           | 8 ++------
 apps/system/ramtest/Makefile        | 6 ++----
 apps/system/ramtron/Makefile        | 6 ++----
 apps/system/sdcard/Makefile         | 6 ++----
 apps/system/stackmonitor/Makefile   | 6 ++----
 apps/system/sudoku/Makefile         | 6 ++----
 apps/system/sysinfo/Makefile        | 6 ++----
 apps/system/usbmonitor/Makefile     | 6 ++----
 apps/system/usbmsc/Makefile         | 6 ++----
 apps/system/vi/Makefile             | 6 ++----
 apps/system/zmodem/Makefile         | 6 ++----
 20 files changed, 40 insertions(+), 84 deletions(-)

(limited to 'apps/system')

diff --git a/apps/system/cdcacm/Makefile b/apps/system/cdcacm/Makefile
index 18ba2508e..727bc16e3 100644
--- a/apps/system/cdcacm/Makefile
+++ b/apps/system/cdcacm/Makefile
@@ -87,6 +87,8 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call ARCHIVE, $(BIN), $(OBJS))
 	@touch .built
 
+install:
+
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
 $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME1)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME1),$(PRIORITY1),$(STACKSIZE1),$(APPNAME1)_main)
@@ -94,12 +96,8 @@ $(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/composite/Makefile b/apps/system/composite/Makefile
index 64f3d74ab..eb76546ca 100644
--- a/apps/system/composite/Makefile
+++ b/apps/system/composite/Makefile
@@ -87,6 +87,8 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call ARCHIVE, $(BIN), $(OBJS))
 	@touch .built
 
+install:
+
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
 $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME1)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME1),$(PRIORITY1),$(STACKSIZE1),$(APPNAME1)_main)
@@ -94,12 +96,8 @@ $(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 04edb966b..93f686e81 100644
--- a/apps/system/flash_eraseall/Makefile
+++ b/apps/system/flash_eraseall/Makefile
@@ -91,18 +91,16 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call ARCHIVE, $(BIN), $(OBJS))
 	$(Q) touch .built
 
+install:
+
 # Register application
 
 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 325b6abaa..56d1019eb 100644
--- a/apps/system/free/Makefile
+++ b/apps/system/free/Makefile
@@ -87,18 +87,16 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call ARCHIVE, $(BIN), $(OBJS))
 	$(Q) touch .built
 
+install:
+
 # Register application
 
 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/i2c/Makefile b/apps/system/i2c/Makefile
index ef52e3153..6b70957e3 100644
--- a/apps/system/i2c/Makefile
+++ b/apps/system/i2c/Makefile
@@ -80,16 +80,14 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call ARCHIVE, $(BIN), $(OBJS))
 	$(Q) touch .built
 
+install:
+
 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/install/Makefile b/apps/system/install/Makefile
index 9c7fc8dbd..9ff931e22 100644
--- a/apps/system/install/Makefile
+++ b/apps/system/install/Makefile
@@ -91,18 +91,16 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call ARCHIVE, $(BIN), $(OBJS))
 	$(Q) touch .built
 
+install:
+
 # Register application
 
 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 10220f350..e9cfb48d9 100644
--- a/apps/system/mdio/Makefile
+++ b/apps/system/mdio/Makefile
@@ -83,16 +83,14 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call ARCHIVE, $(BIN), $(OBJS))
 	@touch .built
 
+install:
+
 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 501600023..58a9e3d8a 100644
--- a/apps/system/nxplayer/Makefile
+++ b/apps/system/nxplayer/Makefile
@@ -93,6 +93,8 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call ARCHIVE, $(BIN), $(OBJS))
 	$(Q) touch .built
 
+install:
+
 # Register application
 
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
@@ -100,17 +102,11 @@ 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 5203db0be..1498c5751 100644
--- a/apps/system/poweroff/Makefile
+++ b/apps/system/poweroff/Makefile
@@ -91,18 +91,16 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call ARCHIVE, $(BIN), $(OBJS))
 	$(Q) touch .built
 
+install:
+
 # Register application
 
 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 430b48d4d..1ee853d8e 100644
--- a/apps/system/prun/Makefile
+++ b/apps/system/prun/Makefile
@@ -97,22 +97,18 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call ARCHIVE, $(BIN), $(OBJS))
 	@touch .built
 
+install:
+
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
 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 9d8d6e8ab..997c8ea8f 100644
--- a/apps/system/ramtest/Makefile
+++ b/apps/system/ramtest/Makefile
@@ -84,18 +84,16 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call ARCHIVE, $(BIN), $(OBJS))
 	$(Q) touch .built
 
+install:
+
 # Register application
 
 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 fea0d4939..c0f272066 100644
--- a/apps/system/ramtron/Makefile
+++ b/apps/system/ramtron/Makefile
@@ -91,18 +91,16 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call ARCHIVE, $(BIN), $(OBJS))
 	$(Q) touch .built
 
+install:
+
 # Register application
 
 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/sdcard/Makefile b/apps/system/sdcard/Makefile
index acf8381d3..3492f0adb 100644
--- a/apps/system/sdcard/Makefile
+++ b/apps/system/sdcard/Makefile
@@ -91,18 +91,16 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call ARCHIVE, $(BIN), $(OBJS))
 	$(Q) touch .built
 
+install:
+
 # Register application
 
 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 f2b73365d..7f78a0f79 100644
--- a/apps/system/stackmonitor/Makefile
+++ b/apps/system/stackmonitor/Makefile
@@ -84,6 +84,8 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call ARCHIVE, $(BIN), $(OBJS))
 	$(Q) touch .built
 
+install:
+
 # Register application
 
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
@@ -93,12 +95,8 @@ $(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 664bb5c77..dad32b458 100644
--- a/apps/system/sudoku/Makefile
+++ b/apps/system/sudoku/Makefile
@@ -87,18 +87,16 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call ARCHIVE, $(BIN), $(OBJS))
 	$(Q) touch .built
 
+install:
+
 # Register application
 
 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 9c213ae28..21388f3bc 100644
--- a/apps/system/sysinfo/Makefile
+++ b/apps/system/sysinfo/Makefile
@@ -92,18 +92,16 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call ARCHIVE, $(BIN), $(OBJS))
 	$(Q) touch .built
 
+install:
+
 # Register application
 
 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 f712a1d91..7b1d3e7ea 100644
--- a/apps/system/usbmonitor/Makefile
+++ b/apps/system/usbmonitor/Makefile
@@ -84,6 +84,8 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call ARCHIVE, $(BIN), $(OBJS))
 	$(Q) touch .built
 
+install:
+
 # Register application
 
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
@@ -93,12 +95,8 @@ $(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 2f6073d70..b9ad17576 100644
--- a/apps/system/usbmsc/Makefile
+++ b/apps/system/usbmsc/Makefile
@@ -90,6 +90,8 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call ARCHIVE, $(BIN), $(OBJS))
 	@touch .built
 
+install:
+
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
 $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME1)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME1),$(PRIORITY1),$(STACKSIZE1),$(APPNAME1)_main)
@@ -97,12 +99,8 @@ $(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 8eba9d788..9a71fe0cf 100644
--- a/apps/system/vi/Makefile
+++ b/apps/system/vi/Makefile
@@ -88,18 +88,16 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call ARCHIVE, $(BIN), $(OBJS))
 	$(Q) touch .built
 
+install:
+
 # Register application
 
 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 602ad2541..ac87750ac 100644
--- a/apps/system/zmodem/Makefile
+++ b/apps/system/zmodem/Makefile
@@ -87,6 +87,8 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call ARCHIVE, $(BIN), $(OBJS))
 	$(Q) touch .built
 
+install:
+
 # Register application
 
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
@@ -96,12 +98,8 @@ $(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
 
-- 
cgit v1.2.3