[libvirt] [libvirt-glib] gir: Use --pkg=libxml-2.0 instead of LIBXML2_CFLAGS

[Daniel P. Berrange]

On Tue, Nov 29, 2011 at 03:19:45PM +0100, Christophe Fergeau wrote:
> g-ir-scanner has a standard way of getting the flags for libraries
> providing .pc files, this commit uses this --pkg flag for libxml
> instead of using LIBXML2_CFLAGS we computed ourselves.
> ---
>  libvirt-gconfig/Makefile.am |    2 +-
>  libvirt-gobject/Makefile.am |    4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/libvirt-gconfig/Makefile.am b/libvirt-gconfig/Makefile.am
> index b14bd92..fe5b1a5 100644
> --- a/libvirt-gconfig/Makefile.am
> +++ b/libvirt-gconfig/Makefile.am
> @@ -119,9 +119,9 @@ LibvirtGConfig-1.0.gir: libvirt-gconfig-1.0.la $(G_IR_SCANNER) Makefile.am
>                  --output $@ \
>                  -I$(top_builddir) \
>                  -I$(top_srcdir) \
> -                $(LIBXML2_CFLAGS) \
>                  --verbose \
>                  --c-include="libvirt-gconfig/libvirt-gconfig.h" \
> +                --pkg=libxml-2.0 \
>                  --pkg-export=libvirt-gconfig-1.0 \
>                  $(srcdir)/libvirt-gconfig.h \
>                  $(GCONFIG_SOURCE_FILES:%=$(srcdir)/%) \
> diff --git a/libvirt-gobject/Makefile.am b/libvirt-gobject/Makefile.am
> index 5aa1080..ad746bb 100644
> --- a/libvirt-gobject/Makefile.am
> +++ b/libvirt-gobject/Makefile.am
> @@ -133,10 +133,10 @@ LibvirtGObject-1.0.gir: libvirt-gobject-1.0.la $(G_IR_SCANNER) Makefile.am
>                  --output $@ \
>                  -I$(top_builddir) \
>                  -I$(top_srcdir) \
> -                $(LIBXML2_CFLAGS) \
>                  --verbose \
> -                --pkg=gthread-2.0 \
>                  --c-include="libvirt-gobject/libvirt-gobject.h" \
> +                --pkg=gthread-2.0 \
> +                --pkg=libxml-2.0 \
>                  --pkg-export=libvirt-gobject-1.0 \
>                  $(srcdir)/libvirt-gobject.h \
>                  $(GOBJECT_SOURCE_FILES:%=$(srcdir)/%) \

ACK

Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|