summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Lespiau <damien.lespiau@intel.com>2010-03-22 12:53:18 -0400
committerMatthias Clasen <mclasen@redhat.com>2010-03-22 12:53:18 -0400
commit0a0e0a868acaeb09b5a16c66bc427df9fd8ea3a5 (patch)
tree8aef92e9a893cd1470b7b1eef594de4345d483d4
parent086b952267eb5abc577b67bf9597f3ddbfb3f04c (diff)
downloadgtk+-0a0e0a868acaeb09b5a16c66bc427df9fd8ea3a5.tar.gz
introspection: Fix parallel builds
One needs to add an explicit dependency between the gir files and the .la libtool wrapper as this dependency is not added automatically by Makefile.introspection. Not adding these breaks parallel builds as make does not wait for the .la to be generated before launching g-ir-scanner.
-rw-r--r--gdk-pixbuf/Makefile.am1
-rw-r--r--gdk/Makefile.am1
2 files changed, 2 insertions, 0 deletions
diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index 58685dcb9e..cf1769bae9 100644
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -691,6 +691,7 @@ EXTRA_DIST += \
if HAVE_INTROSPECTION
+GdkPixbuf-2.0.gir: libgdk_pixbuf-2.0.la Makefile
GdkPixbuf_2_0_gir_SCANNERFLAGS = --strip-prefix=Gdk
GdkPixbuf_2_0_gir_INCLUDES = GModule-2.0 Gio-2.0
GdkPixbuf_2_0_gir_LIBS = libgdk_pixbuf-2.0.la
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 29ffa6452c..2cee8f43b1 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -201,6 +201,7 @@ introspection_files = \
gdkenumtypes.h \
$(srcdir)/x11/*.c
+Gdk-2.0.gir: $(gdktargetlib) Makefile
Gdk_2_0_gir_SCANNERFLAGS = --strip-prefix=Gdk --add-include-path=../gdk-pixbuf
Gdk_2_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0
Gdk_2_0_gir_LIBS = $(gdktargetlib)