From patchwork Fri Dec 21 16:05:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 207842 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BBB4A2C0094 for ; Sat, 22 Dec 2012 03:50:59 +1100 (EST) Received: from localhost ([::1]:60427 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tm58L-0007kM-AT for incoming@patchwork.ozlabs.org; Fri, 21 Dec 2012 11:07:37 -0500 Received: from eggs.gnu.org ([208.118.235.92]:55396) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tm57V-0006Ei-EU for qemu-devel@nongnu.org; Fri, 21 Dec 2012 11:06:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tm57T-0006sW-E6 for qemu-devel@nongnu.org; Fri, 21 Dec 2012 11:06:45 -0500 Received: from mail-ie0-f178.google.com ([209.85.223.178]:64671) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tm57T-0006sR-8g for qemu-devel@nongnu.org; Fri, 21 Dec 2012 11:06:43 -0500 Received: by mail-ie0-f178.google.com with SMTP id c12so6332670ieb.23 for ; Fri, 21 Dec 2012 08:06:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=/RFmQqEoDjo9BZGelw9chyazo9CmslaVZD0f9v+NrLU=; b=uLaG/Ijvnq8gVmzrVJGgKtlAhS4W8VrxTRax0+P/NmKbkSr5Qttr0XTZn01Pxy+wLV Hmory4U3w0DRk0DMf7r9iaf7b7ZS22mp7f8yvFld5rtbHuboNJko47BiAFSstuEObhN5 JWgFYf8uddEFA6oqX8qNlFmdAxNhfuoc8Gi39jx/xye7qQVIKUpUWqi1r3HDey7yB9/Y FaHZDeUXksOM537xfT1jC0AX8tQbdmu7Q0bYxlHN0vVAjgjnIuT7oi7xySPVQeeF/NhC tGH8/kQ54c5p/ZsJOrzTbEziTGPxQriNtWFjrDgjKXB+2K9THtK660CDIbjDCepcaglU RF3Q== X-Received: by 10.50.152.198 with SMTP id va6mr13783616igb.42.1356106002803; Fri, 21 Dec 2012 08:06:42 -0800 (PST) Received: from yakj.usersys.redhat.com (93-34-179-137.ip50.fastwebnet.it. [93.34.179.137]) by mx.google.com with ESMTPS id u4sm9757244igw.6.2012.12.21.08.06.40 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 21 Dec 2012 08:06:42 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 21 Dec 2012 17:05:36 +0100 Message-Id: <1356105948-13216-16-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.0.2 In-Reply-To: <1356105948-13216-1-git-send-email-pbonzini@redhat.com> References: <1356105948-13216-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.223.178 Cc: alevy@redhat.com, vilanova@ac.upc.edu, afaerber@suse.de Subject: [Qemu-devel] [PATCH 15/27] build: rename oslib-obj-y to util-obj-y X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This prepares the creation of libqemuutil.a in the next patch. Signed-off-by: Paolo Bonzini --- Makefile | 4 ++-- Makefile.objs | 10 +++++----- Makefile.target | 4 ++-- tests/Makefile | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 92f62e3..395cc08 100644 --- a/Makefile +++ b/Makefile @@ -160,7 +160,7 @@ libqemustub.a: $(stub-obj-y) qemu-img.o: qemu-img-cmds.h -tools-obj-y = $(oslib-obj-y) $(trace-obj-y) qemu-timer.o \ +tools-obj-y = $(util-obj-y) $(trace-obj-y) qemu-timer.o \ main-loop.o iohandler.o error.o tools-obj-$(CONFIG_POSIX) += compatfd.o @@ -206,7 +206,7 @@ $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py) QGALIB_GEN=$(addprefix qga/qapi-generated/, qga-qapi-types.h qga-qapi-visit.h qga-qmp-commands.h) $(qga-obj-y) qemu-ga.o: $(QGALIB_GEN) -qemu-ga$(EXESUF): $(qga-obj-y) $(oslib-obj-y) $(trace-obj-y) $(qapi-obj-y) $(qobject-obj-y) $(version-obj-y) libqemustub.a +qemu-ga$(EXESUF): $(qga-obj-y) $(util-obj-y) $(trace-obj-y) $(qapi-obj-y) $(qobject-obj-y) $(version-obj-y) libqemustub.a $(call LINK, $^) clean: diff --git a/Makefile.objs b/Makefile.objs index 7858c4e..682ceb1 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -22,10 +22,10 @@ qom-obj-y = qom/ universal-obj-y += $(qom-obj-y) ####################################################################### -# oslib-obj-y is code depending on the OS (win32 vs posix) -oslib-obj-y = osdep.o cutils.o qemu-timer-common.o -oslib-obj-$(CONFIG_WIN32) += oslib-win32.o qemu-thread-win32.o -oslib-obj-$(CONFIG_POSIX) += oslib-posix.o qemu-thread-posix.o +# util-obj-y is code depending on the OS (win32 vs posix) +util-obj-y = osdep.o cutils.o qemu-timer-common.o +util-obj-$(CONFIG_WIN32) += oslib-win32.o qemu-thread-win32.o +util-obj-$(CONFIG_POSIX) += oslib-posix.o qemu-thread-posix.o ####################################################################### # coroutines @@ -69,7 +69,7 @@ common-obj-y = $(block-obj-y) blockdev.o blockdev-nbd.o block/ common-obj-y += net/ common-obj-y += qom/ common-obj-y += readline.o -common-obj-y += $(oslib-obj-y) +common-obj-y += $(util-obj-y) common-obj-$(CONFIG_WIN32) += os-win32.o common-obj-$(CONFIG_POSIX) += os-posix.o diff --git a/Makefile.target b/Makefile.target index 8bbad38..c75d1cd 100644 --- a/Makefile.target +++ b/Makefile.target @@ -84,7 +84,7 @@ ifdef CONFIG_LINUX_USER QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR) -I$(SRC_PATH)/linux-user obj-y += linux-user/ -obj-y += gdbstub.o thunk.o user-exec.o $(oslib-obj-y) +obj-y += gdbstub.o thunk.o user-exec.o $(util-obj-y) endif #CONFIG_LINUX_USER @@ -96,7 +96,7 @@ ifdef CONFIG_BSD_USER QEMU_CFLAGS+=-I$(SRC_PATH)/bsd-user -I$(SRC_PATH)/bsd-user/$(TARGET_ARCH) obj-y += bsd-user/ -obj-y += gdbstub.o user-exec.o $(oslib-obj-y) +obj-y += gdbstub.o user-exec.o $(util-obj-y) endif #CONFIG_BSD_USER diff --git a/tests/Makefile b/tests/Makefile index 969dc29..a260b60 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -85,7 +85,7 @@ TARGETS=$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_DIRS))) QTEST_TARGETS=$(foreach TARGET,$(TARGETS), $(if $(check-qtest-$(TARGET)-y), $(TARGET),)) check-qtest-$(CONFIG_POSIX)=$(foreach TARGET,$(TARGETS), $(check-qtest-$(TARGET)-y)) -qtest-obj-y = tests/libqtest.o $(oslib-obj-y) libqemustub.a +qtest-obj-y = tests/libqtest.o $(util-obj-y) libqemustub.a $(check-qtest-y): $(qtest-obj-y) .PHONY: check-help