-INTROSPECTION_FILES = $(libatspi_la_SOURCES)
-
-Atspi-2.0.gir: $(INTROSPECTION_SCANNER) \
- libatspi.la \
- $(INTROSPECTION_FILES)
- $(AM_V_GEN)$(INTROSPECTION_SCANNER) -v \
- --namespace Atspi \
- --nsversion=2.0 \
- -I$(top_builddir) \
- -I$(top_srcdir) \
- --include=GLib-2.0 \
- --include=GObject-2.0 \
- --libtool="$(top_builddir)/libtool" \
- --library=libatspi.la \
- --library=$(top_builddir)/dbind/libdbind.la \
- --pkg dbus-glib-1 \
- --warn-all \
- --output $@ \
- $(INTROSPECTION_FILES)
+Atspi-2.0.gir: libatspi.la
+Atspi_2_0_gir_INCLUDES = GLib-2.0 GObject-2.0
+Atspi_2_0_gir_PACKAGES = dbus-1
+Atspi_2_0_gir_EXPORT_PACKAGES = atspi-2
+Atspi_2_0_gir_CFLAGS = -I$(top_builddir) -I$(top_srcdir)
+Atspi_2_0_gir_LIBS = libatspi.la $(top_builddir)/dbind/libdbind.la
+Atspi_2_0_gir_FILES = $(libatspi_la_SOURCES)
+Atspi_2_0_gir_SCANNERFLAGS = --namespace Atspi --nsversion=2.0
+INTROSPECTION_SCANNER_ARGS += --c-include='atspi/atspi.h'
+INTROSPECTION_GIRS += Atspi-2.0.gir