From patchwork Fri Jan 25 02:43:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 215529 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 51D822C007A for ; Fri, 25 Jan 2013 13:45:59 +1100 (EST) Received: from localhost ([::1]:60809 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TyZIj-00041u-DN for incoming@patchwork.ozlabs.org; Thu, 24 Jan 2013 21:45:57 -0500 Received: from eggs.gnu.org ([208.118.235.92]:49131) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TyZIB-0003CO-Jx for qemu-devel@nongnu.org; Thu, 24 Jan 2013 21:45:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TyZI7-00007E-HS for qemu-devel@nongnu.org; Thu, 24 Jan 2013 21:45:23 -0500 Received: from e23smtp05.au.ibm.com ([202.81.31.147]:49167) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TyZI7-00006s-08 for qemu-devel@nongnu.org; Thu, 24 Jan 2013 21:45:19 -0500 Received: from /spool/local by e23smtp05.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 25 Jan 2013 12:41:50 +1000 Received: from d23dlp03.au.ibm.com (202.81.31.214) by e23smtp05.au.ibm.com (202.81.31.211) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 25 Jan 2013 12:41:48 +1000 Received: from d23relay05.au.ibm.com (d23relay05.au.ibm.com [9.190.235.152]) by d23dlp03.au.ibm.com (Postfix) with ESMTP id 7BF29357804D for ; Fri, 25 Jan 2013 13:45:13 +1100 (EST) Received: from d23av04.au.ibm.com (d23av04.au.ibm.com [9.190.235.139]) by d23relay05.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r0P2XFs12294132 for ; Fri, 25 Jan 2013 13:33:15 +1100 Received: from d23av04.au.ibm.com (loopback [127.0.0.1]) by d23av04.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r0P2jCik029507 for ; Fri, 25 Jan 2013 13:45:12 +1100 Received: from RH63Wenchao (wenchaox.cn.ibm.com [9.115.122.51]) by d23av04.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r0P2i5kh027648; Fri, 25 Jan 2013 13:45:10 +1100 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2013 10:43:57 +0800 Message-Id: <1359081842-17924-5-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1359081842-17924-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1359081842-17924-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13012502-1396-0000-0000-0000027640C4 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 202.81.31.147 Cc: kwolf@redhat.com, aliguori@us.ibm.com, stefanha@gmail.com, pbonzini@redhat.com, Wenchao Xia Subject: [Qemu-devel] [PATCH V15 4/9] libqblock: build: add packaging support 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 can be packaged and installed by "sudo make install-libqblock'. Signed-off-by: Wenchao Xia --- libqblock/Makefile | 35 ++++++++++++++++++++++++++++++----- libqblock/libqblock.pc.in | 13 +++++++++++++ 2 files changed, 43 insertions(+), 5 deletions(-) create mode 100644 libqblock/libqblock-error.h create mode 100644 libqblock/libqblock-types.h create mode 100644 libqblock/libqblock.h create mode 100644 libqblock/libqblock.pc.in diff --git a/libqblock/Makefile b/libqblock/Makefile index 73974e9..d3f11b0 100644 --- a/libqblock/Makefile +++ b/libqblock/Makefile @@ -1,4 +1,4 @@ -all: libqblock.la +libqblock_includedir= $(includedir)/qblock # objects linked into a shared library, built with libtool with -fPIC if required libqblock-obj-y = libqblock/libqblock.o libqblock/libqblock-error.o @@ -7,12 +7,21 @@ libqblock-obj-y += $(util-obj-y) $(block-obj-y) libqblock-lobj-y=$(patsubst %.o, %.lo, $(libqblock-obj-y)) +libqblock-pub-headers= $(SRC_PATH)/libqblock/libqblock.h \ + $(SRC_PATH)/libqblock/libqblock-types.h \ + $(SRC_PATH)/libqblock/libqblock-error.h + +libqblock-requires-y = rt gthread-2.0 glib-2.0 z +libqblock-requires-$(CONFIG_CURL) += curl +libqblock-requires-$(CONFIG_LIBCAP) += cap-ng +libqblock-requires-$(CONFIG_UUID) += uuid + # libtool will build the .o files, too $(libqblock-obj-y): | $(libqblock-lobj-y) -LIBQBLOCK_CLEAN_TARGETS=$(libqblock-lobj-y) libqblock.la libqblock/.libs +LIBQBLOCK_CLEAN_TARGETS=$(libqblock-lobj-y) libqblock.la libqblock.pc libqblock/.libs -all: libqblock.la +all: libqblock.la libqblock.pc ######################################################################### # Rules for building libqblock standalone library @@ -23,8 +32,24 @@ libqblock.la: LDFLAGS += -rpath $(libdir) -no-undefined \ libqblock.la: $(libqblock-lobj-y) $(call LINK,$^) - -.PHONY: libqblock-clean +libqblock.pc: $(SRC_PATH)/libqblock/libqblock.pc.in + $(call quiet-command,sed -e 's|@LIBDIR@|$(libdir)|' \ + -e 's|@INCLUDEDIR@|$(libqblock_includedir)|' \ + -e 's|@VERSION@|$(shell cat $(SRC_PATH)/VERSION)|' \ + -e 's|@PREFIX@|$(prefix)|' \ + -e 's|@REQUIRES@|$(libqblock-requires-y)|' \ + $< > libqblock.pc,\ + " GEN $@") + +.PHONY: libqblock-clean install-libqblock + +install-libqblock: libqblock.la libqblock.pc + $(INSTALL_DIR) "$(DESTDIR)$(libdir)" + $(INSTALL_DIR) "$(DESTDIR)$(libdir)/pkgconfig" + $(INSTALL_DIR) "$(DESTDIR)$(libqblock_includedir)" + $(INSTALL_LIB) libqblock.la "$(DESTDIR)$(libdir)" + $(INSTALL_DATA) libqblock.pc "$(DESTDIR)$(libdir)/pkgconfig" + $(INSTALL_DATA) $(libqblock-pub-headers) "$(DESTDIR)$(libqblock_includedir)" libqblock-clean: rm $(LIBQBLOCK_CLEAN_TARGETS) -rf diff --git a/libqblock/libqblock-error.h b/libqblock/libqblock-error.h new file mode 100644 index 0000000..e69de29 diff --git a/libqblock/libqblock-types.h b/libqblock/libqblock-types.h new file mode 100644 index 0000000..e69de29 diff --git a/libqblock/libqblock.h b/libqblock/libqblock.h new file mode 100644 index 0000000..e69de29 diff --git a/libqblock/libqblock.pc.in b/libqblock/libqblock.pc.in new file mode 100644 index 0000000..0901672 --- /dev/null +++ b/libqblock/libqblock.pc.in @@ -0,0 +1,13 @@ +prefix=@PREFIX@ +exec_prefix=${prefix} +libdir=@LIBDIR@ +includedir=@INCLUDEDIR@ + +Name: qblock +Description: Qemu block layer library +Version: @VERSION@ + +Requires: @REQUIRES@ +Libs: -L${libdir} -lqblock +Libs.private: +Cflags: -I${includedir}