From patchwork Mon Jun 27 10:34:44 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alon Levy X-Patchwork-Id: 102143 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C7DEAB6F5C for ; Mon, 27 Jun 2011 21:11:31 +1000 (EST) Received: from localhost ([::1]:44271 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qb9ix-00057T-54 for incoming@patchwork.ozlabs.org; Mon, 27 Jun 2011 07:11:27 -0400 Received: from eggs.gnu.org ([140.186.70.92]:58913) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qb99Z-0004Z1-8j for qemu-devel@nongnu.org; Mon, 27 Jun 2011 06:34:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qb99X-00060V-6s for qemu-devel@nongnu.org; Mon, 27 Jun 2011 06:34:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:15734) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qb99W-00060O-Fl for qemu-devel@nongnu.org; Mon, 27 Jun 2011 06:34:50 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p5RAYnxx017576 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 27 Jun 2011 06:34:49 -0400 Received: from bow.redhat.com (vpn-9-50.rdu.redhat.com [10.11.9.50]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p5RAYlD8002775 for ; Mon, 27 Jun 2011 06:34:48 -0400 From: Alon Levy To: qemu-devel@nongnu.org Date: Mon, 27 Jun 2011 12:34:44 +0200 Message-Id: <1309170884-29740-2-git-send-email-alevy@redhat.com> In-Reply-To: <1309170884-29740-1-git-send-email-alevy@redhat.com> References: <1309170884-29740-1-git-send-email-alevy@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/2] libcacard: add pc file, install it + includes 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 Also add --pkgconfigdir and --includedir configure parameters. --- configure | 10 ++++++++++ libcacard/Makefile | 25 ++++++++++++++++++++++--- libcacard/libcacard.pc.in | 13 +++++++++++++ 3 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 libcacard/libcacard.pc.in diff --git a/configure b/configure index e523976..d08818f 100755 --- a/configure +++ b/configure @@ -146,6 +146,8 @@ datadir="\${prefix}/share/qemu" docdir="\${prefix}/share/doc/qemu" bindir="\${prefix}/bin" libdir="\${prefix}/lib" +pkgconfigdir="\${prefix}/lib/pkgconfig" +includedir="\${prefix}/include" sysconfdir="\${prefix}/etc" confsuffix="/qemu" slirp="yes" @@ -539,6 +541,10 @@ for opt do ;; --libdir=*) libdir="$optarg" ;; + --pkgconfigdir=*) pkgconfigdir="$optarg" + ;; + --includedir=*) includedir="$optarg" + ;; --datadir=*) datadir="$optarg" ;; --docdir=*) docdir="$optarg" @@ -2542,6 +2548,8 @@ echo "Install prefix $prefix" echo "BIOS directory `eval echo $datadir`" echo "binary directory `eval echo $bindir`" echo "library directory `eval echo $libdir`" +echo "pkgconfig directory `eval echo $pkgconfigdir`" +echo "include directory `eval echo $includedir`" echo "config directory `eval echo $sysconfdir`" if test "$mingw32" = "no" ; then echo "Manual directory `eval echo $mandir`" @@ -2635,6 +2643,8 @@ echo all: >> $config_host_mak echo "prefix=$prefix" >> $config_host_mak echo "bindir=$bindir" >> $config_host_mak echo "libdir=$libdir" >> $config_host_mak +echo "pkgconfigdir=$pkgconfigdir" >> $config_host_mak +echo "includedir=$includedir" >> $config_host_mak echo "mandir=$mandir" >> $config_host_mak echo "datadir=$datadir" >> $config_host_mak echo "sysconfdir=$sysconfdir" >> $config_host_mak diff --git a/libcacard/Makefile b/libcacard/Makefile index 9802c37..3a9e639 100644 --- a/libcacard/Makefile +++ b/libcacard/Makefile @@ -2,7 +2,10 @@ -include $(SRC_PATH)/Makefile.objs -include $(SRC_PATH)/rules.mak -$(call set-vpath, $(SRC_PATH):$(SRC_PATH)/libcacard) +libcacard_srcpath=$(SRC_PATH)/libcacard +libcacard_includedir=$(DESTDIR)$(includedir)/cacard + +$(call set-vpath, $(SRC_PATH):$(libcacard_srcpath)) # objects linked against normal qemu binaries, not compiled with libtool QEMU_OBJS=$(addprefix ../,$(oslib-obj-y) qemu-malloc.o qemu-timer-common.o $(trace-obj-y)) @@ -36,7 +39,23 @@ else libcacard.la: $(libcacard.lib-y) $(QEMU_OBJS_LIB) $(call quiet-command,libtool --mode=link --quiet --tag=CC $(CC) $(libcacard_libs) -lrt -rpath $(libdir) -o $@ $^," lt LINK $@") -install-libcacard: libcacard.la +libcacard.pc: $(libcacard_srcpath)/libcacard.pc.in + sed -e 's|@LIBDIR@|$(libdir)|' \ + -e 's|@INCLUDEDIR@|$(libcacard_includedir)|' \ + -e 's|@VERSION@|$(shell cat $(SRC_PATH)/VERSION)|' \ + -e 's|@PREFIX@|$(prefix)|' \ + < $(libcacard_srcpath)/libcacard.pc.in > libcacard.pc + +.PHONY: install-libcacard + +install-libcacard: libcacard.pc libcacard.la $(INSTALL_DIR) "$(DESTDIR)$(libdir)" - libtool --mode=install $(INSTALL_PROG) libcacard.la "$(DESTDIR)$(libdir)" + $(INSTALL_DIR) "$(DESTDIR)$(pkgconfigdir)" + $(INSTALL_DIR) "$(libcacard_includedir)" + libtool --mode=install $(INSTALL_PROG) libcacard.la "$(DESTDIR)$(libdir)"; + libtool --mode=install $(INSTALL_PROG) libcacard.pc "$(DESTDIR)$(pkgconfigdir)" + for inc in *.h; do \ + libtool --mode=install $(INSTALL_PROG) $(libcacard_srcpath)/$$inc "$(libcacard_includedir)"; \ + done + endif diff --git a/libcacard/libcacard.pc.in b/libcacard/libcacard.pc.in new file mode 100644 index 0000000..b6859b0 --- /dev/null +++ b/libcacard/libcacard.pc.in @@ -0,0 +1,13 @@ +prefix=@PREFIX@ +exec_prefix=${prefix} +libdir=@LIBDIR@ +includedir=@INCLUDEDIR@ + +Name: cacard +Description: CA Card library +Version: @VERSION@ + +Requires: nss +Libs: -L${libdir} -lcacard +Libs.private: +Cflags: -I${includedir}