[incubator-nuttx-apps] branch master updated: Revert "Avoid calling ARCHIVE in multiple places"

[gn...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git


The following commit(s) were added to refs/heads/master by this push:
     new 119f81f  Revert "Avoid calling ARCHIVE in multiple places"
119f81f is described below

commit 119f81f30a1540cc7ed730b107ecdc96f2f6bcf1
Author: David Sidrane <Da...@NscDg.com>
AuthorDate: Fri Feb 21 08:22:26 2020 -0800

    Revert "Avoid calling ARCHIVE in multiple places"
    
    This reverts commit 52222cb020c70f14b2ff766c96da87c3c4bfd32c.
---
 Application.mk | 12 ++++++------
 Directory.mk   |  3 ---
 Makefile       | 19 ++-----------------
 3 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/Application.mk b/Application.mk
index 5110506..25af192 100644
--- a/Application.mk
+++ b/Application.mk
@@ -129,6 +129,12 @@ $(CXXOBJS): %$(SUFFIX)$(OBJEXT): %$(CXXEXT)
 		$(call ELFCOMPILEXX, $<, $@), $(call COMPILEXX, $<, $@))
 
 .built: $(OBJS)
+ifeq ($(WINTOOL),y)
+	$(call ARCHIVE, "${shell cygpath -w $(BIN)}", $(OBJS))
+else
+	$(call ARCHIVE, $(BIN), $(OBJS))
+endif
+	$(Q) touch $@
 
 ifeq ($(BUILD_MODULE),y)
 
@@ -157,9 +163,6 @@ endif
 
 install:: $(PROGLIST)
 
-show-objs:
-	@echo ""
-
 else
 
 MAINNAME := $(addsuffix _main,$(PROGNAME))
@@ -182,9 +185,6 @@ endif
 
 install::
 
-show-objs:
-	@echo $(addprefix $(CWD)$(DELIM),$(OBJS))
-
 endif # BUILD_MODULE
 
 preconfig::
diff --git a/Directory.mk b/Directory.mk
index 74b9a93..31cf4f2 100644
--- a/Directory.mk
+++ b/Directory.mk
@@ -54,7 +54,6 @@ $(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),context)))
 $(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),depend)))
 $(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),clean)))
 $(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),distclean)))
-$(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),show-objs)))
 
 nothing:
 
@@ -76,6 +75,4 @@ ifneq ($(MENUDESC),)
 	$(call DELFILE, Kconfig)
 endif
 
-show-objs: $(foreach SDIR, $(SUBDIRS), $(SDIR)_show-objs)
-
 -include Make.dep
diff --git a/Makefile b/Makefile
index 53b6fa5..e0ad31f 100644
--- a/Makefile
+++ b/Makefile
@@ -55,8 +55,6 @@ endif
 SYMTABSRC = symtab_apps.c
 SYMTABOBJ = $(SYMTABSRC:.c=$(OBJEXT))
 
-APPOBJS = $(shell $(MAKE) show-objs TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)")
-
 # Build targets
 
 all: $(BIN)
@@ -68,11 +66,6 @@ define MAKE_template
 
 endef
 
-define MAKE_template_quiet
-	@ $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" V=0 Q=@
-
-endef
-
 define SDIR_template
 $(1)_$(2):
 	+$(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
@@ -112,11 +105,6 @@ else
 ifeq ($(CONFIG_BUILD_LOADABLE),)
 
 $(BIN): $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_all)
-ifeq ($(WINTOOL),y)
-	$(call ARCHIVE, "${shell cygpath -w $(BIN)}", $(APPOBJS))
-else
-	$(call ARCHIVE, $(BIN), $(APPOBJS))
-endif
 
 else
 
@@ -129,9 +117,9 @@ $(SYMTABOBJ): %$(OBJEXT): %.c
 
 $(BIN): $(SYMTABOBJ)
 ifeq ($(WINTOOL),y)
-	$(call ARCHIVE, "${shell cygpath -w $(BIN)}", $(APPOBJS) $(SYMTABOBJ))
+	$(call ARCHIVE, "${shell cygpath -w $(BIN)}", $^)
 else
-	$(call ARCHIVE, $(BIN), $(APPOBJS) $(SYMTABOBJ))
+	$(call ARCHIVE, $(BIN), $^)
 endif
 
 endif # !CONFIG_BUILD_LOADABLE
@@ -167,9 +155,6 @@ Kconfig:
 
 preconfig: Kconfig
 
-show-objs:
-	$(foreach SDIR, $(CONFIGURED_APPS), $(call MAKE_template_quiet,$(SDIR),show-objs))
-
 export:
 ifneq ($(EXPORTDIR),)
 ifneq ($(BUILTIN_REGISTRY),)