From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59219) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ScXLX-0006j7-QJ for qemu-devel@nongnu.org; Thu, 07 Jun 2012 03:41:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ScXLR-00060x-KS for qemu-devel@nongnu.org; Thu, 07 Jun 2012 03:41:31 -0400 Received: from mail-pz0-f45.google.com ([209.85.210.45]:45957) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ScXLR-0005e1-B3 for qemu-devel@nongnu.org; Thu, 07 Jun 2012 03:41:25 -0400 Received: by mail-pz0-f45.google.com with SMTP id v2so544822dad.4 for ; Thu, 07 Jun 2012 00:41:24 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 7 Jun 2012 09:39:57 +0200 Message-Id: <1339054814-20939-13-git-send-email-pbonzini@redhat.com> In-Reply-To: <1339054814-20939-1-git-send-email-pbonzini@redhat.com> References: <1339054814-20939-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v3 12/29] build: adapt qom/Makefile and move it to Makefile.objs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: anthony@codemonkey.ws qom/ already used a separate makefile. Convert it to use relative paths, and make it declare both common-obj-y and user-obj-y. This way, the upper makefiles do not need to know that some QOM files are compiled twice. Signed-off-by: Paolo Bonzini --- Makefile.objs | 13 +++++++------ qom/Makefile | 2 -- qom/Makefile.objs | 4 ++++ 3 files changed, 11 insertions(+), 8 deletions(-) delete mode 100644 qom/Makefile create mode 100644 qom/Makefile.objs diff --git a/Makefile.objs b/Makefile.objs index e06db12..ef49a09 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -12,9 +12,7 @@ universal-obj-y += $(qobject-obj-y) ####################################################################### # QOM -include $(SRC_PATH)/qom/Makefile -qom-obj-y = $(addprefix qom/, $(qom-y)) -qom-obj-twice-y = $(addprefix qom/, $(qom-twice-y)) +qom-obj-y = qom/ universal-obj-y += $(qom-obj-y) @@ -94,7 +92,7 @@ fsdev-obj-$(CONFIG_VIRTFS) += $(addprefix fsdev/, $(fsdev-nested-y)) common-obj-y = $(block-obj-y) blockdev.o common-obj-y += $(net-obj-y) -common-obj-y += $(qom-obj-twice-y) +common-obj-y += qom/ common-obj-$(CONFIG_LINUX) += $(fsdev-obj-$(CONFIG_LINUX)) common-obj-y += readline.o console.o cursor.o common-obj-y += $(oslib-obj-y) @@ -202,7 +200,7 @@ user-obj-y += cutils.o cache-utils.o user-obj-y += module.o user-obj-y += qemu-user.o user-obj-y += $(trace-obj-y) -user-obj-y += $(qom-obj-twice-y) +user-obj-y += qom/ ###################################################################### # libhw @@ -468,5 +466,8 @@ vl.o: QEMU_CFLAGS+=$(SDL_CFLAGS) QEMU_CFLAGS+=$(GLIB_CFLAGS) -nested-vars += # ... +nested-vars += \ + qom-obj-y \ + user-obj-y \ + common-obj-y dummy := $(call unnest-vars) diff --git a/qom/Makefile b/qom/Makefile deleted file mode 100644 index 34c6de5..0000000 --- a/qom/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -qom-y = object.o container.o qom-qobject.o -qom-twice-y = cpu.o diff --git a/qom/Makefile.objs b/qom/Makefile.objs new file mode 100644 index 0000000..5ef060a --- /dev/null +++ b/qom/Makefile.objs @@ -0,0 +1,4 @@ +qom-obj-y = object.o container.o qom-qobject.o +qom-obj-twice-y = cpu.o +common-obj-y = $(qom-obj-twice-y) +user-obj-y = $(qom-obj-twice-y) -- 1.7.10.1