sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Avoid calling ARCHIVE in multiple places"

Browse Source 
This reverts commit 52222cb020c70f14b2ff766c96da87c3c4bfd32c.
This commit is contained in:
David Sidrane 2020-02-21 08:22:26 -08:00 committed by patacongo
parent 9a28ccf836
commit 119f81f30a
3 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Application.mk
View File

@ -129,6 +129,12 @@ $(CXXOBJS): %$(SUFFIX)$(OBJEXT): %$(CXXEXT)
$(call ELFCOMPILEXX, $<, $@), $(call COMPILEXX, $<, $@)) $(call ELFCOMPILEXX, $<, $@), $(call COMPILEXX, $<, $@))
.built: $(OBJS) .built: $(OBJS)
ifeq ($(WINTOOL),y)
$(call ARCHIVE, "${shell cygpath -w $(BIN)}", $(OBJS))
else
$(call ARCHIVE, $(BIN), $(OBJS))
endif
$(Q) touch $@
ifeq ($(BUILD_MODULE),y) ifeq ($(BUILD_MODULE),y)
@ -157,9 +163,6 @@ endif
install:: $(PROGLIST) install:: $(PROGLIST)
show-objs:
@echo ""
else else
MAINNAME := $(addsuffix _main,$(PROGNAME)) MAINNAME := $(addsuffix _main,$(PROGNAME))
@ -182,9 +185,6 @@ endif
install:: install::
show-objs:
@echo $(addprefix $(CWD)$(DELIM),$(OBJS))
endif # BUILD_MODULE endif # BUILD_MODULE
preconfig:: preconfig::

3
Directory.mk
View File

@ -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),depend)))
$(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),clean))) $(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),distclean)))
$(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),show-objs)))
nothing: nothing:
@ -76,6 +75,4 @@ ifneq ($(MENUDESC),)
$(call DELFILE, Kconfig) $(call DELFILE, Kconfig)
endif endif
show-objs: $(foreach SDIR, $(SUBDIRS), $(SDIR)_show-objs)
-include Make.dep -include Make.dep

19
Makefile
View File

@ -55,8 +55,6 @@ endif
SYMTABSRC = symtab_apps.c SYMTABSRC = symtab_apps.c
SYMTABOBJ = $(SYMTABSRC:.c=$(OBJEXT)) SYMTABOBJ = $(SYMTABSRC:.c=$(OBJEXT))
APPOBJS = $(shell $(MAKE) show-objs TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)")
# Build targets # Build targets
all: $(BIN) all: $(BIN)
@ -68,11 +66,6 @@ define MAKE_template
endef endef
define MAKE_template_quiet
@ $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" V=0 Q=@
endef
define SDIR_template define SDIR_template
$(1)_$(2): $(1)_$(2):
+$(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" +$(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
@ -112,11 +105,6 @@ else
ifeq ($(CONFIG_BUILD_LOADABLE),) ifeq ($(CONFIG_BUILD_LOADABLE),)
$(BIN): $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_all) $(BIN): $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_all)
ifeq ($(WINTOOL),y)
$(call ARCHIVE, "${shell cygpath -w $(BIN)}", $(APPOBJS))
else
$(call ARCHIVE, $(BIN), $(APPOBJS))
endif
else else
@ -129,9 +117,9 @@ $(SYMTABOBJ): %$(OBJEXT): %.c
$(BIN): $(SYMTABOBJ) $(BIN): $(SYMTABOBJ)
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
$(call ARCHIVE, "${shell cygpath -w $(BIN)}", $(APPOBJS) $(SYMTABOBJ)) $(call ARCHIVE, "${shell cygpath -w $(BIN)}", $^)
else else
$(call ARCHIVE, $(BIN), $(APPOBJS) $(SYMTABOBJ)) $(call ARCHIVE, $(BIN), $^)
endif endif
endif # !CONFIG_BUILD_LOADABLE endif # !CONFIG_BUILD_LOADABLE
@ -167,9 +155,6 @@ Kconfig:
preconfig: Kconfig preconfig: Kconfig
show-objs:
$(foreach SDIR, $(CONFIGURED_APPS), $(call MAKE_template_quiet,$(SDIR),show-objs))
export: export:
ifneq ($(EXPORTDIR),) ifneq ($(EXPORTDIR),)
ifneq ($(BUILTIN_REGISTRY),) ifneq ($(BUILTIN_REGISTRY),)