diff --git a/binfmt/Makefile b/binfmt/Makefile index 3a6a1dff3d7..fbca62866b1 100644 --- a/binfmt/Makefile +++ b/binfmt/Makefile @@ -38,22 +38,22 @@ include $(TOPDIR)/Make.defs # Basic BINFMT source files -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 +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 ifeq ($(CONFIG_BINFMT_LOADABLE),y) -CSRCS += binfmt_exit.c +BINFMT_CSRCS += binfmt_exit.c endif ifeq ($(CONFIG_LIBC_EXECFUNCS),y) -CSRCS += binfmt_execsymtab.c +BINFMT_CSRCS += binfmt_execsymtab.c endif # Builtin application interfaces ifeq ($(CONFIG_BUILTIN),y) -CSRCS += builtin.c +BINFMT_CSRCS += builtin.c endif # Add configured binary modules @@ -61,31 +61,31 @@ endif include libnxflat/Make.defs include libelf/Make.defs -AOBJS = $(BINFMT_ASRCS:.S=$(OBJEXT)) -COBJS = $(CSRCS:.c=$(OBJEXT)) +BINFMT_AOBJS = $(BINFMT_ASRCS:.S=$(OBJEXT)) +BINFMT_COBJS = $(BINFMT_CSRCS:.c=$(OBJEXT)) -SRCS = $(BINFMT_ASRCS) $(CSRCS) -OBJS = $(AOBJS) $(COBJS) +BINFMT_SRCS = $(BINFMT_ASRCS) $(BINFMT_CSRCS) +BINFMT_OBJS = $(BINFMT_AOBJS) $(BINFMT_COBJS) BIN = libbinfmt$(LIBEXT) all: $(BIN) .PHONY: depend clean distclean -$(AOBJS): %$(OBJEXT): %.S +$(BINFMT_AOBJS): %$(OBJEXT): %.S $(call ASSEMBLE, $<, $@) -$(COBJS): %$(OBJEXT): %.c +$(BINFMT_COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) -$(BIN): $(OBJS) +$(BIN): $(BINFMT_OBJS) $(call ARCHIVE, $@, $^) -makedepfile: $(CSRCS:.c=.ddc) $(BINFMT_ASRCS:.S=.dds) +makedepfile: $(BINFMT_CSRCS:.c=.ddc) $(BINFMT_ASRCS:.S=.dds) $(call CATFILE, Make.dep, $^) $(call DELFILE, $^) -.depend: Makefile $(SRCS) $(TOPDIR)$(DELIM).config +.depend: Makefile $(BINFMT_SRCS) $(TOPDIR)$(DELIM).config $(Q) $(MAKE) makedepfile $(Q) touch $@ diff --git a/binfmt/libelf/Make.defs b/binfmt/libelf/Make.defs index 16025360dc4..670ad01fa24 100644 --- a/binfmt/libelf/Make.defs +++ b/binfmt/libelf/Make.defs @@ -37,16 +37,16 @@ ifeq ($(CONFIG_ELF),y) # ELF application interfaces -CSRCS += elf.c +BINFMT_CSRCS += elf.c # ELF library -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 +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 ifeq ($(CONFIG_BINFMT_CONSTRUCTORS),y) -CSRCS += libelf_ctors.c libelf_dtors.c +BINFMT_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 4c897cd61a5..6a0bf1873f5 100644 --- a/binfmt/libnxflat/Make.defs +++ b/binfmt/libnxflat/Make.defs @@ -37,13 +37,13 @@ ifeq ($(CONFIG_NXFLAT),y) # NXFLAT application interfaces -CSRCS += nxflat.c +BINFMT_CSRCS += nxflat.c # NXFLAT library -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 +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 # Hook the libnxflat subdirectory into the build