Make sure dist check works with introspection

We need to prepend the srcdir to all variables
passed into the scanner as it runs with srcdir != builddir during
distcheck.

diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index 5741c2c835a46ee1e022a82f3638c1e3b1a0d684..90346fe384223991037c06ce4c53660807f5ce3e 100644 (file)
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -698,8 +698,8 @@ GdkPixbuf-2.0.gir: $(INTROSPECTION_SCANNER) libgdk_pixbuf-2.0.la Makefile
                --library=libgdk_pixbuf-2.0.la \
                --libtool="$(LIBTOOL)" \
                --output $@ \
-               $(libgdk_pixbufinclude_HEADERS) \
-               $(libgdk_pixbuf_2_0_la_SOURCES)
+               $(addprefix $(srcdir)/,$(libgdk_pixbufinclude_HEADERS)) \
+               $(addprefix $(srcdir)/,$(libgdk_pixbuf_2_0_la_SOURCES))
 BUILT_GIRSOURCES += GdkPixbuf-2.0.gir
 
 girdir = $(datadir)/gir-1.0

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 326308609c6d31b4f9ed85d04611d91fcefc68c0..c579a8772caedb7e87a9a706443112b3e7676f4c 100644 (file)
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -187,6 +187,12 @@ libgdk_win32_2_0_la_LDFLAGS = -Wl,win32/rc/gdk-win32-res.o -export-symbols $(src
 if HAVE_INTROSPECTION
 BUILT_GIRSOURCES =
 
+introspection_files = \
+               $(gdk_public_h_sources) \
+               $(gdk_c_sources) \
+        gdkenumtypes.c \
+        gdkenumtypes.h
+
 Gdk-2.0.gir: $(INTROSPECTION_SCANNER) $(gdktargetlib) Makefile
        $(INTROSPECTION_SCANNER) -v \
                --namespace Gdk --nsversion=2.0 --strip-prefix=Gdk \
@@ -198,8 +204,7 @@ Gdk-2.0.gir: $(INTROSPECTION_SCANNER) $(gdktargetlib) Makefile
                --library=$(gdktargetlib) \
                --libtool="$(LIBTOOL)" \
                --output $@ \
-               $(gdk_public_h_sources) \
-               $(gdk_c_sources) gdkenumtypes.c gdkenumtypes.h
+               $(addprefix $(srcdir)/,$(introspection_files))
 BUILT_GIRSOURCES += Gdk-2.0.gir
 
 girdir = $(datadir)/gir-1.0

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index dfca39335e2a513015343e218cc67e6444c18b2d..ed1f5d7ed166b2ca43c1589da9c11d4878fb6fc4 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -966,6 +966,12 @@ LDADDS =                                                           \
 if HAVE_INTROSPECTION
 BUILT_GIRSOURCES =
 
+introspection_files = \
+    $(gtkinclude_HEADERS) \
+    $(gtk_all_c_sources) \
+    gtktypebuiltins.h \
+    gtktypebuiltins.c
+
 Gtk-2.0.gir: $(INTROSPECTION_SCANNER) $(gtktargetlib) Makefile
        $(INTROSPECTION_SCANNER) -v \
                --namespace Gtk --nsversion=2.0 --strip-prefix=Gtk \
@@ -980,8 +986,7 @@ Gtk-2.0.gir: $(INTROSPECTION_SCANNER) $(gtktargetlib) Makefile
                -UGDK_DISABLE_DEPRECATED \
                -UGTK_DISABLE_DEPRECATED \
                -DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API \
-               $(gtkinclude_HEADERS) \
-               $(gtk_all_c_sources) gtktypebuiltins.h gtktypebuiltins.c
+               $(addprefix $(srcdir)/, $(introspection_files))
 BUILT_GIRSOURCES += Gtk-2.0.gir
 
 girdir = $(datadir)/gir-1.0