From patchwork Fri Dec 21 16:05:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 207864 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 7EB6A2C008A for ; Sat, 22 Dec 2012 04:31:51 +1100 (EST) Received: from localhost ([::1]:60433 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tm58R-0007kU-H4 for incoming@patchwork.ozlabs.org; Fri, 21 Dec 2012 11:07:43 -0500 Received: from eggs.gnu.org ([208.118.235.92]:55292) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tm57C-0005KA-W0 for qemu-devel@nongnu.org; Fri, 21 Dec 2012 11:06:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tm577-0006oJ-5v for qemu-devel@nongnu.org; Fri, 21 Dec 2012 11:06:26 -0500 Received: from mail-ia0-f177.google.com ([209.85.210.177]:37058) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tm577-0006o7-0M for qemu-devel@nongnu.org; Fri, 21 Dec 2012 11:06:21 -0500 Received: by mail-ia0-f177.google.com with SMTP id u21so3945897ial.8 for ; Fri, 21 Dec 2012 08:06:20 -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=fXCL/h0kwC371mE+wGKhACm2TLy/3dyuIijZOYAzgxY=; b=MoXKuRr/tLJj0s4l9GtldHc0PAGuNczicbVBPYF98zzt/mAK4dNG0W1I1UABLS8NTD PuF3BE7sLqFPbA2SGJ+b5QiJVwp8fmFV78gi5qvnJV2osDjbQYm2P+Zp9UsAsb8F8j8w vXKFFnNJjrok+F7z3jeuxnrsk3KS4KeKV7DXScRri2ibNiNZ0vWtr+eGZXCzuCrFq2nC ccBJE8BYsaDcUXzXpLjLiTy1V0U9YwuNQZs+6B2NIkQAQW+1nb9+9ljN+wsXGzcJcrjr e5RSu5Ur+wHJ4/LiBiCNYj5pJWUesDVp2Vz3QP6nfVj1GWNHejSQEU67ZxgSwYtMDqsz e+Lw== X-Received: by 10.50.185.194 with SMTP id fe2mr13773458igc.60.1356105980425; Fri, 21 Dec 2012 08:06:20 -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.18 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 21 Dec 2012 08:06:19 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 21 Dec 2012 17:05:30 +0100 Message-Id: <1356105948-13216-10-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.210.177 Cc: alevy@redhat.com, vilanova@ac.upc.edu, afaerber@suse.de 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 files 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