From 0bcb72d5aafcc19dc9c587957bd01e1667058b04 Mon Sep 17 00:00:00 2001
From: Gergely Polonkai <gergely@polonkai.eu>
Date: Thu, 10 Mar 2016 16:06:51 +0100
Subject: [PATCH] Fix for GObject Introspection generating

---
 src/Makefile.am | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 521b269..8426a0c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -198,11 +198,22 @@ matrix-marshalers.c: matrix-marshalers.h
 
 CLEANFILES += stamp-matrix-marshalers
 
-include $(INTROSPECTION_MAKEFILE)
-Matrix-0.0.gir: libmatrix-glib-$(MATRIX_GLIB_API_VERSION).la
+limtatrix_glib_dlname = \
+	`$(SED) -nE "s/^dlname='([A-Za-z0-9.+-]+)'/\1/p" libmatrix-glib-0.0.la`¬
+INTROSPECTION_GIRS = Matrix-$(MATRIX_GLIB_API_VERSION).gir
+INTROSPECTION_COMPILER_ARGS = --includedir=. $(libmatrix_glib_dlname)
+
+Matrix-0.0.gir: libmatrix-glib-$(MATRIX_GLIB_API_VERSION).la
+Matrix-0.0.typelib: $(INTROSPECTION_GIRS)
+	$(INTROSPECTION_COMPILER) $(INTROSPECTION_COMPILER_ARGS) $< -o $@
+
+girdir = $(INTROSPECTION_GIRDIR)
+gir_DATA = $(INTROSPECTION_GIRS)
+typelibdir = $(INTROSPECTION_TYPELIBDIR)
+typelib_DATA = Matrix-$(MATRIX_GLIB_API_VERSION).typelib
+
+CLEANFILES += $(gir_DATA) $(typelibs_DATA)
 
-typelibsdir = $(libdir)/girepository-1.0
-typelibs_DATA = Matrix-$(MATRIX_GLIB_API_VERSION).typelib
 
 headerdir = $(includedir)/matrix-glib-$(MATRIX_GLIB_API_VERSION)
 header_DATA = \
@@ -215,5 +226,3 @@ pkgconfig_in = matrix-glib-$(MATRIX_GLIB_API_VERSION).pc.in
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = $(pkgconfig_in:.in=)
 EXTRA_DIST += $(pkgconfig_in)
-
-CLEANFILES += $(typelibs_DATA)