From c95c90ee4a2e6e3e62b32909e2bd57972a73b4ab Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Mon, 13 Feb 2012 16:46:29 +0000 Subject: [PATCH] Install API XML desc to a standard location Language bindings may well want to use the libvirt-api.xml and libvirt-qemu-api.xml files to either auto-generate themselves, or sanity check the manually written bindings for completeness. Currently these XML files are not installed as standard, merely ending up as a %doc file in the RPM. This changes them to be installed into $prefix/share/libvirt/apis/ The *-refs.xml files are not installed, since those are only useful during generation of the online API doc files. The pkg-config file is enhanced so that you can query the install location of the API files. eg # pkg-config --variable=libvirt_qemu_api libvirt /home/berrange/builder/i686-pc-mingw32/sys-root/mingw/share/libvirt/libvirt-qemu-api.xml * docs/Makefile.am: Install libvirt-api.xml & libvirt-qemu-api.xml * libvirt.pc.in: Add vars for querying API install location * libvirt.spec.in, mingw32-libvirt.spec.in: Include API XML files --- docs/Makefile.am | 3 +++ libvirt.pc.in | 3 +++ libvirt.spec.in | 4 ++++ mingw32-libvirt.spec.in | 4 ++++ 4 files changed, 14 insertions(+) diff --git a/docs/Makefile.am b/docs/Makefile.am index 5644fe2804..2bef982485 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -85,6 +85,9 @@ qemu_xml = \ libvirt-qemu-api.xml \ libvirt-qemu-refs.xml +apidir = $(pkgdatadir)/api +api_DATA = libvirt-api.xml libvirt-qemu-api.xml + fig = \ libvirt-net-logical.fig \ libvirt-net-physical.fig \ diff --git a/libvirt.pc.in b/libvirt.pc.in index d7a5e55bce..c64a7ca1e3 100644 --- a/libvirt.pc.in +++ b/libvirt.pc.in @@ -3,6 +3,9 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ +libvirt_api=@datadir@/libvirt/libvirt-api.xml +libvirt_qemu_api=@datadir@/libvirt/libvirt-qemu-api.xml + Name: libvirt Version: @VERSION@ Description: libvirt library diff --git a/libvirt.spec.in b/libvirt.spec.in index 65dafe7f9a..e48d8b8cf6 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1249,6 +1249,10 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.d/libvirtd %doc %{_datadir}/gtk-doc/html/libvirt/*.png %doc %{_datadir}/gtk-doc/html/libvirt/*.css +%dir %{_datadir}/libvirt/apis/ +%{_datadir}/libvirt/apis/libvirt-api.xml +%{_datadir}/libvirt/apis/libvirt-qemu-api.xml + %doc docs/*.html docs/html docs/*.gif %doc docs/libvirt-api.xml %doc examples/hellolibvirt diff --git a/mingw32-libvirt.spec.in b/mingw32-libvirt.spec.in index 7937e22d09..659d649bae 100644 --- a/mingw32-libvirt.spec.in +++ b/mingw32-libvirt.spec.in @@ -156,6 +156,10 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_libdir}/libvirt-qemu.dll.a %{_mingw32_libdir}/libvirt-qemu.la +%dir %{_mingw32_datadir}/libvirt/apis/ +%{_mingw32_datadir}/libvirt/apis/libvirt-api.xml +%{_mingw32_datadir}/libvirt/apis/libvirt-qemu-api.xml + %dir %{_mingw32_datadir}/libvirt/ %dir %{_mingw32_datadir}/libvirt/schemas/ %{_mingw32_datadir}/libvirt/schemas/basictypes.rng -- GitLab