diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-09-06 08:00:47 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-09-06 08:00:47 -0600 |
| commit | 5a79aa40e5a82a8358df0ab581f436df1e204134 (patch) | |
| tree | 4d168ff54ec4177c03d24c074a82f5734da2b3a5 /apps | |
| parent | 0c6521fb7bcde9542ccb41d84aaf075f9871e8df (diff) | |
| download | nuttx-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')
151 files changed, 437 insertions, 49 deletions
diff --git a/apps/Makefile b/apps/Makefile index 0ad9596d6..3ed1f3f87 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -110,72 +110,53 @@ BIN = libapps$(LIBEXT) # Build targets all: $(BIN) -.PHONY: $(INSTALLED_APPS) import context depend clean distclean +.PHONY: import install context .depdirs depend clean distclean + +define SDIR_template +$(1)_$(2): + $(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" +endef $(INSTALLED_APPS): $(Q) $(MAKE) -C $@ TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" -$(BIN): $(INSTALLED_APPS) +$(foreach SDIR, $(INSTALLED_APPS), $(eval $(call SDIR_template,$(SDIR),all))) +$(foreach SDIR, $(INSTALLED_APPS), $(eval $(call SDIR_template,$(SDIR),install))) +$(foreach SDIR, $(INSTALLED_APPS), $(eval $(call SDIR_template,$(SDIR),context))) +$(foreach SDIR, $(INSTALLED_APPS), $(eval $(call SDIR_template,$(SDIR),depend))) +$(foreach SDIR, $(INSTALLED_APPS), $(eval $(call SDIR_template,$(SDIR),clean))) +$(foreach SDIR, $(INSTALLED_APPS), $(eval $(call SDIR_template,$(SDIR),distclean))) + +$(BIN): $(foreach SDIR, $(INSTALLED_APPS), $(SDIR)_all) + +install: $(foreach SDIR, $(INSTALLED_APPS), $(SDIR)_install) + +.import: $(BIN) install import: - $(Q) $(MAKE) TOPDIR="$(APPDIR)/import" + $(Q) $(MAKE) .import TOPDIR="$(APPDIR)/import" -context: -ifeq ($(CONFIG_WINDOWS_NATIVE),y) - $(Q) for %%G in ($(INSTALLED_APPS)) do ( \ - $(MAKE) -C %%G TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" context \ - ) -else - $(Q) for dir in $(INSTALLED_APPS) ; do \ - $(MAKE) -C $$dir TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" context ; \ - done -endif +context: $(foreach SDIR, $(INSTALLED_APPS), $(SDIR)_context) -.depend: context Makefile $(SRCS) -ifeq ($(CONFIG_WINDOWS_NATIVE),y) - $(Q) for %%G in ($(INSTALLED_APPS)) do ( \ - if exist %%G\.depend del /f /q %%G\.depend \ - $(MAKE) -C %%G TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" depend \ - ) -else - $(Q) for dir in $(INSTALLED_APPS) ; do \ - rm -f $$dir/.depend ; \ - $(MAKE) -C $$dir TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" depend ; \ - done -endif +.depdirs: $(foreach SDIR, $(INSTALLED_APPS), $(SDIR)_depend) + +.depend: context Makefile .depdirs $(Q) touch $@ depend: .depend -clean: -ifeq ($(CONFIG_WINDOWS_NATIVE),y) - $(Q) for %%G in ($(SUBDIRS)) do ( \ - $(MAKE) -C %%G clean TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" \ - ) -else - $(Q) for dir in $(SUBDIRS) ; do \ - $(MAKE) -C $$dir clean TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"; \ - done -endif +clean: $(foreach SDIR, $(INSTALLED_APPS), $(SDIR)_clean) $(call DELFILE, $(BIN)) $(call CLEAN) -distclean: +distclean: $(foreach SDIR, $(INSTALLED_APPS), $(SDIR)_distclean) ifeq ($(CONFIG_WINDOWS_NATIVE),y) - $(Q) for %%G in ($(SUBDIRS)) do ( \ - $(MAKE) -C %%G distclean TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" \ - ) - $(call DELFILE, .depend) $(Q) ( if exist external ( \ echo ********************************************************" \ echo * The external directory/link must be removed manually *" \ echo ********************************************************" \ ) else - $(Q) for dir in $(SUBDIRS) ; do \ - $(MAKE) -C $$dir distclean TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"; \ - done - $(call DELFILE, .depend) $(Q) ( if [ -e external ]; then \ echo "********************************************************"; \ echo "* The external directory/link must be removed manually *"; \ @@ -183,5 +164,6 @@ else fi; \ ) endif + $(call DELFILE, .depend) diff --git a/apps/builtin/Makefile b/apps/builtin/Makefile index 9b64e7b17..df2fbb3db 100644 --- a/apps/builtin/Makefile +++ b/apps/builtin/Makefile @@ -106,6 +106,8 @@ endif $(call ARCHIVE, $(BIN), $(OBJS)) $(Q) touch .built +install: + context: $(Q) $(MAKE) -C registry context TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" diff --git a/apps/builtin/registry/Makefile b/apps/builtin/registry/Makefile index 4ecd5da9f..255e55206 100644 --- a/apps/builtin/registry/Makefile +++ b/apps/builtin/registry/Makefile @@ -48,6 +48,8 @@ all: # This must run before any other context target +install: + context: .updated depend: diff --git a/apps/examples/Makefile b/apps/examples/Makefile index 48a328d4e..5511ef77c 100644 --- a/apps/examples/Makefile +++ b/apps/examples/Makefile @@ -77,6 +77,8 @@ $(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),distclean))) nothing: +install: + context: $(foreach SDIR, $(CNTXTDIRS), $(SDIR)_context) depend: $(foreach SDIR, $(SUBDIRS), $(SDIR)_depend) diff --git a/apps/examples/adc/Makefile b/apps/examples/adc/Makefile index d786ea6dc..777b4829f 100644 --- a/apps/examples/adc/Makefile +++ b/apps/examples/adc/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/examples/buttons/Makefile b/apps/examples/buttons/Makefile index b7e4965df..d3d7b935d 100644 --- a/apps/examples/buttons/Makefile +++ b/apps/examples/buttons/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/examples/can/Makefile b/apps/examples/can/Makefile index 2abdd845b..5deadace1 100644 --- a/apps/examples/can/Makefile +++ b/apps/examples/can/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/examples/cc3000/Makefile b/apps/examples/cc3000/Makefile index 9289fc697..2c06ae083 100644 --- a/apps/examples/cc3000/Makefile +++ b/apps/examples/cc3000/Makefile @@ -92,8 +92,12 @@ $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) $(call REGISTER,$(APPNAME1),$(PRIORITY1),$(STACKSIZE1),$(APPNAME1)_main) +install: + context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat else +install: + context: endif diff --git a/apps/examples/configdata/Makefile b/apps/examples/configdata/Makefile index cc989284a..4f1b474fe 100644 --- a/apps/examples/configdata/Makefile +++ b/apps/examples/configdata/Makefile @@ -77,6 +77,8 @@ $(COBJS): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) @touch .built +install: + context: .depend: Makefile $(SRCS) diff --git a/apps/examples/cpuhog/Makefile b/apps/examples/cpuhog/Makefile index f946d9877..d784e442c 100644 --- a/apps/examples/cpuhog/Makefile +++ b/apps/examples/cpuhog/Makefile @@ -90,8 +90,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/examples/cxxtest/Makefile b/apps/examples/cxxtest/Makefile index 833cf0cc7..966d6deb3 100644 --- a/apps/examples/cxxtest/Makefile +++ b/apps/examples/cxxtest/Makefile @@ -104,8 +104,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/examples/dhcpd/Makefile b/apps/examples/dhcpd/Makefile index 73058dcaa..62edc51e5 100644 --- a/apps/examples/dhcpd/Makefile +++ b/apps/examples/dhcpd/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/examples/discover/Makefile b/apps/examples/discover/Makefile index a0fac4acf..373ee0769 100644 --- a/apps/examples/discover/Makefile +++ b/apps/examples/discover/Makefile @@ -88,8 +88,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/examples/elf/Makefile b/apps/examples/elf/Makefile index 1467bf008..afeab7a1b 100644 --- a/apps/examples/elf/Makefile +++ b/apps/examples/elf/Makefile @@ -86,6 +86,8 @@ really_build: $(OBJS) @$(MAKE) -C tests TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" CROSSDEV=$(CROSSDEV) @$(MAKE) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" really_build +install: + context: # We can't make dependencies in this directory because the required diff --git a/apps/examples/elf/tests/Makefile b/apps/examples/elf/tests/Makefile index 17732c775..480a898b9 100644 --- a/apps/examples/elf/tests/Makefile +++ b/apps/examples/elf/tests/Makefile @@ -82,7 +82,8 @@ build: $(foreach DIR, $(BUILD_SUBDIRS), $(DIR)_build) # Install each program in the romfs directory -install: $(foreach DIR, $(BUILD_SUBDIRS), $(DIR)_install) +install: + $(foreach DIR, $(BUILD_SUBDIRS), $(DIR)_install) # Create the romfs directory diff --git a/apps/examples/elf/tests/errno/Makefile b/apps/examples/elf/tests/errno/Makefile index 89e3f2bfd..719468cd1 100644 --- a/apps/examples/elf/tests/errno/Makefile +++ b/apps/examples/elf/tests/errno/Makefile @@ -83,5 +83,6 @@ clean: $(call CLEAN) install: + $(Q) mkdir -p $(ROMFS_DIR) $(Q) install $(BIN) $(ROMFS_DIR)/$(BIN) diff --git a/apps/examples/elf/tests/hello/Makefile b/apps/examples/elf/tests/hello/Makefile index f89759a66..32206be58 100644 --- a/apps/examples/elf/tests/hello/Makefile +++ b/apps/examples/elf/tests/hello/Makefile @@ -83,5 +83,6 @@ clean: $(call CLEAN) install: + $(Q) mkdir -p $(ROMFS_DIR) $(Q) install $(BIN) $(ROMFS_DIR)/$(BIN) diff --git a/apps/examples/elf/tests/helloxx/Makefile b/apps/examples/elf/tests/helloxx/Makefile index cd153bd52..a85485b40 100644 --- a/apps/examples/elf/tests/helloxx/Makefile +++ b/apps/examples/elf/tests/helloxx/Makefile @@ -139,7 +139,8 @@ clean: $(call DELFILE, $(BIN4)) $(call CLEAN) -install: $(ALL_BIN) +install: + $(ALL_BIN) $(Q) mkdir -p $(ROMFS_DIR) $(Q) install $(BIN1) $(ROMFS_DIR)/$(BIN1) $(Q) install $(BIN2) $(ROMFS_DIR)/$(BIN2) diff --git a/apps/examples/elf/tests/longjmp/Makefile b/apps/examples/elf/tests/longjmp/Makefile index 26fa393bd..4c9f89aad 100644 --- a/apps/examples/elf/tests/longjmp/Makefile +++ b/apps/examples/elf/tests/longjmp/Makefile @@ -83,5 +83,6 @@ clean: $(call CLEAN) install: + $(Q) mkdir -p $(ROMFS_DIR) $(Q) install $(BIN) $(ROMFS_DIR)/$(BIN) diff --git a/apps/examples/elf/tests/mutex/Makefile b/apps/examples/elf/tests/mutex/Makefile index f8ce4f613..93be0d29a 100644 --- a/apps/examples/elf/tests/mutex/Makefile +++ b/apps/examples/elf/tests/mutex/Makefile @@ -83,5 +83,6 @@ clean: $(call CLEAN) install: + $(Q) mkdir -p $(ROMFS_DIR) $(Q) install $(BIN) $(ROMFS_DIR)/$(BIN) diff --git a/apps/examples/elf/tests/pthread/Makefile b/apps/examples/elf/tests/pthread/Makefile index 9d4ce496b..23d31d486 100644 --- a/apps/examples/elf/tests/pthread/Makefile +++ b/apps/examples/elf/tests/pthread/Makefile @@ -83,5 +83,6 @@ clean: $(call CLEAN) install: + $(Q) mkdir -p $(ROMFS_DIR) $(Q) install $(BIN) $(ROMFS_DIR)/$(BIN) diff --git a/apps/examples/elf/tests/signal/Makefile b/apps/examples/elf/tests/signal/Makefile index c442ae9c6..6aeb26235 100644 --- a/apps/examples/elf/tests/signal/Makefile +++ b/apps/examples/elf/tests/signal/Makefile @@ -83,5 +83,6 @@ clean: $(call CLEAN) install: + $(Q) mkdir -p $(ROMFS_DIR) $(Q) install $(BIN) $(ROMFS_DIR)/$(BIN) diff --git a/apps/examples/elf/tests/struct/Makefile b/apps/examples/elf/tests/struct/Makefile index 8fe7cf710..0ccfac249 100644 --- a/apps/examples/elf/tests/struct/Makefile +++ b/apps/examples/elf/tests/struct/Makefile @@ -84,5 +84,6 @@ clean: $(call CLEAN) install: + $(Q) mkdir -p $(ROMFS_DIR) $(Q) install $(BIN) $(ROMFS_DIR)/$(BIN) diff --git a/apps/examples/elf/tests/task/Makefile b/apps/examples/elf/tests/task/Makefile index 572d1072e..8cda9e0cc 100644 --- a/apps/examples/elf/tests/task/Makefile +++ b/apps/examples/elf/tests/task/Makefile @@ -83,5 +83,6 @@ clean: $(call CLEAN) install: + $(Q) mkdir -p $(ROMFS_DIR) $(Q) install $(BIN) $(ROMFS_DIR)/$(BIN) diff --git a/apps/examples/flash_test/Makefile b/apps/examples/flash_test/Makefile index b92a7aaa9..ff5fdb910 100644 --- a/apps/examples/flash_test/Makefile +++ b/apps/examples/flash_test/Makefile @@ -92,8 +92,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/examples/ftpc/Makefile b/apps/examples/ftpc/Makefile index 3f1f79da7..7a7d0cd1c 100644 --- a/apps/examples/ftpc/Makefile +++ b/apps/examples/ftpc/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/examples/ftpd/Makefile b/apps/examples/ftpd/Makefile index d1c4eb6b6..57f095bbf 100644 --- a/apps/examples/ftpd/Makefile +++ b/apps/examples/ftpd/Makefile @@ -85,8 +85,12 @@ $(BUILTIN_REGISTRY)$(DELIM)ftpd_start.bdat: $(DEPCONFIG) Makefile $(BUILTIN_REGISTRY)$(DELIM)ftpd_stop.bdat: $(DEPCONFIG) Makefile $(call REGISTER,ftpd_stop,SCHED_PRIORITY_DEFAULT,2048,ftpd_stop) +install: + context: $(BUILTIN_REGISTRY)$(DELIM)ftpd_start.bdat $(BUILTIN_REGISTRY)$(DELIM)ftpd_stop.bdat else +install: + context: endif diff --git a/apps/examples/hello/Makefile b/apps/examples/hello/Makefile index 19692e4bc..09f956eee 100644 --- a/apps/examples/hello/Makefile +++ b/apps/examples/hello/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/examples/helloxx/Makefile b/apps/examples/helloxx/Makefile index c83ad5a3d..1e350863e 100644 --- a/apps/examples/helloxx/Makefile +++ b/apps/examples/helloxx/Makefile @@ -104,8 +104,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/examples/hidkbd/Makefile b/apps/examples/hidkbd/Makefile index a9a7aa681..19ec6d840 100644 --- a/apps/examples/hidkbd/Makefile +++ b/apps/examples/hidkbd/Makefile @@ -77,6 +77,8 @@ $(COBJS): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) @touch .built +install: + context: .depend: Makefile $(SRCS) diff --git a/apps/examples/i2schar/Makefile b/apps/examples/i2schar/Makefile index 57eb190fc..27103238a 100644 --- a/apps/examples/i2schar/Makefile +++ b/apps/examples/i2schar/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/examples/igmp/Makefile b/apps/examples/igmp/Makefile index 9128453ed..ad8cbfef2 100644 --- a/apps/examples/igmp/Makefile +++ b/apps/examples/igmp/Makefile @@ -85,8 +85,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/examples/json/Makefile b/apps/examples/json/Makefile index 96144f9ad..e53ba1c01 100644 --- a/apps/examples/json/Makefile +++ b/apps/examples/json/Makefile @@ -85,8 +85,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/examples/keypadtest/Makefile b/apps/examples/keypadtest/Makefile index e38e66a82..c630628bd 100644 --- a/apps/examples/keypadtest/Makefile +++ b/apps/examples/keypadtest/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/examples/lcdrw/Makefile b/apps/examples/lcdrw/Makefile index 9a394632e..585ba2451 100644 --- a/apps/examples/lcdrw/Makefile +++ b/apps/examples/lcdrw/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/examples/mm/Makefile b/apps/examples/mm/Makefile index d332e3845..55b06ea58 100644 --- a/apps/examples/mm/Makefile +++ b/apps/examples/mm/Makefile @@ -77,6 +77,8 @@ $(COBJS): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) @touch .built +install: + context: .depend: Makefile $(SRCS) diff --git a/apps/examples/modbus/Makefile b/apps/examples/modbus/Makefile index ed1e19fab..5a6697648 100644 --- a/apps/examples/modbus/Makefile +++ b/apps/examples/modbus/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/examples/mount/Makefile b/apps/examples/mount/Makefile index 8ac82a6c3..52c4af1b9 100644 --- a/apps/examples/mount/Makefile +++ b/apps/examples/mount/Makefile @@ -77,6 +77,8 @@ $(COBJS): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) @touch .built +install: + context: .depend: Makefile $(SRCS) diff --git a/apps/examples/mtdpart/Makefile b/apps/examples/mtdpart/Makefile index c3d9b8afe..be431c46e 100755 --- a/apps/examples/mtdpart/Makefile +++ b/apps/examples/mtdpart/Makefile @@ -77,6 +77,8 @@ $(COBJS): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) @touch .built +install: + context: .depend: Makefile $(SRCS) diff --git a/apps/examples/netpkt/Makefile b/apps/examples/netpkt/Makefile index 503bd7e69..ba421332c 100644 --- a/apps/examples/netpkt/Makefile +++ b/apps/examples/netpkt/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/examples/nettest/Makefile b/apps/examples/nettest/Makefile index f237669f5..a3f302c62 100644 --- a/apps/examples/nettest/Makefile +++ b/apps/examples/nettest/Makefile @@ -120,8 +120,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/examples/nrf24l01_term/Makefile b/apps/examples/nrf24l01_term/Makefile index 4274cc157..429e2bd34 100644 --- a/apps/examples/nrf24l01_term/Makefile +++ b/apps/examples/nrf24l01_term/Makefile @@ -87,6 +87,8 @@ $(COBJS): %$(OBJEXT): %.c $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) +install: + context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat #else #context: diff --git a/apps/examples/nsh/Makefile b/apps/examples/nsh/Makefile index 028299183..554c5fdf5 100644 --- a/apps/examples/nsh/Makefile +++ b/apps/examples/nsh/Makefile @@ -77,6 +77,8 @@ $(COBJS): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) @touch .built +install: + context: .depend: Makefile $(SRCS) diff --git a/apps/examples/null/Makefile b/apps/examples/null/Makefile index daeb49c27..9d33cef3c 100644 --- a/apps/examples/null/Makefile +++ b/apps/examples/null/Makefile @@ -77,6 +77,8 @@ $(COBJS): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) @touch .built +install: + context: .depend: Makefile $(SRCS) diff --git a/apps/examples/nx/Makefile b/apps/examples/nx/Makefile index 17e6e8640..9bdd115c3 100644 --- a/apps/examples/nx/Makefile +++ b/apps/examples/nx/Makefile @@ -90,8 +90,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/examples/nxconsole/Makefile b/apps/examples/nxconsole/Makefile index 3e1892785..c78c7b48a 100644 --- a/apps/examples/nxconsole/Makefile +++ b/apps/examples/nxconsole/Makefile @@ -77,6 +77,8 @@ $(COBJS): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) @touch .built +install: + context: .depend: Makefile $(SRCS) diff --git a/apps/examples/nxffs/Makefile b/apps/examples/nxffs/Makefile index 6d9e4a3d8..81b1b30bf 100644 --- a/apps/examples/nxffs/Makefile +++ b/apps/examples/nxffs/Makefile @@ -77,6 +77,8 @@ $(COBJS): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) @touch .built +install: + context: .depend: Makefile $(SRCS) diff --git a/apps/examples/nxflat/Makefile b/apps/examples/nxflat/Makefile index a750c8e2c..1d46ad74d 100644 --- a/apps/examples/nxflat/Makefile +++ b/apps/examples/nxflat/Makefile @@ -80,6 +80,8 @@ headers: $(call ARCHIVE, $(BIN), $(OBJS)) @touch .built +install: + context: # We can't make dependencies in this directory because the required diff --git a/apps/examples/nxflat/tests/Makefile b/apps/examples/nxflat/tests/Makefile index 8a65d6494..e6af69f16 100644 --- a/apps/examples/nxflat/tests/Makefile +++ b/apps/examples/nxflat/tests/Makefile @@ -63,7 +63,8 @@ build: $(foreach DIR, $(SUBDIRS), $(DIR)_build) # Install each program in the romfs directory -install: $(foreach DIR, $(SUBDIRS), $(DIR)_install) +install: + $(foreach DIR, $(SUBDIRS), $(DIR)_install) # Create the romfs directory diff --git a/apps/examples/nxflat/tests/errno/Makefile b/apps/examples/nxflat/tests/errno/Makefile index d161a6496..38413d806 100644 --- a/apps/examples/nxflat/tests/errno/Makefile +++ b/apps/examples/nxflat/tests/errno/Makefile @@ -77,5 +77,6 @@ clean: $(call CLEAN) install: + $(Q) install -D $(BIN) $(ROMFS_DIR)/$(BIN) diff --git a/apps/examples/nxflat/tests/hello++/Makefile b/apps/examples/nxflat/tests/hello++/Makefile index fb8922a1b..3568730f1 100644 --- a/apps/examples/nxflat/tests/hello++/Makefile +++ b/apps/examples/nxflat/tests/hello++/Makefile @@ -175,7 +175,8 @@ clean: $(call DELFILE, *.r2) $(call CLEAN) -install: $(ALL_BIN) +install: + $(ALL_BIN) $(Q) install -D $(BIN1) $(ROMFS_DIR)/$(BIN1) $(Q) install -D $(BIN2) $(ROMFS_DIR)/$(BIN2) $(Q) install -D $(BIN3) $(ROMFS_DIR)/$(BIN3) diff --git a/apps/examples/nxflat/tests/hello/Makefile b/apps/examples/nxflat/tests/hello/Makefile index 2efa6dbca..c3ce689cd 100644 --- a/apps/examples/nxflat/tests/hello/Makefile +++ b/apps/examples/nxflat/tests/hello/Makefile @@ -77,5 +77,6 @@ clean: $(call CLEAN) install: + $(Q) install -D $(BIN) $(ROMFS_DIR)/$(BIN) diff --git a/apps/examples/nxflat/tests/longjmp/Makefile b/apps/examples/nxflat/tests/longjmp/Makefile index dbfd5fc91..902119057 100644 --- a/apps/examples/nxflat/tests/longjmp/Makefile +++ b/apps/examples/nxflat/tests/longjmp/Makefile @@ -77,5 +77,6 @@ clean: $(call CLEAN) install: + $(Q) install -D $(BIN) $(ROMFS_DIR)/$(BIN) diff --git a/apps/examples/nxflat/tests/mutex/Makefile b/apps/examples/nxflat/tests/mutex/Makefile index 526099819..05a9d0962 100644 --- a/apps/examples/nxflat/tests/mutex/Makefile +++ b/apps/examples/nxflat/tests/mutex/Makefile @@ -77,5 +77,6 @@ clean: $(call CLEAN) install: + $(Q) install -D $(BIN) $(ROMFS_DIR)/$(BIN) diff --git a/apps/examples/nxflat/tests/pthread/Makefile b/apps/examples/nxflat/tests/pthread/Makefile index e16a8f623..4a583ea46 100644 --- a/apps/examples/nxflat/tests/pthread/Makefile +++ b/apps/examples/nxflat/tests/pthread/Makefile @@ -78,5 +78,6 @@ clean: $(call CLEAN) install: + $(Q) install -D $(BIN) $(ROMFS_DIR)/$(BIN) diff --git a/apps/examples/nxflat/tests/signal/Makefile b/apps/examples/nxflat/tests/signal/Makefile index 43e4742b5..65fafc8bc 100644 --- a/apps/examples/nxflat/tests/signal/Makefile +++ b/apps/examples/nxflat/tests/signal/Makefile @@ -77,5 +77,6 @@ clean: $(call CLEAN) install: + $(Q) install -D $(BIN) $(ROMFS_DIR)/$(BIN) diff --git a/apps/examples/nxflat/tests/struct/Makefile b/apps/examples/nxflat/tests/struct/Makefile index bee07d1e5..b1767d0e9 100644 --- a/apps/examples/nxflat/tests/struct/Makefile +++ b/apps/examples/nxflat/tests/struct/Makefile @@ -79,5 +79,6 @@ clean: $(call CLEAN) install: + $(Q) install -D $(BIN) $(ROMFS_DIR)/$(BIN) diff --git a/apps/examples/nxflat/tests/task/Makefile b/apps/examples/nxflat/tests/task/Makefile index afd4754b6..531d62143 100644 --- a/apps/examples/nxflat/tests/task/Makefile +++ b/apps/examples/nxflat/tests/task/Makefile @@ -77,6 +77,7 @@ clean: $(call CLEAN) install: + $(Q) install -D $(BIN) $(ROMFS_DIR)/$(BIN) diff --git a/apps/examples/nxhello/Makefile b/apps/examples/nxhello/Makefile index 1aa1f5370..1292706dd 100644 --- a/apps/examples/nxhello/Makefile +++ b/apps/examples/nxhello/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/examples/nximage/Makefile b/apps/examples/nximage/Makefile index afaf6eb9d..f7fa52de1 100644 --- a/apps/examples/nximage/Makefile +++ b/apps/examples/nximage/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/examples/nxlines/Makefile b/apps/examples/nxlines/Makefile index fbd61ed44..5bd195aed 100644 --- a/apps/examples/nxlines/Makefile +++ b/apps/examples/nxlines/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/examples/nxtext/Makefile b/apps/examples/nxtext/Makefile index 4091c577b..010a33bd5 100644 --- a/apps/examples/nxtext/Makefile +++ b/apps/examples/nxtext/Makefile @@ -91,8 +91,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/examples/ostest/Makefile b/apps/examples/ostest/Makefile index 71b08a942..44aeb160a 100644 --- a/apps/examples/ostest/Makefile +++ b/apps/examples/ostest/Makefile @@ -136,8 +136,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/examples/pashello/Makefile b/apps/examples/pashello/Makefile index d5c482374..0473e3d64 100644 --- a/apps/examples/pashello/Makefile +++ b/apps/examples/pashello/Makefile @@ -85,6 +85,8 @@ $(COBJS): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) @touch .built +install: + context: .depend: Makefile $(SRCS) diff --git a/apps/examples/pipe/Makefile b/apps/examples/pipe/Makefile index 3efa943b3..4f6e233e0 100644 --- a/apps/examples/pipe/Makefile +++ b/apps/examples/pipe/Makefile @@ -77,6 +77,8 @@ $(COBJS): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) @touch .built +install: + context: .depend: Makefile $(SRCS) diff --git a/apps/examples/poll/Makefile b/apps/examples/poll/Makefile index 9431398f8..e7cd88307 100644 --- a/apps/examples/poll/Makefile +++ b/apps/examples/poll/Makefile @@ -77,6 +77,8 @@ $(COBJS): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) @touch .built +install: + context: .depend: Makefile $(SRCS) diff --git a/apps/examples/posix_spawn/Makefile b/apps/examples/posix_spawn/Makefile index 77b6383ed..8ef9e81d7 100644 --- a/apps/examples/posix_spawn/Makefile +++ b/apps/examples/posix_spawn/Makefile @@ -85,6 +85,8 @@ build: @$(MAKE) -C filesystem TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" CROSSDEV=$(CROSSDEV) @$(MAKE) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" build_lib +install: + context: # We can't make dependencies in this directory because the required diff --git a/apps/examples/posix_spawn/filesystem/hello/Makefile b/apps/examples/posix_spawn/filesystem/hello/Makefile index dbb52d760..4097c6f86 100644 --- a/apps/examples/posix_spawn/filesystem/hello/Makefile +++ b/apps/examples/posix_spawn/filesystem/hello/Makefile @@ -56,5 +56,6 @@ clean: $(call CLEAN) install: + $(Q) mkdir -p $(ROMFS_DIR) $(Q) install $(BIN) $(ROMFS_DIR)/$(BIN) diff --git a/apps/examples/posix_spawn/filesystem/redirect/Makefile b/apps/examples/posix_spawn/filesystem/redirect/Makefile index 5d6d499e1..c6259d819 100644 --- a/apps/examples/posix_spawn/filesystem/redirect/Makefile +++ b/apps/examples/posix_spawn/filesystem/redirect/Makefile @@ -56,5 +56,6 @@ clean: $(call CLEAN) install: + $(Q) mkdir -p $(ROMFS_DIR) $(Q) install -m 0755 $(BIN) $(ROMFS_DIR)/$(BIN) diff --git a/apps/examples/pwm/Makefile b/apps/examples/pwm/Makefile index d51bbf5db..b26d3f0b4 100644 --- a/apps/examples/pwm/Makefile +++ b/apps/examples/pwm/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/examples/qencoder/Makefile b/apps/examples/qencoder/Makefile index 18a3bb925..fb189c054 100644 --- a/apps/examples/qencoder/Makefile +++ b/apps/examples/qencoder/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/examples/random/Makefile b/apps/examples/random/Makefile index 7872f6a3d..f6f176006 100644 --- a/apps/examples/random/Makefile +++ b/apps/examples/random/Makefile @@ -85,8 +85,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/examples/relays/Makefile b/apps/examples/relays/Makefile index e5afd6fbf..d7842d9ef 100644 --- a/apps/examples/relays/Makefile +++ b/apps/examples/relays/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/examples/rgmp/Makefile b/apps/examples/rgmp/Makefile index 049ad02a0..df9e333ae 100644 --- a/apps/examples/rgmp/Makefile +++ b/apps/examples/rgmp/Makefile @@ -77,6 +77,8 @@ $(COBJS): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) @touch .built +install: + context: .depend: Makefile $(SRCS) diff --git a/apps/examples/romfs/Makefile b/apps/examples/romfs/Makefile index d3c8e79cc..48145a52b 100644 --- a/apps/examples/romfs/Makefile +++ b/apps/examples/romfs/Makefile @@ -93,6 +93,8 @@ romfs_testdir.h : testdir.img $(call ARCHIVE, $(BIN), $(OBJS)) @touch .built +install: + context: .depend: Makefile $(SRCS) diff --git a/apps/examples/sendmail/Makefile b/apps/examples/sendmail/Makefile index 57f4e4615..3a19d879b 100644 --- a/apps/examples/sendmail/Makefile +++ b/apps/examples/sendmail/Makefile @@ -77,6 +77,8 @@ $(COBJS): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) @touch .built +install: + context: .depend: Makefile $(SRCS) diff --git a/apps/examples/serialblaster/Makefile b/apps/examples/serialblaster/Makefile index 3205ddbc8..0dd13071e 100644 --- a/apps/examples/serialblaster/Makefile +++ b/apps/examples/serialblaster/Makefile @@ -90,8 +90,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/examples/serialrx/Makefile b/apps/examples/serialrx/Makefile index f184f3e2e..e93079462 100644 --- a/apps/examples/serialrx/Makefile +++ b/apps/examples/serialrx/Makefile @@ -90,8 +90,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/examples/serloop/Makefile b/apps/examples/serloop/Makefile index 20f348269..6a6db3e1f 100644 --- a/apps/examples/serloop/Makefile +++ b/apps/examples/serloop/Makefile @@ -77,6 +77,8 @@ $(COBJS): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) @touch .built +install: + context: .depend: Makefile $(SRCS) diff --git a/apps/examples/slcd/Makefile b/apps/examples/slcd/Makefile index 54252879f..823fb1d33 100644 --- a/apps/examples/slcd/Makefile +++ b/apps/examples/slcd/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/examples/smart/Makefile b/apps/examples/smart/Makefile index d0a5f738a..e754b1400 100644 --- a/apps/examples/smart/Makefile +++ b/apps/examples/smart/Makefile @@ -77,6 +77,8 @@ $(COBJS): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) @touch .built +install: + context: .depend: Makefile $(SRCS) diff --git a/apps/examples/smart_test/Makefile b/apps/examples/smart_test/Makefile index fb6100464..dd1ac3e71 100644 --- a/apps/examples/smart_test/Makefile +++ b/apps/examples/smart_test/Makefile @@ -92,8 +92,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/examples/tcpecho/Makefile b/apps/examples/tcpecho/Makefile index 7eb59120d..42e7ead21 100644 --- a/apps/examples/tcpecho/Makefile +++ b/apps/examples/tcpecho/Makefile @@ -88,8 +88,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/examples/telnetd/Makefile b/apps/examples/telnetd/Makefile index 18e035113..e37b09c69 100644 --- a/apps/examples/telnetd/Makefile +++ b/apps/examples/telnetd/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/examples/thttpd/Makefile b/apps/examples/thttpd/Makefile index b74dc70dd..8ce70cc70 100644 --- a/apps/examples/thttpd/Makefile +++ b/apps/examples/thttpd/Makefile @@ -80,6 +80,8 @@ headers: $(call ARCHIVE, $(BIN), $(OBJS)) @touch .built +install: + context: .depend: Makefile $(SRCS) diff --git a/apps/examples/thttpd/content/Makefile b/apps/examples/thttpd/content/Makefile index 9ef8fe98a..561bcbf3c 100644 --- a/apps/examples/thttpd/content/Makefile +++ b/apps/examples/thttpd/content/Makefile @@ -62,7 +62,8 @@ build: $(foreach DIR, $(SUBDIRS), $(DIR)_build) # Install each program in the romfs directory -install: $(foreach DIR, $(SUBDIRS), $(DIR)_install) +install: + $(foreach DIR, $(SUBDIRS), $(DIR)_install) @( for file in $(INSTALL_FILES); do\ install -m 0644 -D $${file} $(ROMFS_DIR)/$${file}; \ done; ) diff --git a/apps/examples/thttpd/content/hello/Makefile b/apps/examples/thttpd/content/hello/Makefile index 2856490ab..0273c7a98 100644 --- a/apps/examples/thttpd/content/hello/Makefile +++ b/apps/examples/thttpd/content/hello/Makefile @@ -77,5 +77,6 @@ clean: $(call CLEAN) install: + $(Q) install -m 0755 -D $(BIN) $(CGI_DIR)/$(BIN) diff --git a/apps/examples/thttpd/content/netstat/Makefile b/apps/examples/thttpd/content/netstat/Makefile index 6d89bcd88..232731cd9 100644 --- a/apps/examples/thttpd/content/netstat/Makefile +++ b/apps/examples/thttpd/content/netstat/Makefile @@ -77,5 +77,6 @@ clean: $(call CLEAN) install: + $(Q) install -m 0755 -D $(BIN) $(CGI_DIR)/$(BIN) diff --git a/apps/examples/thttpd/content/tasks/Makefile b/apps/examples/thttpd/content/tasks/Makefile index 418fca2b3..7c6e01231 100644 --- a/apps/examples/thttpd/content/tasks/Makefile +++ b/apps/examples/thttpd/content/tasks/Makefile @@ -77,5 +77,6 @@ clean: $(call CLEAN) install: + $(Q) install -m 0755 -D $(BIN) $(CGI_DIR)/$(BIN) diff --git a/apps/examples/tiff/Makefile b/apps/examples/tiff/Makefile index 567a5dbe6..5fc100ff9 100644 --- a/apps/examples/tiff/Makefile +++ b/apps/examples/tiff/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/examples/touchscreen/Makefile b/apps/examples/touchscreen/Makefile index b9dea1d39..fa7715c99 100644 --- a/apps/examples/touchscreen/Makefile +++ b/apps/examples/touchscreen/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/examples/udp/Makefile b/apps/examples/udp/Makefile index 60932024e..d40aa089c 100644 --- a/apps/examples/udp/Makefile +++ b/apps/examples/udp/Makefile @@ -107,6 +107,8 @@ $(HOST_BIN): $(HOST_OBJS) .built: $(TARG_BIN) $(HOST_BIN) @touch .built +install: + context: .depend: Makefile $(TARG_SRCS) diff --git a/apps/examples/usbserial/Makefile b/apps/examples/usbserial/Makefile index 9f7c7a814..c251d1ab9 100644 --- a/apps/examples/usbserial/Makefile +++ b/apps/examples/usbserial/Makefile @@ -76,6 +76,8 @@ $(COBJS): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) @touch .built +install: + context: .depend: Makefile $(SRCS) diff --git a/apps/examples/usbterm/Makefile b/apps/examples/usbterm/Makefile index 84608f586..edb258685 100644 --- a/apps/examples/usbterm/Makefile +++ b/apps/examples/usbterm/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/examples/watchdog/Makefile b/apps/examples/watchdog/Makefile index f6b80652b..2cb2400ed 100644 --- a/apps/examples/watchdog/Makefile +++ b/apps/examples/watchdog/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/examples/webserver/Makefile b/apps/examples/webserver/Makefile index a1589936e..f207eebfe 100644 --- a/apps/examples/webserver/Makefile +++ b/apps/examples/webserver/Makefile @@ -80,6 +80,8 @@ $(COBJS): %$(OBJEXT): %.c httpd_fsdata.c: httpd-fs/* $(TOPDIR)/tools/mkfsdata.pl +install: + context: .depend: Makefile $(SRCS) diff --git a/apps/examples/wget/Makefile b/apps/examples/wget/Makefile index 5e6c1480c..5144cce62 100644 --- a/apps/examples/wget/Makefile +++ b/apps/examples/wget/Makefile @@ -77,6 +77,8 @@ $(COBJS): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) @touch .built +install: + context: .depend: Makefile $(SRCS) diff --git a/apps/examples/wgetjson/Makefile b/apps/examples/wgetjson/Makefile index f40d86ba9..d8cdacccf 100644 --- a/apps/examples/wgetjson/Makefile +++ b/apps/examples/wgetjson/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/examples/xmlrpc/Makefile b/apps/examples/xmlrpc/Makefile index 305e94285..0d3ec7d1d 100644 --- a/apps/examples/xmlrpc/Makefile +++ b/apps/examples/xmlrpc/Makefile @@ -88,8 +88,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/graphics/Makefile b/apps/graphics/Makefile index 52d42c563..7503c4343 100644 --- a/apps/graphics/Makefile +++ b/apps/graphics/Makefile @@ -58,6 +58,8 @@ $(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),distclean))) nothing: +install: + context: # $(foreach SDIR, $(CNTXTDIRS), $(SDIR)_context) depend: $(foreach SDIR, $(SUBDIRS), $(SDIR)_depend) diff --git a/apps/graphics/screenshot/Makefile b/apps/graphics/screenshot/Makefile index 08a6f351f..fe52f924b 100644 --- a/apps/graphics/screenshot/Makefile +++ b/apps/graphics/screenshot/Makefile @@ -91,8 +91,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/graphics/tiff/Makefile b/apps/graphics/tiff/Makefile index 8eff3a0cd..3f04b4f30 100644 --- a/apps/graphics/tiff/Makefile +++ b/apps/graphics/tiff/Makefile @@ -77,6 +77,8 @@ $(COBJS): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) $(Q) touch .built +install: + context: .depend: Makefile $(SRCS) diff --git a/apps/import/Makefile b/apps/import/Makefile index e247fa3ef..d920251b8 100644 --- a/apps/import/Makefile +++ b/apps/import/Makefile @@ -46,6 +46,8 @@ all: nothing nothing: +install: + context: depend: diff --git a/apps/interpreters/Makefile b/apps/interpreters/Makefile index 735038cd6..8c9ed8f8b 100644 --- a/apps/interpreters/Makefile +++ b/apps/interpreters/Makefile @@ -67,6 +67,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/interpreters/ficl/Makefile b/apps/interpreters/ficl/Makefile index 3b2dc7ab9..958b5f84c 100644 --- a/apps/interpreters/ficl/Makefile +++ b/apps/interpreters/ficl/Makefile @@ -99,6 +99,8 @@ debug: $(call ARCHIVE, $(BIN), $(OBJS)) $(Q) touch .built +install: + context: .depend: debug Makefile $(SRCS) diff --git a/apps/modbus/Makefile b/apps/modbus/Makefile index 49d47abcd..9ed7dc967 100644 --- a/apps/modbus/Makefile +++ b/apps/modbus/Makefile @@ -96,6 +96,8 @@ ifeq ($(CONFIG_MODBUS),y) $(Q) touch .built endif +install: + context: .depend: Makefile $(SRCS) diff --git a/apps/netutils/Makefile b/apps/netutils/Makefile index b6244e2f9..4d30700f8 100644 --- a/apps/netutils/Makefile +++ b/apps/netutils/Makefile @@ -58,6 +58,8 @@ $(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),distclean))) nothing: +install: + context: depend: $(foreach SDIR, $(SUBDIRS), $(SDIR)_depend) diff --git a/apps/netutils/codecs/Makefile b/apps/netutils/codecs/Makefile index f0b55c5f8..3d77f47fe 100644 --- a/apps/netutils/codecs/Makefile +++ b/apps/netutils/codecs/Makefile @@ -75,6 +75,8 @@ $(COBJS): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) $(Q) touch .built +install: + context: .depend: Makefile $(SRCS) diff --git a/apps/netutils/dhcpc/Makefile b/apps/netutils/dhcpc/Makefile index f8a680e32..ffa88a9e8 100644 --- a/apps/netutils/dhcpc/Makefile +++ b/apps/netutils/dhcpc/Makefile @@ -81,6 +81,8 @@ $(COBJS): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) $(Q) touch .built +install: + context: .depend: Makefile $(SRCS) diff --git a/apps/netutils/dhcpd/Makefile b/apps/netutils/dhcpd/Makefile index 5eedf758f..7fb52b33d 100644 --- a/apps/netutils/dhcpd/Makefile +++ b/apps/netutils/dhcpd/Makefile @@ -81,6 +81,8 @@ $(COBJS): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) $(Q) touch .built +install: + context: .depend: Makefile $(SRCS) diff --git a/apps/netutils/discover/Makefile b/apps/netutils/discover/Makefile index 5054e52fe..4337e9ed7 100644 --- a/apps/netutils/discover/Makefile +++ b/apps/netutils/discover/Makefile @@ -84,6 +84,8 @@ $(COBJS): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) $(Q) touch .built +install: + context: .depend: Makefile $(SRCS) diff --git a/apps/netutils/dnsclient/Makefile b/apps/netutils/dnsclient/Makefile index 9b5f11631..3fb2c6ba9 100644 --- a/apps/netutils/dnsclient/Makefile +++ b/apps/netutils/dnsclient/Makefile @@ -81,6 +81,8 @@ $(COBJS): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) $(Q) touch .built +install: + context: .depend: Makefile $(SRCS) diff --git a/apps/netutils/ftpc/Makefile b/apps/netutils/ftpc/Makefile index 09ed62cdb..a0075f58e 100644 --- a/apps/netutils/ftpc/Makefile +++ b/apps/netutils/ftpc/Makefile @@ -97,6 +97,8 @@ $(COBJS): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) $(Q) touch .built +install: + context: .depend: Makefile $(SRCS) diff --git a/apps/netutils/ftpd/Makefile b/apps/netutils/ftpd/Makefile index 1a779f4ba..6fb76ba8d 100644 --- a/apps/netutils/ftpd/Makefile +++ b/apps/netutils/ftpd/Makefile @@ -81,6 +81,8 @@ $(COBJS): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) $(Q) touch .built +install: + context: .depend: Makefile $(SRCS) diff --git a/apps/netutils/json/Makefile b/apps/netutils/json/Makefile index 17eb55e71..44237d238 100644 --- a/apps/netutils/json/Makefile +++ b/apps/netutils/json/Makefile @@ -75,6 +75,8 @@ $(COBJS): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) $(Q) touch .built +install: + context: .depend: Makefile $(SRCS) diff --git a/apps/netutils/netlib/Makefile b/apps/netutils/netlib/Makefile index 7eb376646..8de89a857 100644 --- a/apps/netutils/netlib/Makefile +++ b/apps/netutils/netlib/Makefile @@ -97,6 +97,8 @@ $(COBJS): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) $(Q) touch .built +install: + context: .depend: Makefile $(SRCS) diff --git a/apps/netutils/ntpclient/Makefile b/apps/netutils/ntpclient/Makefile index cbde46060..79014d5a8 100755 --- a/apps/netutils/ntpclient/Makefile +++ b/apps/netutils/ntpclient/Makefile @@ -81,6 +81,8 @@ $(COBJS): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) $(Q) touch .built +install: + context: .depend: Makefile $(SRCS) diff --git a/apps/netutils/smtp/Makefile b/apps/netutils/smtp/Makefile index d3dbaebf8..450fafab0 100644 --- a/apps/netutils/smtp/Makefile +++ b/apps/netutils/smtp/Makefile @@ -81,6 +81,8 @@ $(COBJS): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) $(Q) touch .built +install: + context: .depend: Makefile $(SRCS) diff --git a/apps/netutils/telnetd/Makefile b/apps/netutils/telnetd/Makefile index 99caf425f..a377a54d3 100644 --- a/apps/netutils/telnetd/Makefile +++ b/apps/netutils/telnetd/Makefile @@ -81,6 +81,8 @@ $(COBJS): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) $(Q) touch .built +install: + context: .depend: Makefile $(SRCS) diff --git a/apps/netutils/tftpc/Makefile b/apps/netutils/tftpc/Makefile index 952bc620e..b629978a5 100644 --- a/apps/netutils/tftpc/Makefile +++ b/apps/netutils/tftpc/Makefile @@ -83,6 +83,8 @@ $(COBJS): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) $(Q) touch .built +install: + context: .depend: Makefile $(SRCS) diff --git a/apps/netutils/thttpd/Makefile b/apps/netutils/thttpd/Makefile index a2eaa3476..60c7fbe14 100644 --- a/apps/netutils/thttpd/Makefile +++ b/apps/netutils/thttpd/Makefile @@ -113,6 +113,8 @@ endif $(call ARCHIVE, $(BIN), $(OBJS)) $(Q) touch .built +install: + context: .depend: Makefile $(SRCS) diff --git a/apps/netutils/webclient/Makefile b/apps/netutils/webclient/Makefile index aacbe0dc3..10dd2c1eb 100644 --- a/apps/netutils/webclient/Makefile +++ b/apps/netutils/webclient/Makefile @@ -81,6 +81,8 @@ $(COBJS): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) $(Q) touch .built +install: + context: .depend: Makefile $(SRCS) diff --git a/apps/netutils/webserver/Makefile b/apps/netutils/webserver/Makefile index 06b528006..47fd1047a 100644 --- a/apps/netutils/webserver/Makefile +++ b/apps/netutils/webserver/Makefile @@ -88,6 +88,8 @@ $(COBJS): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) $(Q) touch .built +install: + context: .depend: Makefile $(SRCS) diff --git a/apps/netutils/xmlrpc/Makefile b/apps/netutils/xmlrpc/Makefile index a00436511..bcd17b7a6 100644 --- a/apps/netutils/xmlrpc/Makefile +++ b/apps/netutils/xmlrpc/Makefile @@ -82,6 +82,8 @@ $(COBJS): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) $(Q) touch .built +install: + context: .depend: Makefile $(SRCS) diff --git a/apps/nshlib/Makefile b/apps/nshlib/Makefile index a78299222..9f2e504bc 100644 --- a/apps/nshlib/Makefile +++ b/apps/nshlib/Makefile @@ -139,6 +139,8 @@ $(COBJS): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) @touch .built +install: + context: .depend: Makefile $(SRCS) diff --git a/apps/platform/Makefile b/apps/platform/Makefile index 196dfd52d..72cc4e97c 100644 --- a/apps/platform/Makefile +++ b/apps/platform/Makefile @@ -114,6 +114,8 @@ $(PLATFORMDIR): $(TOPDIR)$(DELIM).config $(Q) $(DIRUNLINK) $(PLATFORMDIR) $(Q) $(DIRLINK) $(LINKDIR) $(PLATFORMDIR) +install: + context: $(PLATFORMDIR) # Dependencies 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 |