From patchwork Wed Jan 23 11:18:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 214911 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 95C5C2C007B for ; Wed, 23 Jan 2013 23:04:52 +1100 (EST) Received: from localhost ([::1]:53007 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TxyP2-0000rD-VP for incoming@patchwork.ozlabs.org; Wed, 23 Jan 2013 06:22:00 -0500 Received: from eggs.gnu.org ([208.118.235.92]:45898) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TxyOF-0007vH-0P for qemu-devel@nongnu.org; Wed, 23 Jan 2013 06:21:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TxyOC-0007Y0-6M for qemu-devel@nongnu.org; Wed, 23 Jan 2013 06:21:10 -0500 Received: from e28smtp03.in.ibm.com ([122.248.162.3]:40185) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TxyOB-0007XX-GQ for qemu-devel@nongnu.org; Wed, 23 Jan 2013 06:21:08 -0500 Received: from /spool/local by e28smtp03.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 23 Jan 2013 16:49:29 +0530 Received: from d28dlp03.in.ibm.com (9.184.220.128) by e28smtp03.in.ibm.com (192.168.1.133) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 23 Jan 2013 16:49:28 +0530 Received: from d28relay03.in.ibm.com (d28relay03.in.ibm.com [9.184.220.60]) by d28dlp03.in.ibm.com (Postfix) with ESMTP id E42831258054 for ; Wed, 23 Jan 2013 16:51:26 +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 r0NBKxRr46334040 for ; Wed, 23 Jan 2013 16:50:59 +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 r0NBL1xB001622 for ; Wed, 23 Jan 2013 22:21:01 +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 r0NBIFeY021779; Wed, 23 Jan 2013 22:20:58 +1100 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Wed, 23 Jan 2013 19:18:02 +0800 Message-Id: <1358939887-22533-6-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-3864-0000-0000-00000689A3FD X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.3 Cc: kwolf@redhat.com, pbonzini@redhat.com, aliguori@us.ibm.com, Wenchao Xia , stefanha@gmail.com Subject: [Qemu-devel] [PATCH V14 05/10] 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 | 37 ++++++++++++++++++++++++++++++++----- libqblock/libqblock.pc.in | 13 +++++++++++++ 2 files changed, 45 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 cdbfffb..b1c9897 100644 --- a/libqblock/Makefile +++ b/libqblock/Makefile @@ -1,4 +1,6 @@ -TOOLS += libqblock.la +libqblock_includedir= $(includedir)/qblock + +TOOLS += libqblock.la libqblock.pc # objects linked into a shared library, built with libtool with -fPIC if required libqblock-obj-y = $(libqblock-y) $(util-obj-y) @@ -7,13 +9,22 @@ libqblock-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 SUBDIR_CLEAN_RULES+=libqblock-clean -all: libqblock.la +all: libqblock.la libqblock.pc ######################################################################### # Rules for building libqblock standalone library @@ -24,8 +35,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}