[gtk-vnc] Fix parallel build of introspection gir files

[Daniel P. Berrange <dberrange src gnome org>]

commit ff7b8c29d2efd8e0262d76457ed8302397c84148
Author: Daniel P. Berrange <berrange redhat com>
Date:   Thu Jan 23 12:11:08 2014 +0000

    Fix parallel build of introspection gir files
    
    Add deps between build targets for gir files and use the
    --include-uninstalled option to deal with dependancies.
    
    Signed-off-by: Daniel P. Berrange <berrange redhat com>

 src/Makefile.am |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 306044b..9c19167 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -387,36 +387,39 @@ GVnc_1_0_gir_SCANNERFLAGS = --c-include="gvnc.h"
 INTROSPECTION_GIRS += GVnc-1.0.gir
 
 if HAVE_PULSEAUDIO
-GVncPulse-1.0.gir: libgvncpulse-1.0.la
-GVncPulse_1_0_gir_INCLUDES = GObject-2.0 GVnc-1.0
+GVncPulse-1.0.gir: libgvncpulse-1.0.la GVnc-1.0.gir
+GVncPulse_1_0_gir_INCLUDES = GObject-2.0
 GVncPulse_1_0_gir_PACKAGES = gobject-2.0 libpulse-simple
 GVncPulse_1_0_gir_EXPORT_PACKAGES = gvnc-1.0
 GVncPulse_1_0_gir_LIBS = libgvnc-1.0.la libgvncpulse-1.0.la
 GVncPulse_1_0_gir_FILES = $(GVNCPULSE_INTROSPECTION_SRCS)
 GVncPulse_1_0_gir_CFLAGS = $(libgvnc_1_0_la_CFLAGS) $(libgvncpulse_1_0_la_CFLAGS) -I$(srcdir)
-GVncPulse_1_0_gir_SCANNERFLAGS = --c-include="gvncpulse.h"
+GVncPulse_1_0_gir_SCANNERFLAGS = --c-include="gvncpulse.h" \
+       --include-uninstalled=$(top_builddir)/src/GVnc-1.0.gir
 INTROSPECTION_GIRS += GVncPulse-1.0.gir
 endif
 
 if HAVE_GTK_2
-GtkVnc-1.0.gir: libgtk-vnc-$(GTK_VNC_API_VERSION).la
-GtkVnc_1_0_gir_INCLUDES = GObject-2.0 GVnc-1.0
+GtkVnc-1.0.gir: libgtk-vnc-$(GTK_VNC_API_VERSION).la GVnc-1.0.gir
+GtkVnc_1_0_gir_INCLUDES = GObject-2.0
 GtkVnc_1_0_gir_PACKAGES = gobject-2.0 gtk+-$(GTK_API_VERSION)
 GtkVnc_1_0_gir_EXPORT_PACKAGES = gtk-vnc-$(GTK_VNC_API_VERSION)
 GtkVnc_1_0_gir_LIBS = libgvnc-1.0.la libgtk-vnc-$(GTK_VNC_API_VERSION).la
 GtkVnc_1_0_gir_FILES = $(GTK_VNC_INTROSPECTION_SRCS)
 GtkVnc_1_0_gir_CFLAGS = $(libgvnc_1_0_la_CFLAGS) $(libgvncpulse_1_0_la_CFLAGS) -I$(srcdir)
-GtkVnc_1_0_gir_SCANNERFLAGS = --c-include="gtk-vnc.h"
+GtkVnc_1_0_gir_SCANNERFLAGS = --c-include="gtk-vnc.h" \
+       --include-uninstalled=$(top_builddir)/src/GVnc-1.0.gir
 INTROSPECTION_GIRS += GtkVnc-1.0.gir
 else
-GtkVnc-2.0.gir: libgtk-vnc-2.0.la
-GtkVnc_2_0_gir_INCLUDES = GObject-2.0 GVnc-1.0
+GtkVnc-2.0.gir: libgtk-vnc-2.0.la GVnc-1.0.gir
+GtkVnc_2_0_gir_INCLUDES = GObject-2.0
 GtkVnc_2_0_gir_PACKAGES = gobject-2.0 gtk+-$(GTK_API_VERSION)
 GtkVnc_2_0_gir_EXPORT_PACKAGES = gtk-vnc-$(GKT_VNC_API_VERSION)
 GtkVnc_2_0_gir_LIBS = libgvnc-1.0.la libgtk-vnc-$(GTK_VNC_API_VERSION).la
 GtkVnc_2_0_gir_FILES = $(GTK_VNC_INTROSPECTION_SRCS)
 GtkVnc_2_0_gir_CFLAGS = $(libgvnc_1_0_la_CFLAGS) $(libgvncpulse_1_0_la_CFLAGS) -I$(srcdir)
-GtkVnc_2_0_gir_SCANNERFLAGS = --c-include="gtk-vnc.h"
+GtkVnc_2_0_gir_SCANNERFLAGS = --c-include="gtk-vnc.h" \
+       --include-uninstalled=$(top_builddir)/src/GVnc-1.0.gir
 INTROSPECTION_GIRS += GtkVnc-2.0.gir
 endif