Update gobject-introspection automake integration

diff --git a/configure.ac b/configure.ac
index 1009936..20e6bd9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -62,7 +62,7 @@ if test "x$enable_debug" = "xyes"; then
         CFLAGS="$CFLAGS -g -Wall -Werror"
 fi
 
-GOBJECT_INTROSPECTION_CHECK([0.6.4])
+GOBJECT_INTROSPECTION_CHECK([0.6.7])
 dnl Check for Win32
 AC_MSG_CHECKING([for Win32])
 case "$host" in

diff --git a/libgssdp/Makefile.am b/libgssdp/Makefile.am
index 0053f38..221e9c1 100644 (file)
--- a/libgssdp/Makefile.am
+++ b/libgssdp/Makefile.am
@@ -32,14 +32,16 @@ gssdp-marshal.h: gssdp-marshal.list
 
 BUILT_SOURCES = gssdp-marshal.c gssdp-marshal.h
 
-libgssdp_1_0_la_LDFLAGS = -version-info $(LTVERSION)
+introspection_sources = $(libgssdpinc_HEADERS) \
+                       gssdp-client.c          \
+                       gssdp-error.c           \
+                       gssdp-resource-browser.c\
+                       gssdp-resource-group.c
 
-libgssdp_1_0_la_SOURCES = gssdp-client.c               \
+libgssdp_1_0_la_LDFLAGS = -version-info $(LTVERSION)
+libgssdp_1_0_la_SOURCES = $(introspection_sources)     \
                          gssdp-client-private.h        \
-                         gssdp-error.c                 \
                          gssdp-protocol.h              \
-                         gssdp-resource-browser.c      \
-                         gssdp-resource-group.c        \
                          gssdp-socket-source.c         \
                          gssdp-socket-source.h         \
                          gssdp-socket-functions.c      \
@@ -56,27 +58,26 @@ endif
 
 EXTRA_DIST = gssdp-marshal.list
 
+CLEANFILES = $(BUILT_SOURCES)
 
-if HAVE_INTROSPECTION
+-include $(INTROSPECTION_MAKEFILE)
+INTROSPECTION_GIRS =
+INTROSPECTION_SCANNER_ARGS = --warn-all                                \
+                            --symbol-prefix=gssdp              \
+                            --identifier-prefix=GSSDP          \
+                            --add-include-path=$(top_srcdir)
+INTROSPECTION_COMPILER_ARGS = --includedir=$(top_srcdir)
 
-GSSDP-1.0.gir: libgssdp-1.0.la $(INTROSPECTION_SCANNER)
-       $(AM_V_GEN) \
-       $(INTROSPECTION_SCANNER) -v \
-               --namespace=GSSDP --nsversion=1.0 \
-                --include=GObject-2.0 \
-                --include=Gio-2.0 \
-               --library=$< \
-               --libtool="$(top_builddir)/libtool" \
-               --pkg gobject-2.0 \
-               --pkg gio-2.0 \
-               --output $@ \
-               -I$(top_srcdir) \
-               $(addprefix $(top_srcdir)/libgssdp/, $(libgssdpinc_HEADERS)) \
-               $(top_srcdir)/libgssdp/gssdp-client.c \
-               $(top_srcdir)/libgssdp/gssdp-error.c \
-               $(top_srcdir)/libgssdp/gssdp-protocol.h \
-               $(top_srcdir)/libgssdp/gssdp-resource-browser.c \
-               $(top_srcdir)/libgssdp/gssdp-resource-group.c
+
+if HAVE_INTROSPECTION
+GSSDP-1.0.gir: libgssdp-1.0.la
+GSSDP_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0
+GSSDP_1_0_gir_CFLAGS = $(INCLUDES)
+GSSDP_1_0_gir_LIBS = libgssdp-1.0.la
+GSSDP_1_0_gir_FILES = $(introspection_sources)
+GSSDP_1_0_gir_NAMESPACE = GSSDP
+GSSDP_1_0_gir_VERSION = 1.0
+INTROSPECTION_GIRS += GSSDP-1.0.gir
 
 girdir = $(datadir)/gir-1.0
 gir_DATA = GSSDP-1.0.gir
@@ -84,15 +85,8 @@ gir_DATA = GSSDP-1.0.gir
 typelibdir = $(libdir)/girepository-1.0/
 typelib_DATA = $(gir_DATA:.gir=.typelib)
 
-%.typelib: %.gir $(INTROSPECTION_COMPILER)
-       $(AM_V_GEN) \
-       $(INTROSPECTION_COMPILER) \
-               --includedir=$(srcdir) \
-               --includedir=. \
-               $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
-
+CLEANFILES += $(gir_DATA) $(typelib_DATA)
 endif
 
-CLEANFILES = $(BUILT_SOURCES) $(gir_DATA) $(typelib_DATA)
 DISTCLEANFILES = $(BUILT_SOURCES)
 MAINTAINERCLEANFILES = Makefile.in $(BUILT_SOURCES)

diff --git a/m4/introspection.m4 b/m4/introspection.m4
index bb3a0da..bfc52be 100644 (file)
--- a/m4/introspection.m4
+++ b/m4/introspection.m4
@@ -59,12 +59,18 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
        INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
        INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
        INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
+       INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
+       INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
+       INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
     fi
     AC_SUBST(INTROSPECTION_SCANNER)
     AC_SUBST(INTROSPECTION_COMPILER)
     AC_SUBST(INTROSPECTION_GENERATE)
     AC_SUBST(INTROSPECTION_GIRDIR)
     AC_SUBST(INTROSPECTION_TYPELIBDIR)
+    AC_SUBST(INTROSPECTION_CFLAGS)
+    AC_SUBST(INTROSPECTION_LIBS)
+    AC_SUBST(INTROSPECTION_MAKEFILE)
 
     AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
 ])