From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:50334) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TwVKL-0004qJ-F2 for qemu-devel@nongnu.org; Sat, 19 Jan 2013 05:07:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TwVKK-0005x6-5w for qemu-devel@nongnu.org; Sat, 19 Jan 2013 05:07:05 -0500 Received: from mail-ee0-f51.google.com ([74.125.83.51]:58220) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TwVKK-0005wz-07 for qemu-devel@nongnu.org; Sat, 19 Jan 2013 05:07:04 -0500 Received: by mail-ee0-f51.google.com with SMTP id d17so2080703eek.24 for ; Sat, 19 Jan 2013 02:07:03 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Sat, 19 Jan 2013 11:06:48 +0100 Message-Id: <1358590008-1681-5-git-send-email-pbonzini@redhat.com> In-Reply-To: <1358590008-1681-1-git-send-email-pbonzini@redhat.com> References: <1358590008-1681-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 4/4] build: remove extra-obj-y List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: blauwirbel@gmail.com, afaerber@suse.de 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 --- Makefile | 3 ++- Makefile.objs | 5 +---- fsdev/Makefile.objs | 8 ++++---- hw/Makefile.objs | 2 -- hw/pci/Makefile.objs | 2 +- 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 55b5d36..bd885ca 100644 --- a/Makefile +++ b/Makefile @@ -105,6 +105,7 @@ defconfig: -include config-all-disas.mak CONFIG_SOFTMMU := $(if $(filter %-softmmu,$(TARGET_DIRS)),y) CONFIG_USER_ONLY := $(if $(filter %-user,$(TARGET_DIRS)),y) +CONFIG_ALL=y ifneq ($(wildcard config-host.mak),) include $(SRC_PATH)/Makefile.objs @@ -135,7 +136,7 @@ pixman/Makefile: $(SRC_PATH)/pixman/configure $(SRC_PATH)/pixman/configure: (cd $(SRC_PATH)/pixman; autoreconf -v --install) -$(SUBDIR_RULES): libqemuutil.a libqemustub.a $(common-obj-y) $(extra-obj-y) +$(SUBDIR_RULES): libqemuutil.a libqemustub.a $(common-obj-y) ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS)) romsubdir-%: diff --git a/Makefile.objs b/Makefile.objs index 63ddaaf..68eb0ce 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -55,7 +55,6 @@ common-obj-$(CONFIG_WIN32) += os-win32.o common-obj-$(CONFIG_POSIX) += os-posix.o common-obj-$(CONFIG_LINUX) += fsdev/ -extra-obj-$(CONFIG_LINUX) += fsdev/ common-obj-y += migration.o migration-tcp.o common-obj-y += qemu-char.o #aio.o @@ -68,7 +67,6 @@ common-obj-$(CONFIG_SPICE) += spice-qemu-char.o common-obj-y += audio/ common-obj-y += hw/ -extra-obj-y += hw/ common-obj-y += ui/ common-obj-y += bt-host.o bt-vhci.o @@ -118,6 +116,5 @@ nested-vars += \ util-obj-y \ qga-obj-y \ block-obj-y \ - common-obj-y \ - extra-obj-y + common-obj-y dummy := $(call unnest-vars) diff --git a/fsdev/Makefile.objs b/fsdev/Makefile.objs index ee16ca6..206289c 100644 --- a/fsdev/Makefile.objs +++ b/fsdev/Makefile.objs @@ -1,10 +1,10 @@ ifeq ($(CONFIG_REALLY_VIRTFS),y) common-obj-y = qemu-fsdev.o virtio-9p-marshal.o - -# Toplevel always builds this; targets without virtio will put it in -# common-obj-y -extra-obj-y = qemu-fsdev-dummy.o else common-obj-y = qemu-fsdev-dummy.o endif common-obj-y += qemu-fsdev-opts.o + +# Toplevel always builds this; targets without virtio will put it in +# common-obj-y +common-obj-$(CONFIG_ALL) += qemu-fsdev-dummy.o diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 0e245c8..c02c856 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -43,8 +43,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 -- 1.7.1