[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [libvirt-glib 3/5] Fix GIR generation



Overriding PKG_CONFIG_PATH when generating LibvirtGObject-1.0.gir
is wrong since this means that if glib/gio/... are installed in
a prefix that is not one of the default pkg-config paths, then
they won't be found. PKG_CONFIG_PATH is overridden so that
g-ir-scanner can find LibvirtGLib-1.0 and LibvirtGConfig-1.0 in
the build tree. Since g-ir-scanner provides --include-uninstalled
for that purpose, use that instead.
---
 libvirt-gobject/Makefile.am |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libvirt-gobject/Makefile.am b/libvirt-gobject/Makefile.am
index 59d9b2d..54907e7 100644
--- a/libvirt-gobject/Makefile.am
+++ b/libvirt-gobject/Makefile.am
@@ -118,15 +118,15 @@ CLEANFILES = $(BUILT_SOURCES)
 if WITH_GOBJECT_INTROSPECTION
 
 LibvirtGObject-1.0.gir: libvirt-gobject-1.0.la $(G_IR_SCANNER) Makefile.am
-	$(AM_V_GEN)PKG_CONFIG_PATH=$(top_builddir) $(G_IR_SCANNER) \
+	$(AM_V_GEN)$(G_IR_SCANNER) \
                 --quiet \
                 --warn-all \
                 --namespace LibvirtGObject \
                 --nsversion 1.0 \
                 --include GObject-2.0 \
                 --include Gio-2.0 \
-                --include LibvirtGLib-1.0 \
-                --include LibvirtGConfig-1.0 \
+                --include-uninstalled $(top_builddir)/libvirt-glib/LibvirtGLib-1.0.gir \
+                --include-uninstalled $(top_builddir)/libvirt-gconfig/LibvirtGConfig-1.0.gir \
                 --identifier-prefix=GVir \
                 --symbol-prefix=gvir \
                 --library=$(builddir)/libvirt-gobject-1.0.la \
-- 
1.7.7.3


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]