From d5449fdcc5068c3357d32a8a8e1336d015ea8846 Mon Sep 17 00:00:00 2001
From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Date: Wed, 11 Apr 2012 23:22:51 +0200
Subject: [PATCH] udev: gudev - rework introspection generation

---
 Makefile.am  | 68 +++++++++++++++++++++++++++-------------------------
 configure.ac |  7 +-----
 2 files changed, 37 insertions(+), 38 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index f7864d8309..3a1e0422e7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1594,6 +1594,8 @@ libgudev_1_0_la_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
 	-I$(top_builddir)/src\
 	-I$(top_srcdir)/src\
+	-I$(top_builddir)/src/udev \
+	-I$(top_srcdir)/src/udev \
 	-I$(top_builddir)/src/udev/gudev \
 	-I$(top_srcdir)/src/udev/gudev \
 	-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \
@@ -1642,43 +1644,45 @@ src/udev/gudev/gudevenumtypes.c: src/udev/gudev/gudevenumtypes.c.template src/ud
 	    $@.tmp && mv $@.tmp $@
 
 if ENABLE_INTROSPECTION
-src/udev/gudev/GUdev-1.0.gir: libgudev-1.0.la $(G_IR_SCANNER)
-	$(AM_V_GEN)$(G_IR_SCANNER) -v \
-		--warn-all \
-		--namespace GUdev \
-		--nsversion=1.0 \
-		--include=GObject-2.0 \
-		--library=gudev-1.0 \
-		--library-path=$(top_builddir)/src/udev \
-		--library-path=$(top_builddir)/src/udev/gudev \
-		--output $@ \
-		--pkg=glib-2.0 \
-		--pkg=gobject-2.0 \
-		--pkg-export=gudev-1.0 \
-		--c-include=gudev/gudev.h \
-		-I$(top_srcdir)/src/udev \
-		-I$(top_builddir)/src/udev \
-		-D_GUDEV_COMPILATION \
-		-D_GUDEV_WORK_AROUND_DEV_T_BUG \
-		$(top_srcdir)/src/udev/gudev/gudev.h \
-		$(top_srcdir)/src/udev/gudev/gudevtypes.h \
-		$(top_srcdir)/src/udev/gudev/gudevenums.h \
-		$(or $(wildcard $(top_builddir)/src/udev/gudev/gudevenumtypes.h),$(top_srcdir)/src/udev/gudev/gudevenumtypes.h) \
-		$(top_srcdir)/src/udev/gudev/gudevclient.h \
-		$(top_srcdir)/src/udev/gudev/gudevdevice.h \
-		$(top_srcdir)/src/udev/gudev/gudevenumerator.h \
-		$(top_srcdir)/src/udev/gudev/gudevclient.c \
-		$(top_srcdir)/src/udev/gudev/gudevdevice.c \
-		$(top_srcdir)/src/udev/gudev/gudevenumerator.c
+-include $(INTROSPECTION_MAKEFILE)
 
-src/udev/gudev/GUdev-1.0.typelib: src/udev/gudev/GUdev-1.0.gir $(G_IR_COMPILER)
-	$(AM_V_GEN)g-ir-compiler $< -o $@
+src/udev/gudev/GUdev-1.0.gir: libgudev-1.0.la
 
-girdir = $(GIRDIR)
+src_udev_gudev_GUdev_1_0_gir_INCLUDES = GObject-2.0
+
+src_udev_gudev_GUdev_1_0_gir_CFLAGS = \
+	$(INCLUDES) \
+	-D_GUDEV_COMPILATION \
+	-D_GUDEV_WORK_AROUND_DEV_T_BUG \
+	-I$(top_srcdir)/src/udev \
+	-I$(top_builddir)/src/udev
+
+src_udev_gudev_GUdev_1_0_gir_LIBS = libgudev-1.0.la
+
+src_udev_gudev_GUdev_1_0_gir_SCANNERFLAGS = \
+	--pkg-export=gudev-1.0 \
+	--warn-all
+
+src_udev_gudev_GUdev_1_0_gir_FILES = \
+	$(top_srcdir)/src/udev/gudev/gudev.h \
+	$(top_srcdir)/src/udev/gudev/gudevtypes.h \
+	$(top_srcdir)/src/udev/gudev/gudevenums.h \
+	$(or $(wildcard $(top_builddir)/src/udev/gudev/gudevenumtypes.h),$(top_srcdir)/src/udev/gudev/gudevenumtypes.h) \
+	$(top_srcdir)/src/udev/gudev/gudevclient.h \
+	$(top_srcdir)/src/udev/gudev/gudevdevice.h \
+	$(top_srcdir)/src/udev/gudev/gudevenumerator.h \
+	$(top_srcdir)/src/udev/gudev/gudevclient.c \
+	$(top_srcdir)/src/udev/gudev/gudevdevice.c \
+	$(top_srcdir)/src/udev/gudev/gudevenumerator.c
+
+INTROSPECTION_GIRS = src/udev/gudev/GUdev-1.0.gir
+INTROSPECTION_SCANNER_ARGS = --c-include=gudev/gudev.h
+
+girdir = $(datadir)/gir-1.0
 gir_DATA = \
 	src/udev/gudev/GUdev-1.0.gir
 
-typelibsdir = $(GIRTYPELIBDIR)
+typelibsdir = $(libdir)/girepository-1.0
 typelibs_DATA = \
 	src/udev/gudev/GUdev-1.0.typelib
 
diff --git a/configure.ac b/configure.ac
index aa13fece97..a2e6763908 100644
--- a/configure.ac
+++ b/configure.ac
@@ -460,13 +460,8 @@ AC_ARG_ENABLE([introspection],
        AS_HELP_STRING([--disable-introspection], [disable GObject introspection @<:@default=enabled@:>@]),
        [], [enable_introspection=yes])
 AS_IF([test "x$enable_introspection" = "xyes"], [
-       PKG_CHECK_MODULES([INTROSPECTION], [gobject-introspection-1.0 >= 0.6.2])
        AC_DEFINE([ENABLE_INTROSPECTION], [1], [enable GObject introspection support])
-       AC_SUBST([G_IR_SCANNER], [$($PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0)])
-       AC_SUBST([G_IR_COMPILER], [$($PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0)])
-       AC_SUBST([G_IR_GENERATE], [$($PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0)])
-       AC_SUBST([GIRDIR], [$($PKG_CONFIG --define-variable=datadir=${datadir} --variable=girdir gobject-introspection-1.0)])
-       AC_SUBST([GIRTYPELIBDIR], [$($PKG_CONFIG --define-variable=libdir=${libdir} --variable=typelibdir gobject-introspection-1.0)])
+       GOBJECT_INTROSPECTION_REQUIRE([1.31.1])
 ])
 AM_CONDITIONAL([ENABLE_INTROSPECTION], [test "x$enable_introspection" = "xyes"])
 AM_CONDITIONAL([ENABLE_GUDEV], [test "x$enable_gudev" = "xyes"])