This unbreaks out-of-tree builds and reduces the differences to upstream's top-level Makefile. Signed-off-by: Jan Kiszka <jan.kiszka@xxxxxxxxxxx> --- Makefile | 11 - kvm/extboot/extboot.S | 695 ------------------------------------------- pc-bios/optionrom/Makefile | 2 pc-bios/optionrom/extboot.S | 695 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 697 insertions(+), 706 deletions(-) delete mode 100644 kvm/extboot/extboot.S create mode 100644 pc-bios/optionrom/extboot.S diff --git a/Makefile b/Makefile index eb64886..fc40431 100644 --- a/Makefile +++ b/Makefile @@ -444,18 +444,9 @@ tarbin: # Include automatically generated dependency files -include $(wildcard *.d audio/*.d slirp/*.d block/*.d) -.PHONY: kvm/extboot - build-targets-i386 = $(build-targets-x86) build-targets-x86_64 = $(build-targets-x86) -build-targets-x86 = kvm/extboot +build-targets-x86 = build-targets-ia64 = all: $(build-targets-$(ARCH)) - -kvm/extboot: - $(MAKE) -C $@ - if ! [ -f pc-bios/extboot.bin ] \ - || ! cmp -s pc-bios/extboot.bin $@/extboot.bin; then \ - cp $@/extboot.bin pc-bios/extboot.bin; \ - fi diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile index c4a6f42..8a3f8a4 100644 --- a/pc-bios/optionrom/Makefile +++ b/pc-bios/optionrom/Makefile @@ -29,7 +29,7 @@ ifeq ($(call cc-option-yn,-fno-stack-protector),y) CFLAGS += -fno-stack-protector endif -build-all: multiboot.bin +build-all: multiboot.bin extboot.bin %.o: %.S $(CC) $(CFLAGS) -o $@ -c $< diff --git a/kvm/extboot/extboot.S b/pc-bios/optionrom/extboot.S similarity index 100% rename from kvm/extboot/extboot.S rename to pc-bios/optionrom/extboot.S -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
