Use gobject-introspection Makefile

Signed-off-by: David Zeuthen <davidz@redhat.com>

diff --git a/udisks/Makefile.am b/udisks/Makefile.am
index c67f67f..b45c243 100644 (file)
--- a/udisks/Makefile.am
+++ b/udisks/Makefile.am
@@ -99,34 +99,37 @@ pkgconfig_DATA = udisks2.pc
 # ----------------------------------------------------------------------------------------------------
 
 if HAVE_INTROSPECTION
+
+INTROSPECTION_GIRS = UDisks-2.0.gir
+
 girdir = $(INTROSPECTION_GIRDIR)
 gir_DATA = UDisks-2.0.gir
 
 typelibsdir = $(INTROSPECTION_TYPELIBDIR)
 typelibs_DATA = UDisks-2.0.typelib
 
-UDisks-2.0.gir: libudisks2.la $(INTROSPECTION_SCANNER) Makefile.am
-       $(INTROSPECTION_SCANNER) -v                             \
-               --warn-all                                      \
-               --namespace UDisks                              \
-               --identifier-prefix UDisks                      \
-               --symbol-prefix udisks                          \
-               --nsversion=2.0                                 \
-               --include=Gio-2.0                               \
-               --library=udisks2                               \
-               --output $@                                     \
-               --pkg=glib-2.0                                  \
-               --pkg=gobject-2.0                               \
-               --pkg=gio-2.0                                   \
-               --libtool=$(top_builddir)/libtool               \
-               --c-include='udisks/udisks.h'                   \
-                -I$(top_srcdir)                                        \
-               -DUDISKS_COMPILATION                            \
-               $(libudisks2_la_SOURCES)                        \
-               $(NULL)
+UDisks_2_0_gir_INCLUDES = Gio-2.0
+
+UDisks_2_0_gir_SCANNERFLAGS =                  \
+       --c-include='udisks/udisks.h'           \
+       --warn-all                              \
+        --namespace UDisks                      \
+        --identifier-prefix UDisks              \
+        --symbol-prefix udisks                  \
+       --warn-all                              \
+       $(NULL)
+
+UDisks_2_0_gir_CFLAGS =                        \
+        $(libudisks2_la_CFLAGS)                        \
+        -DUDISKS_COMPILATION                           \
+        -I.. -I$(top_srcdir)/src               \
+       $(NULL)
+
+UDisks_2_0_gir_LIBS = libudisks2.la
+UDisks_2_0_gir_FILES = $(libudisks2_la_SOURCES)
+UDisks_2_0_gir_EXPORT_PACKAGES = udisks2
 
-UDisks-2.0.typelib: UDisks-2.0.gir $(INTROSPECTION_COMPILER)
-       $(INTROSPECTION_COMPILER) $< -o $@
+include $(INTROSPECTION_MAKEFILE)
 
 endif # HAVE_INTROSPECTION