[json-glib/json-glib-0-8] introspection: Fix the GIR generation

[Emmanuele Bassi <ebassi src gnome org>]

commit 3598c1b14dedfd5ce9d2ad9293c722036eb53bab
Author: Emmanuele Bassi <ebassi linux intel com>
Date:   Wed Oct 28 16:54:34 2009 +0000

    introspection: Fix the GIR generation
    
    The rule for creating the JSON-GLib GIR file should use the
    json-glib.la shared object, to avoid using the installed
    copy of JSON-GLib when compiling the typelib.
    
    The include file for JSON-GLib is json-glib/json-gobject.h as
    well: json-glib/json-object.h does not exist.
    
    (cherry picked from commit 578111be53065a2bbeda73865bfa4e178f185649)

 json-glib/Makefile.am |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/json-glib/Makefile.am b/json-glib/Makefile.am
index 5f29b94..46e1349 100644
--- a/json-glib/Makefile.am
+++ b/json-glib/Makefile.am
@@ -136,9 +136,9 @@ Json-1.0.gir: $(INTROSPECTION_SCANNER) libjson-glib-1.0.la
 	$(QUIET_GEN)$(INTROSPECTION_SCANNER) \
 		-v --namespace Json --nsversion=1.0 \
 		$(INCLUDES) \
-		--c-include='json-glib/json-object.h' \
+		--c-include='json-glib/json-gobject.h' \
 		--include=GObject-2.0 \
-		--library=json-glib-1.0 \
+		--library=libjson-glib-1.0.la \
 		--libtool="$(top_builddir)/libtool" \
 		--pkg gobject-2.0 \
 		--output $@ \
@@ -156,7 +156,12 @@ typelibsdir = $(libdir)/girepository-1.0/
 typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 %.typelib: %.gir $(INTROSPECTION_COMPILER)
-	$(QUIET_GEN)$(DEBUG) $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
+	$(QUIET_GEN)\
+	$(DEBUG) $(INTROSPECTION_COMPILER) \
+		--includedir=$(srcdir) \
+		--includedir=. \
+		$(INTROSPECTION_COMPILER_OPTS) $< \
+		-o $(@F)
 
 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
 endif # HAVE_INTROSPECTION