This is an automated email from the ASF dual-hosted git repository. aguettouche pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push: new 5ff4e33 binfmt/Makefile: remove the specified prefix from target variables 5ff4e33 is described below commit 5ff4e33e3fba040c44fae523909ccd0a4c31da4c Author: chao.an <anc...@xiaomi.com> AuthorDate: Fri Feb 12 13:38:46 2021 +0800 binfmt/Makefile: remove the specified prefix from target variables Signed-off-by: chao.an <anc...@xiaomi.com> --- binfmt/Makefile | 32 ++++++++++++++++---------------- binfmt/libelf/Make.defs | 10 +++++----- binfmt/libnxflat/Make.defs | 8 ++++---- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/binfmt/Makefile b/binfmt/Makefile index e69e63b..ad37a6b 100644 --- a/binfmt/Makefile +++ b/binfmt/Makefile @@ -22,22 +22,22 @@ include $(TOPDIR)/Make.defs # Basic BINFMT source files -BINFMT_CSRCS = binfmt_globals.c binfmt_initialize.c binfmt_register.c binfmt_unregister.c -BINFMT_CSRCS += binfmt_loadmodule.c binfmt_unloadmodule.c binfmt_execmodule.c -BINFMT_CSRCS += binfmt_exec.c binfmt_copyargv.c binfmt_dumpmodule.c +CSRCS = binfmt_globals.c binfmt_initialize.c binfmt_register.c binfmt_unregister.c +CSRCS += binfmt_loadmodule.c binfmt_unloadmodule.c binfmt_execmodule.c +CSRCS += binfmt_exec.c binfmt_copyargv.c binfmt_dumpmodule.c ifeq ($(CONFIG_BINFMT_LOADABLE),y) -BINFMT_CSRCS += binfmt_exit.c +CSRCS += binfmt_exit.c endif ifeq ($(CONFIG_LIBC_EXECFUNCS),y) -BINFMT_CSRCS += binfmt_execsymtab.c +CSRCS += binfmt_execsymtab.c endif # Builtin application interfaces ifeq ($(CONFIG_BUILTIN),y) -BINFMT_CSRCS += builtin.c +CSRCS += builtin.c endif # Add configured binary modules @@ -45,31 +45,31 @@ endif include libnxflat/Make.defs include libelf/Make.defs -BINFMT_AOBJS = $(BINFMT_ASRCS:.S=$(OBJEXT)) -BINFMT_COBJS = $(BINFMT_CSRCS:.c=$(OBJEXT)) +AOBJS = $(ASRCS:.S=$(OBJEXT)) +COBJS = $(CSRCS:.c=$(OBJEXT)) -BINFMT_SRCS = $(BINFMT_ASRCS) $(BINFMT_CSRCS) -BINFMT_OBJS = $(BINFMT_AOBJS) $(BINFMT_COBJS) +SRCS = $(ASRCS) $(CSRCS) +OBJS = $(AOBJS) $(COBJS) BIN = libbinfmt$(LIBEXT) all: $(BIN) .PHONY: depend clean distclean -$(BINFMT_AOBJS): %$(OBJEXT): %.S +$(AOBJS): %$(OBJEXT): %.S $(call ASSEMBLE, $<, $@) -$(BINFMT_COBJS): %$(OBJEXT): %.c +$(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) -$(BIN): $(BINFMT_OBJS) - $(call ARCHIVE, $@, $(BINFMT_OBJS)) +$(BIN): $(OBJS) + $(call ARCHIVE, $@, $(OBJS)) -makedepfile: $(BINFMT_CSRCS:.c=.ddc) $(BINFMT_ASRCS:.S=.dds) +makedepfile: $(CSRCS:.c=.ddc) $(ASRCS:.S=.dds) $(call CATFILE, Make.dep, $^) $(call DELFILE, $^) -.depend: Makefile $(BINFMT_SRCS) $(TOPDIR)$(DELIM).config +.depend: Makefile $(SRCS) $(TOPDIR)$(DELIM).config $(Q) $(MAKE) makedepfile $(Q) touch $@ diff --git a/binfmt/libelf/Make.defs b/binfmt/libelf/Make.defs index f17ef37..3646fd3 100644 --- a/binfmt/libelf/Make.defs +++ b/binfmt/libelf/Make.defs @@ -22,16 +22,16 @@ ifeq ($(CONFIG_ELF),y) # ELF application interfaces -BINFMT_CSRCS += elf.c +CSRCS += elf.c # ELF library -BINFMT_CSRCS += libelf_bind.c libelf_init.c libelf_addrenv.c libelf_iobuffer.c -BINFMT_CSRCS += libelf_load.c libelf_read.c libelf_sections.c libelf_symbols.c -BINFMT_CSRCS += libelf_uninit.c libelf_unload.c libelf_verify.c +CSRCS += libelf_bind.c libelf_init.c libelf_addrenv.c libelf_iobuffer.c +CSRCS += libelf_load.c libelf_read.c libelf_sections.c libelf_symbols.c +CSRCS += libelf_uninit.c libelf_unload.c libelf_verify.c ifeq ($(CONFIG_BINFMT_CONSTRUCTORS),y) -BINFMT_CSRCS += libelf_ctors.c libelf_dtors.c +CSRCS += libelf_ctors.c libelf_dtors.c endif # Hook the libelf subdirectory into the build diff --git a/binfmt/libnxflat/Make.defs b/binfmt/libnxflat/Make.defs index 2751e97..ffc1d53 100644 --- a/binfmt/libnxflat/Make.defs +++ b/binfmt/libnxflat/Make.defs @@ -22,13 +22,13 @@ ifeq ($(CONFIG_NXFLAT),y) # NXFLAT application interfaces -BINFMT_CSRCS += nxflat.c +CSRCS += nxflat.c # NXFLAT library -BINFMT_CSRCS += libnxflat_init.c libnxflat_uninit.c libnxflat_addrenv.c -BINFMT_CSRCS += libnxflat_load.c libnxflat_unload.c libnxflat_verify.c -BINFMT_CSRCS += libnxflat_read.c libnxflat_bind.c +CSRCS += libnxflat_init.c libnxflat_uninit.c libnxflat_addrenv.c +CSRCS += libnxflat_load.c libnxflat_unload.c libnxflat_verify.c +CSRCS += libnxflat_read.c libnxflat_bind.c # Hook the libnxflat subdirectory into the build