build: Avoid duplicate files in tarball

Signed-off-by: Simon Horman <horms@verge.net.au>

1 files changed, 45 insertions, 30 deletions

diff --git a/kexec/Makefile b/kexec/Makefile
index 8c815b5..dff8da6 100644
--- a/kexec/Makefile
+++ b/kexec/Makefile
@@ -7,47 +7,62 @@ $(PURGATORY_HEX_C): $(PURGATORY) $(BIN_TO_HEX)
 	$(MKDIR) -p $(@D)
 	$(BIN_TO_HEX) purgatory < $(PURGATORY) > $@
 
-KEXEC_SRCS =
+KEXEC_SRCS = $(KEXEC_SRCS_base)
 KEXEC_GENERATED_SRCS =
 
-KEXEC_SRCS += kexec/kexec.c
-KEXEC_SRCS += kexec/ifdown.c
-KEXEC_SRCS += kexec/kexec-elf.c
-KEXEC_SRCS += kexec/kexec-elf-exec.c
-KEXEC_SRCS += kexec/kexec-elf-core.c
-KEXEC_SRCS += kexec/kexec-elf-rel.c
-KEXEC_SRCS += kexec/kexec-elf-boot.c
-KEXEC_SRCS += kexec/kexec-iomem.c
-KEXEC_SRCS += kexec/firmware_memmap.c
-KEXEC_SRCS += kexec/crashdump.c
-KEXEC_SRCS += kexec/crashdump-xen.c
-KEXEC_SRCS += kexec/phys_arch.c
-KEXEC_SRCS += kexec/kernel_version.c
-KEXEC_SRCS += kexec/lzma.c
-KEXEC_SRCS += kexec/zlib.c
+KEXEC_SRCS_base += kexec/kexec.c
+KEXEC_SRCS_base += kexec/ifdown.c
+KEXEC_SRCS_base += kexec/kexec-elf.c
+KEXEC_SRCS_base += kexec/kexec-elf-exec.c
+KEXEC_SRCS_base += kexec/kexec-elf-core.c
+KEXEC_SRCS_base += kexec/kexec-elf-rel.c
+KEXEC_SRCS_base += kexec/kexec-elf-boot.c
+KEXEC_SRCS_base += kexec/kexec-iomem.c
+KEXEC_SRCS_base += kexec/firmware_memmap.c
+KEXEC_SRCS_base += kexec/crashdump.c
+KEXEC_SRCS_base += kexec/crashdump-xen.c
+KEXEC_SRCS_base += kexec/phys_arch.c
+KEXEC_SRCS_base += kexec/kernel_version.c
+KEXEC_SRCS_base += kexec/lzma.c
+KEXEC_SRCS_base += kexec/zlib.c
 
 KEXEC_GENERATED_SRCS += $(PURGATORY_HEX_C)
 
-dist += kexec/Makefile $(KEXEC_SRCS) $(KEXEC_GENERATED_SRCS)	\
-	kexec/crashdump-elf.c					\
+dist += kexec/Makefile $(KEXEC_GENERATED_SRCS)			\
+	$(KEXEC_SRCS_base) kexec/crashdump-elf.c		\
 	kexec/crashdump.h kexec/firmware_memmap.h		\
 	kexec/kexec-elf-boot.h					\
 	kexec/kexec-elf.h kexec/kexec-sha256.h			\
 	kexec/kexec-zlib.h kexec/kexec-lzma.h			\
 	kexec/kexec-syscall.h kexec/kexec.h kexec/kexec.8
 
-$(ARCH)_PROC_IOMEM		= kexec/proc_iomem.c
-KEXEC_SRCS += $($(ARCH)_PROC_IOMEM)
-$(ARCH)_VIRT_TO_PHYS		= kexec/virt_to_phys.c
-KEXEC_SRCS += $($(ARCH)_VIRT_TO_PHYS)
-$(ARCH)_PHYS_TO_VIRT		= kexec/phys_to_virt.c
-KEXEC_SRCS += $($(ARCH)_PHYS_TO_VIRT)
-$(ARCH)_ADD_SEGMENT		= kexec/add_segment.c
-KEXEC_SRCS += $($(ARCH)_ADD_SEGMENT)
-$(ARCH)_ADD_BUFFER		= kexec/add_buffer.c
-KEXEC_SRCS += $($(ARCH)_ADD_BUFFER)
-$(ARCH)_ARCH_REUSE_INITRD	= kexec/arch_reuse_initrd.c
-KEXEC_SRCS += $($(ARCH)_ARCH_REUSE_INITRD)
+dist				+= kexec/proc_iomem.c
+$(ARCH)_PROC_IOMEM		=  kexec/proc_iomem.c
+KEXEC_SRCS			+= $($(ARCH)_PROC_IOMEM)
+
+dist				+= kexec/virt_to_phys.c
+$(ARCH)_VIRT_TO_PHYS		=  kexec/virt_to_phys.c
+KEXEC_SRCS			+= $($(ARCH)_VIRT_TO_PHYS)
+
+dist				+= kexec/phys_to_virt.c
+$(ARCH)_PHYS_TO_VIRT		=  kexec/phys_to_virt.c
+KEXEC_SRCS			+= $($(ARCH)_PHYS_TO_VIRT)
+
+dist				+= kexec/add_segment.c
+$(ARCH)_ADD_SEGMENT		=  kexec/add_segment.c
+KEXEC_SRCS			+= $($(ARCH)_ADD_SEGMENT)
+
+dist				+= kexec/add_buffer.c
+$(ARCH)_ADD_BUFFER		=  kexec/add_buffer.c
+KEXEC_SRCS			+= $($(ARCH)_ADD_BUFFER)
+
+dist				+=  kexec/arch_reuse_initrd.c
+$(ARCH)_ARCH_REUSE_INITRD	=  kexec/arch_reuse_initrd.c
+KEXEC_SRCS			+= $($(ARCH)_ARCH_REUSE_INITRD)
+
+dist				+= kexec/kexec-uImage.c
+$(ARCH)_UIMAGE			=
+KEXEC_SRCS			+= $($(ARCH)_UIMAGE)
 
 include $(srcdir)/kexec/arch/alpha/Makefile
 include $(srcdir)/kexec/arch/arm/Makefile