Skip to content

Revert "Avoid calling ARCHIVE in multiple places" #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 21, 2020
Merged

Revert "Avoid calling ARCHIVE in multiple places" #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Application.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -157,9 +163,6 @@ endif

install:: $(PROGLIST)

show-objs:
@echo ""

else

MAINNAME := $(addsuffix _main,$(PROGNAME))
Expand All @@ -182,9 +185,6 @@ endif

install::

show-objs:
@echo $(addprefix $(CWD)$(DELIM),$(OBJS))

endif # BUILD_MODULE

preconfig::
Expand Down
3 changes: 0 additions & 3 deletions Directory.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand All @@ -76,6 +75,4 @@ ifneq ($(MENUDESC),)
$(call DELFILE, Kconfig)
endif

show-objs: $(foreach SDIR, $(SUBDIRS), $(SDIR)_show-objs)

-include Make.dep
19 changes: 2 additions & 17 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)"
Expand Down Expand Up @@ -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

Expand All @@ -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
Expand Down Expand Up @@ -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),)
Expand Down