From patchwork Wed Jan 23 11:18:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 214910 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 1A1D52C007E for ; Wed, 23 Jan 2013 22:56:49 +1100 (EST) Received: from localhost ([::1]:52986 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TxyOl-0000pU-Ov for incoming@patchwork.ozlabs.org; Wed, 23 Jan 2013 06:21:43 -0500 Received: from eggs.gnu.org ([208.118.235.92]:45878) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TxyO8-0007dz-MJ for qemu-devel@nongnu.org; Wed, 23 Jan 2013 06:21:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TxyO6-0007XB-NG for qemu-devel@nongnu.org; Wed, 23 Jan 2013 06:21:04 -0500 Received: from e28smtp09.in.ibm.com ([122.248.162.9]:42919) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TxyO6-0007Wq-4T for qemu-devel@nongnu.org; Wed, 23 Jan 2013 06:21:02 -0500 Received: from /spool/local by e28smtp09.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 23 Jan 2013 16:49:46 +0530 Received: from d28dlp02.in.ibm.com (9.184.220.127) by e28smtp09.in.ibm.com (192.168.1.139) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 23 Jan 2013 16:49:44 +0530 Received: from d28relay03.in.ibm.com (d28relay03.in.ibm.com [9.184.220.60]) by d28dlp02.in.ibm.com (Postfix) with ESMTP id 015513940055 for ; Wed, 23 Jan 2013 16:50:57 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay03.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r0NBKrQi21037286 for ; Wed, 23 Jan 2013 16:50:53 +0530 Received: from d28av02.in.ibm.com (loopback [127.0.0.1]) by d28av02.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r0NBKtkc001112 for ; Wed, 23 Jan 2013 22:20:56 +1100 Received: from RH63Wenchao (wenchaox.cn.ibm.com [9.115.122.253]) by d28av02.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r0NBIFeX021779; Wed, 23 Jan 2013 22:20:51 +1100 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Wed, 23 Jan 2013 19:18:01 +0800 Message-Id: <1358939887-22533-5-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1358939887-22533-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1358939887-22533-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13012311-2674-0000-0000-000007935724 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.9 Cc: kwolf@redhat.com, pbonzini@redhat.com, aliguori@us.ibm.com, Wenchao Xia , stefanha@gmail.com Subject: [Qemu-devel] [PATCH V14 04/10] libqblock: build: add rule for libqblock.la 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 Now libqblock.la can be built with neccessary object files, and can be automatically cleaned by make clean in root directory. make libqblock-clean also clean it. -fvisibility=hidden was used to hide symbols, and a special macro was introduced to export symbols that marked as public. Signed-off-by: Wenchao Xia --- Makefile.objs | 7 +++++++ libqblock/Makefile | 31 +++++++++++++++++++++++++++++-- 2 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 libqblock/libqblock-error.c create mode 100644 libqblock/libqblock.c diff --git a/libqblock/libqblock-error.c b/libqblock/libqblock-error.c new file mode 100644 index 0000000..e69de29 diff --git a/libqblock/libqblock.c b/libqblock/libqblock.c new file mode 100644 index 0000000..e69de29 diff --git a/Makefile.objs b/Makefile.objs index d465a72..ab2712d 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -89,6 +89,13 @@ libcacard-y += libcacard/card_7816.o common-obj-$(CONFIG_SMARTCARD_NSS) += $(libcacard-y) ###################################################################### +# libqblock + +libqblock-y += libqblock/libqblock.o libqblock/libqblock-error.o + +common-obj-$(CONFIG_LIBQBLOCK) += $(libqblock-y) + +###################################################################### # qapi common-obj-y += qmp-marshal.o qapi-visit.o qapi-types.o diff --git a/libqblock/Makefile b/libqblock/Makefile index 734d90e..cdbfffb 100644 --- a/libqblock/Makefile +++ b/libqblock/Makefile @@ -1,4 +1,31 @@ TOOLS += libqblock.la -libqblock.la: - @true +# objects linked into a shared library, built with libtool with -fPIC if required +libqblock-obj-y = $(libqblock-y) $(util-obj-y) +libqblock-obj-y += $(filter-out stubs/set-fd-handler.o, $(stub-obj-y)) +libqblock-obj-y += $(block-obj-y) + +libqblock-lobj-y=$(patsubst %.o, %.lo, $(libqblock-obj-y)) + +# libtool will build the .o files, too +$(libqblock-obj-y): | $(libqblock-lobj-y) + +LIBQBLOCK_CLEAN_TARGETS=$(libqblock-lobj-y) libqblock.la libqblock/.libs +SUBDIR_CLEAN_RULES+=libqblock-clean + +all: libqblock.la + +######################################################################### +# Rules for building libqblock standalone library + +$(libqblock-lobj-y): QEMU_CFLAGS+= -fvisibility=hidden -D LIBQB_BUILD +libqblock.la: LDFLAGS += -rpath $(libdir) -no-undefined \ + -export-syms $(SRC_PATH)/libqblock/libqblock.syms +libqblock.la: $(libqblock-lobj-y) + $(call LINK,$^) + + +.PHONY: libqblock-clean + +libqblock-clean: + rm $(LIBQBLOCK_CLEAN_TARGETS) -rf