diff options
Diffstat (limited to 'kexec')
-rw-r--r-- | kexec/Makefile | 50 | ||||
-rw-r--r-- | kexec/arch/i386/Makefile | 18 | ||||
-rw-r--r-- | kexec/arch/ia64/Makefile | 10 | ||||
-rw-r--r-- | kexec/arch/ppc/Makefile | 12 | ||||
-rw-r--r-- | kexec/arch/ppc64/Makefile | 14 | ||||
-rw-r--r-- | kexec/arch/s390/Makefile | 6 | ||||
-rw-r--r-- | kexec/arch/sh/Makefile | 10 | ||||
-rw-r--r-- | kexec/arch/x86_64/Makefile | 20 |
8 files changed, 65 insertions, 75 deletions
diff --git a/kexec/Makefile b/kexec/Makefile index 6f7a49c..3d9db29 100644 --- a/kexec/Makefile +++ b/kexec/Makefile @@ -1,37 +1,35 @@ # # kexec (linux booting linux) # -PURGATORY_HEX_C:= kexec/purgatory.c +PURGATORY_HEX_C = kexec/purgatory.c $(PURGATORY_HEX_C): $(PURGATORY) $(BIN_TO_HEX) $(MKDIR) -p $(@D) $(BIN_TO_HEX) purgatory < $(PURGATORY) > $@ -KEXEC_C_SRCS:= kexec/kexec.c -KEXEC_C_SRCS+= kexec/ifdown.c -KEXEC_C_SRCS+= kexec/kexec-elf.c -KEXEC_C_SRCS+= kexec/kexec-elf-exec.c -KEXEC_C_SRCS+= kexec/kexec-elf-core.c -KEXEC_C_SRCS+= kexec/kexec-elf-rel.c -KEXEC_C_SRCS+= kexec/kexec-elf-boot.c -KEXEC_C_SRCS+= kexec/kexec-iomem.c -KEXEC_C_SRCS+= kexec/crashdump.c -KEXEC_C_SRCS+= kexec/crashdump-xen.c -KEXEC_C_GENERATED_SRCS+= $(PURGATORY_HEX_C) -KEXEC_S_SRCS:= -KEXEC_S_GENERATED_SRCS:= +KEXEC_SRCS = +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/crashdump.c +KEXEC_SRCS += kexec/crashdump-xen.c + +KEXEC_GENERATED_SRCS += $(PURGATORY_HEX_C) include $(srcdir)/kexec/arch/$(ARCH)/Makefile -KEXEC_C_OBJS:= $(patsubst %.c, %.o, $(KEXEC_C_SRCS) $(KEXEC_C_GENERATED_SRCS)) -KEXEC_C_DEPS:= $(patsubst %.c, %.d, $(KEXEC_C_SRCS)) -KEXEC_S_OBJS:= $(patsubst %.S, %.o, $(KEXEC_S_SRCS) $(KEXEC_S_GENERATED_SRCS)) -KEXEC_S_DEPS:= $(patsubst %.S, %.d, $(KEXEC_S_SRCS)) -KEXEC_SRCS:= $(KEXEC_C_SRCS) $(KEXEC_S_SRCS) -KEXEC_OBJS:= $(KEXEC_C_OBJS) $(KEXEC_S_OBJS) -KEXEC_DEPS:= $(KEXEC_C_DEPS) $(KEXEC_S_DEPS) -KEXEC:= $(SBINDIR)/kexec -KEXEC_MANPAGE:= $(MANDIR)/man8/kexec.8 +KEXEC_OBJS = $(call objify, $(KEXEC_SRCS) $(KEXEC_GENERATED_SRCS)) +KEXEC_DEPS = $(call depify, $(KEXEC_OBJS)) + +KEXEC = $(SBINDIR)/kexec +KEXEC_MANPAGE = $(MANDIR)/man8/kexec.8 -include $(KEXEC_DEPS) @@ -45,12 +43,6 @@ $(KEXEC_MANPAGE): kexec/kexec.8 @$(MKDIR) -p $(MANDIR)/man8 cp kexec/kexec.8 $(KEXEC_MANPAGE) echo:: - @echo "KEXEC_C_SRCS $(KEXEC_C_SRCS)" - @echo "KEXEC_C_DEPS $(KEXEC_C_DEPS)" - @echo "KEXEC_C_OBJS $(KEXEC_C_OBJS)" - @echo "KEXEC_S_SRCS $(KEXEC_S_SRCS)" - @echo "KEXEC_S_DEPS $(KEXEC_S_DEPS)" - @echo "KEXEC_S_OBJS $(KEXEC_S_OBJS)" @echo "KEXEC_SRCS $(KEXEC_SRCS)" @echo "KEXEC_DEPS $(KEXEC_DEPS)" @echo "KEXEC_OBJS $(KEXEC_OBJS)" diff --git a/kexec/arch/i386/Makefile b/kexec/arch/i386/Makefile index d77b064..7bda300 100644 --- a/kexec/arch/i386/Makefile +++ b/kexec/arch/i386/Makefile @@ -1,12 +1,12 @@ # # kexec i386 (linux booting linux) # -KEXEC_C_SRCS+= kexec/arch/i386/kexec-x86.c -KEXEC_C_SRCS+= kexec/arch/i386/kexec-elf-x86.c -KEXEC_C_SRCS+= kexec/arch/i386/kexec-elf-rel-x86.c -KEXEC_C_SRCS+= kexec/arch/i386/kexec-bzImage.c -KEXEC_C_SRCS+= kexec/arch/i386/kexec-multiboot-x86.c -KEXEC_C_SRCS+= kexec/arch/i386/kexec-beoboot-x86.c -KEXEC_C_SRCS+= kexec/arch/i386/kexec-nbi.c -KEXEC_C_SRCS+= kexec/arch/i386/x86-linux-setup.c -KEXEC_C_SRCS+= kexec/arch/i386/crashdump-x86.c +KEXEC_SRCS += kexec/arch/i386/kexec-x86.c +KEXEC_SRCS += kexec/arch/i386/kexec-elf-x86.c +KEXEC_SRCS += kexec/arch/i386/kexec-elf-rel-x86.c +KEXEC_SRCS += kexec/arch/i386/kexec-bzImage.c +KEXEC_SRCS += kexec/arch/i386/kexec-multiboot-x86.c +KEXEC_SRCS += kexec/arch/i386/kexec-beoboot-x86.c +KEXEC_SRCS += kexec/arch/i386/kexec-nbi.c +KEXEC_SRCS += kexec/arch/i386/x86-linux-setup.c +KEXEC_SRCS += kexec/arch/i386/crashdump-x86.c diff --git a/kexec/arch/ia64/Makefile b/kexec/arch/ia64/Makefile index a8a94fe..ea0bdb0 100644 --- a/kexec/arch/ia64/Makefile +++ b/kexec/arch/ia64/Makefile @@ -1,9 +1,9 @@ # # kexec ia64 (linux booting linux) # -KEXEC_C_SRCS+= kexec/arch/ia64/kexec-iomem.c -KEXEC_C_SRCS+= kexec/arch/ia64/kexec-ia64.c -KEXEC_C_SRCS+= kexec/arch/ia64/kexec-elf-ia64.c -KEXEC_C_SRCS+= kexec/arch/ia64/kexec-elf-rel-ia64.c -KEXEC_C_SRCS+= kexec/arch/ia64/crashdump-ia64.c +KEXEC_SRCS += kexec/arch/ia64/kexec-iomem.c +KEXEC_SRCS += kexec/arch/ia64/kexec-ia64.c +KEXEC_SRCS += kexec/arch/ia64/kexec-elf-ia64.c +KEXEC_SRCS += kexec/arch/ia64/kexec-elf-rel-ia64.c +KEXEC_SRCS += kexec/arch/ia64/crashdump-ia64.c diff --git a/kexec/arch/ppc/Makefile b/kexec/arch/ppc/Makefile index 972a2f2..52295ae 100644 --- a/kexec/arch/ppc/Makefile +++ b/kexec/arch/ppc/Makefile @@ -1,9 +1,9 @@ # # kexec ppc (linux booting linux) # -KEXEC_C_SRCS+= kexec/arch/ppc/kexec-ppc.c -KEXEC_C_SRCS+= kexec/arch/ppc/kexec-elf-ppc.c -KEXEC_C_SRCS+= kexec/arch/ppc/kexec-elf-rel-ppc.c -KEXEC_C_SRCS+= kexec/arch/ppc/kexec-dol-ppc.c -KEXEC_S_SRCS+= kexec/arch/ppc/ppc-setup-simple.S -KEXEC_S_SRCS+= kexec/arch/ppc/ppc-setup-dol.S +KEXEC_SRCS += kexec/arch/ppc/kexec-ppc.c +KEXEC_SRCS += kexec/arch/ppc/kexec-elf-ppc.c +KEXEC_SRCS += kexec/arch/ppc/kexec-elf-rel-ppc.c +KEXEC_SRCS += kexec/arch/ppc/kexec-dol-ppc.c +KEXEC_SRCS += kexec/arch/ppc/ppc-setup-simple.S +KEXEC_SRCS += kexec/arch/ppc/ppc-setup-dol.S diff --git a/kexec/arch/ppc64/Makefile b/kexec/arch/ppc64/Makefile index 187a303..b3de3a6 100644 --- a/kexec/arch/ppc64/Makefile +++ b/kexec/arch/ppc64/Makefile @@ -1,11 +1,9 @@ # # kexec ppc64 (linux booting linux) # -KEXEC_C_SRCS+= kexec/arch/ppc64/kexec-elf-rel-ppc64.c -KEXEC_C_SRCS+= kexec/arch/ppc64/kexec-zImage-ppc64.c -KEXEC_C_SRCS+= kexec/arch/ppc64/fs2dt.c -KEXEC_C_SRCS+= kexec/arch/ppc64/kexec-elf-ppc64.c -KEXEC_C_SRCS+= kexec/arch/ppc64/kexec-ppc64.c -KEXEC_C_SRCS+= kexec/arch/ppc64/crashdump-ppc64.c - -KEXEC_S_SRCS+= +KEXEC_SRCS += kexec/arch/ppc64/kexec-elf-rel-ppc64.c +KEXEC_SRCS += kexec/arch/ppc64/kexec-zImage-ppc64.c +KEXEC_SRCS += kexec/arch/ppc64/fs2dt.c +KEXEC_SRCS += kexec/arch/ppc64/kexec-elf-ppc64.c +KEXEC_SRCS += kexec/arch/ppc64/kexec-ppc64.c +KEXEC_SRCS += kexec/arch/ppc64/crashdump-ppc64.c diff --git a/kexec/arch/s390/Makefile b/kexec/arch/s390/Makefile index 1d26e81..2e496b0 100644 --- a/kexec/arch/s390/Makefile +++ b/kexec/arch/s390/Makefile @@ -1,6 +1,6 @@ # # kexec s390 (linux booting linux) # -KEXEC_C_SRCS+= kexec/arch/s390/kexec-s390.c -KEXEC_C_SRCS+= kexec/arch/s390/kexec-image.c -KEXEC_C_SRCS+= kexec/arch/s390/kexec-elf-rel-s390.c +KEXEC_SRCS += kexec/arch/s390/kexec-s390.c +KEXEC_SRCS += kexec/arch/s390/kexec-image.c +KEXEC_SRCS += kexec/arch/s390/kexec-elf-rel-s390.c diff --git a/kexec/arch/sh/Makefile b/kexec/arch/sh/Makefile index 753e073..4d49490 100644 --- a/kexec/arch/sh/Makefile +++ b/kexec/arch/sh/Makefile @@ -1,8 +1,8 @@ # # kexec sh (linux booting linux) # -KEXEC_C_SRCS+= kexec/arch/sh/kexec-sh.c -KEXEC_C_SRCS+= kexec/arch/sh/kexec-zImage-sh.c -KEXEC_C_SRCS+= kexec/arch/sh/kexec-netbsd-sh.c -KEXEC_C_SRCS+= kexec/arch/sh/kexec-elf-rel-sh.c -KEXEC_S_SRCS+= kexec/arch/sh/netbsd_booter.S +KEXEC_SRCS += kexec/arch/sh/kexec-sh.c +KEXEC_SRCS += kexec/arch/sh/kexec-zImage-sh.c +KEXEC_SRCS += kexec/arch/sh/kexec-netbsd-sh.c +KEXEC_SRCS += kexec/arch/sh/kexec-elf-rel-sh.c +KEXEC_SRCS += kexec/arch/sh/netbsd_booter.S diff --git a/kexec/arch/x86_64/Makefile b/kexec/arch/x86_64/Makefile index 799e2a4..c3a4d4e 100644 --- a/kexec/arch/x86_64/Makefile +++ b/kexec/arch/x86_64/Makefile @@ -1,13 +1,13 @@ # # kexec x86_64 (linux booting linux) # -KEXEC_C_SRCS+= kexec/arch/i386/kexec-elf-x86.c -KEXEC_C_SRCS+= kexec/arch/i386/kexec-bzImage.c -KEXEC_C_SRCS+= kexec/arch/i386/kexec-multiboot-x86.c -KEXEC_C_SRCS+= kexec/arch/i386/kexec-beoboot-x86.c -KEXEC_C_SRCS+= kexec/arch/i386/kexec-nbi.c -KEXEC_C_SRCS+= kexec/arch/i386/x86-linux-setup.c -KEXEC_C_SRCS+= kexec/arch/x86_64/crashdump-x86_64.c -KEXEC_C_SRCS+= kexec/arch/x86_64/kexec-x86_64.c -KEXEC_C_SRCS+= kexec/arch/x86_64/kexec-elf-x86_64.c -KEXEC_C_SRCS+= kexec/arch/x86_64/kexec-elf-rel-x86_64.c +KEXEC_SRCS += kexec/arch/i386/kexec-elf-x86.c +KEXEC_SRCS += kexec/arch/i386/kexec-bzImage.c +KEXEC_SRCS += kexec/arch/i386/kexec-multiboot-x86.c +KEXEC_SRCS += kexec/arch/i386/kexec-beoboot-x86.c +KEXEC_SRCS += kexec/arch/i386/kexec-nbi.c +KEXEC_SRCS += kexec/arch/i386/x86-linux-setup.c +KEXEC_SRCS += kexec/arch/x86_64/crashdump-x86_64.c +KEXEC_SRCS += kexec/arch/x86_64/kexec-x86_64.c +KEXEC_SRCS += kexec/arch/x86_64/kexec-elf-x86_64.c +KEXEC_SRCS += kexec/arch/x86_64/kexec-elf-rel-x86_64.c |