diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-01-19 11:06:48 +0100 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2013-01-26 13:15:37 +0000 |
| commit | 82cb6b041c307bd96c067147af69cd98be91a682 (patch) | |
| tree | 7283ae0244b7adb22e966c3486a533e3c0e95156 /hw | |
| parent | 000823449ca07e50086413338f907d7a817db2ce (diff) | |
| download | qemu-82cb6b041c307bd96c067147af69cd98be91a682.zip qemu-82cb6b041c307bd96c067147af69cd98be91a682.tar.gz qemu-82cb6b041c307bd96c067147af69cd98be91a682.tar.bz2 | |
build: remove extra-obj-y
extra-obj-y is somewhat complicated to understand. Replace it with a
special CONFIG_ALL symbol that is defined only at toplevel.
This limits the case of directories defining more than one
*-obj-y target.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/Makefile.objs | 2 | ||||
| -rw-r--r-- | hw/pci/Makefile.objs | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 260885d..447e32a 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -44,8 +44,6 @@ common-obj-$(CONFIG_I8259) += i8259_common.o i8259.o common-obj-y += fifo.o common-obj-y += pam.o -extra-obj-y += pci/ - # PPC devices common-obj-$(CONFIG_PREP_PCI) += prep_pci.o common-obj-$(CONFIG_I82378) += i82378.o diff --git a/hw/pci/Makefile.objs b/hw/pci/Makefile.objs index fe965fe..1cd6cde 100644 --- a/hw/pci/Makefile.objs +++ b/hw/pci/Makefile.objs @@ -6,4 +6,4 @@ common-obj-$(CONFIG_PCI) += pci_host.o pcie_host.o common-obj-$(CONFIG_PCI) += pcie.o pcie_aer.o pcie_port.o common-obj-$(CONFIG_NO_PCI) += pci-stub.o -extra-obj-y += pci-stub.o +common-obj-$(CONFIG_ALL) += pci-stub.o |