From patchwork Sat Jan 12 17:35:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 211548 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 7C0182C00EB for ; Sun, 13 Jan 2013 05:43:33 +1100 (EST) Received: from localhost ([::1]:36814 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tu51C-0003IS-9r for incoming@patchwork.ozlabs.org; Sat, 12 Jan 2013 12:37:18 -0500 Received: from eggs.gnu.org ([208.118.235.92]:50849) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tu50X-0002FG-Se for qemu-devel@nongnu.org; Sat, 12 Jan 2013 12:36:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tu50S-0000Od-Ok for qemu-devel@nongnu.org; Sat, 12 Jan 2013 12:36:37 -0500 Received: from mail-wi0-f174.google.com ([209.85.212.174]:40947) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tu50S-0000OX-Ez for qemu-devel@nongnu.org; Sat, 12 Jan 2013 12:36:32 -0500 Received: by mail-wi0-f174.google.com with SMTP id hq4so458435wib.13 for ; Sat, 12 Jan 2013 09:36:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:subject:date:message-id:x-mailer :in-reply-to:references; bh=tYN/GtHzkVmDdI9NEqGi6D6bt12vzN2Lg+JZhGdJU0o=; b=cNFDr6J5o8RnPpsWM2zCIsaHOY8ovIgYF1Hx6Vc57hKJBwPoEIAGkhtqguETPjU6Gh CXI4joXesVEmXUr5IK4MRAxk43hDcjjtTiwd8US9nyCO6VrgrU9bK8VtI/gEWkZV149w wJf6prMKcXLiIzcq48vs6IZ/dYbVXjOOSA3kkBCkfzZziDnHP8haPRNQaAqwd0p+0FFK t3jybJCi2KADAl3GqFusPoiH3kxE+kU566PcpvmrVC12KXekBXg8EJIStb6oxNn9U9l5 GARJRaP7xWILOtZH5afIFXJdvQ/R0GwJZfSzK5oCm9BrbebUI1u7N64yD6mhxeV7UEnp siDA== X-Received: by 10.180.92.100 with SMTP id cl4mr4284463wib.24.1358012191725; Sat, 12 Jan 2013 09:36:31 -0800 (PST) Received: from yakj.lan (93-34-179-137.ip50.fastwebnet.it. [93.34.179.137]) by mx.google.com with ESMTPS id h19sm4576016wiv.7.2013.01.12.09.36.30 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sat, 12 Jan 2013 09:36:30 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 12 Jan 2013 18:35:20 +0100 Message-Id: <1358012138-21613-10-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1 In-Reply-To: <1358012138-21613-1-git-send-email-pbonzini@redhat.com> References: <1358012138-21613-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.212.174 Subject: [Qemu-devel] [PATCH 09/27] libcacard: prepare to use -y trick in the Makefile 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 Rename variables to follow the conventions of the rest of the build systems. Signed-off-by: Paolo Bonzini --- libcacard/Makefile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libcacard/Makefile b/libcacard/Makefile index a526eae..ddab5d8 100644 --- a/libcacard/Makefile +++ b/libcacard/Makefile @@ -7,17 +7,15 @@ libcacard_includedir=$(includedir)/cacard $(call set-vpath, $(SRC_PATH)) # objects linked into a shared library, built with libtool with -fPIC if required -QEMU_OBJS=$(oslib-obj-y) qemu-timer-common.o error.o $(trace-obj-y) $(stub-obj-y) -QEMU_OBJS_LIB=$(patsubst %.o,%.lo,$(QEMU_OBJS)) +libcacard-obj-y=$(oslib-obj-y) error.o $(trace-obj-y) $(stub-obj-y) $(libcacard-y) +libcacard-lobj-y=$(patsubst %.o,%.lo,$(libcacard-obj-y)) # libtool will build the .o files, too $(libcacard-obj-y): | $(libcacard-lobj-y) QEMU_CFLAGS+=-I../ -libcacard.lib-y=$(patsubst %.o,%.lo,$(libcacard-y)) - -vscclient: $(libcacard-y) $(QEMU_OBJS) vscclient.o cutils.o +vscclient: vscclient.o $(libcacard-obj-y) $(call quiet-command,$(CC) -o $@ $^ $(libcacard_libs) $(LIBS)," LINK $@") clean: @@ -31,7 +29,7 @@ all: libcacard.la libcacard.pc ######################################################################### # Rules for building libcacard standalone library -libcacard.la: $(libcacard.lib-y) $(QEMU_OBJS_LIB) +libcacard.la: $(libcacard-lobj-y) $(call quiet-command,$(LIBTOOL) --mode=link --tag=CC $(CC) -rpath $(libdir) -o $@ $^ $(libcacard_libs)," lt LINK $@") libcacard_srcpath=$(SRC_PATH)/libcacard