[libvirt] [libvirt-glib 4/5] Cleanup GIR generation rules

[Christophe Fergeau]

Remove some redundant arguments (--pkg seems unneeded when
--include is used), most include paths are unneeded, ...
---
 libvirt-gconfig/Makefile.am |    8 +++-----
 libvirt-glib/Makefile.am    |    4 +---
 libvirt-gobject/Makefile.am |    5 +----
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/libvirt-gconfig/Makefile.am b/libvirt-gconfig/Makefile.am
index 22259c3..b8f3605 100644
--- a/libvirt-gconfig/Makefile.am
+++ b/libvirt-gconfig/Makefile.am
@@ -116,17 +116,15 @@ LibvirtGConfig-1.0.gir: libvirt-gconfig-1.0.la $(G_IR_SCANNER) Makefile.am
                 --library=$(builddir)/libvirt-gconfig-1.0.la \
                 --output $@ \
                 -I$(top_srcdir) \
-                -I$(top_builddir) \
                 $(LIBXML2_CFLAGS) \
                 --verbose \
-                --pkg=gobject-2.0 \
                 --c-include="libvirt-gconfig/libvirt-gconfig.h" \
                 --pkg-export=libvirt-gconfig-1.0 \
-		$(srcdir)/libvirt-gconfig.h \
+                $(srcdir)/libvirt-gconfig.h \
                 $(GCONFIG_SOURCE_FILES:%=$(srcdir)/%) \
                 $(GCONFIG_HEADER_FILES:%=$(srcdir)/%) \
-		$(builddir)/libvirt-gconfig-enum-types.c \
-		$(builddir)/libvirt-gconfig-enum-types.h
+                $(builddir)/libvirt-gconfig-enum-types.c \
+                $(builddir)/libvirt-gconfig-enum-types.h
 
 
 girdir = $(datadir)/gir-1.0
diff --git a/libvirt-glib/Makefile.am b/libvirt-glib/Makefile.am
index 0638a64..ae4070f 100644
--- a/libvirt-glib/Makefile.am
+++ b/libvirt-glib/Makefile.am
@@ -47,11 +47,9 @@ LibvirtGLib-1.0.gir: libvirt-glib-1.0.la $(G_IR_SCANNER) Makefile.am
                 --identifier-prefix=GVir \
                 --symbol-prefix=gvir \
                 --library=$(builddir)/libvirt-glib-1.0.la \
-                --add-include-path=$(builddir) \
                 --output $@ \
                 -I$(top_srcdir) \
-                -I$(srcdir) \
-                --pkg=glib-2.0 \
+                --verbose \
                 --pkg=gthread-2.0 \
                 --c-include="libvirt-glib/libvirt-glib.h" \
                 --pkg-export=libvirt-glib-1.0 \
diff --git a/libvirt-gobject/Makefile.am b/libvirt-gobject/Makefile.am
index 54907e7..5aa1080 100644
--- a/libvirt-gobject/Makefile.am
+++ b/libvirt-gobject/Makefile.am
@@ -130,14 +130,11 @@ LibvirtGObject-1.0.gir: libvirt-gobject-1.0.la $(G_IR_SCANNER) Makefile.am
                 --identifier-prefix=GVir \
                 --symbol-prefix=gvir \
                 --library=$(builddir)/libvirt-gobject-1.0.la \
-                --add-include-path=$(top_builddir)/libvirt-glib \
-                --add-include-path=$(top_builddir)/libvirt-gconfig \
                 --output $@ \
-                -I$(top_srcdir) \
                 -I$(top_builddir) \
+                -I$(top_srcdir) \
                 $(LIBXML2_CFLAGS) \
                 --verbose \
-                --pkg=gobject-2.0 \
                 --pkg=gthread-2.0 \
                 --c-include="libvirt-gobject/libvirt-gobject.h" \
                 --pkg-export=libvirt-gobject-1.0 \
-- 
1.7.7.3