[gxml] Fix Bug 685666 - shared-library not specified in .gir file. This allows JS, Python, etc. to use GXm
- From: Richard Hans Schwarting <rschwart src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gxml] Fix Bug 685666 - shared-library not specified in .gir file. This allows JS, Python, etc. to use GXm
- Date: Thu, 11 Oct 2012 04:47:19 +0000 (UTC)
commit 3c5b4f8ab55442c380ec5d632bbcae378ec98d1e
Author: Richard Schwarting <aquarichy gmail com>
Date: Sun Oct 7 18:30:16 2012 -0400
Fix Bug 685666 - shared-library not specified in .gir file. This allows JS, Python, etc. to use GXml via introspection again.
gxml/Makefile.am | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/gxml/Makefile.am b/gxml/Makefile.am
index 6e1a816..206e059 100644
--- a/gxml/Makefile.am
+++ b/gxml/Makefile.am
@@ -129,6 +129,7 @@ GITIGNOREFILES = \
### GObject Introspection
+
if ENABLE_GI_SYSTEM_INSTALL
girdir = $(INTROSPECTION_GIRDIR)
typelibdir = $(INTROSPECTION_TYPELIBDIR)
@@ -137,10 +138,16 @@ girdir = $(datadir)/gir-1.0
typelibdir = $(libdir)/girepository-1.0
endif
+# dlname:
+# Extract our dlname like libfolks does, see bgo#658002 and bgo#585116
+# This is what g-ir-scanner does.
+libgxml_dlname = \
+ `$(SED) -n "s/^dlname='\([A-Za-z0-9.+-]\+\)'/\1/p" libgxml.la`
+
-include $(INTROSPECTION_MAKEFILE)
INTROSPECTION_GIRS =
INTROSPECTION_SCANNER_ARGS =
-INTROSPECTION_COMPILER_ARGS = --includedir=.
+INTROSPECTION_COMPILER_ARGS = --includedir=. -l $(libgxml_dlname)
GXml-$(API_VERSION).gir: libgxml.la
GIRS = GXml-$(API_VERSION).gir
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]