diff options
| author |   Jan Kiszka <jan.kiszka@siemens.com> | 2009-07-08 18:07:49 +0200 |
|---|---|---|
| committer |   Avi Kivity <avi@redhat.com> | 2009-07-08 19:17:44 +0300 |
| commit | 3a997fa6c813631b9e9b0b9e360500e748e28e71 (patch) | |
| tree | 5697ace5db322978df311ae027871df4021f0870 | |
| parent | ac77c7782aa84e76179ec38a1f944b4a329fa841 (diff) | |
This unbreaks out-of-tree builds and reduces the differences to
upstream's top-level Makefile.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
| -rw-r--r-- | Makefile | 11 | ||||
| -rw-r--r-- | pc-bios/optionrom/Makefile | 2 | ||||
| -rw-r--r-- | pc-bios/optionrom/extboot.S (renamed from kvm/extboot/extboot.S) | 0 |
3 files changed, 2 insertions, 11 deletions
@@ -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 c4a6f4262..8a3f8a4bb 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 index 1e60f6878..1e60f6878 100644 --- a/kvm/extboot/extboot.S +++ b/pc-bios/optionrom/extboot.S |