[gitg/vala] Fix various autotools dependencies for building without installing

[Jesse van den Kieboom <jessevdk src gnome org>]

commit 09fdc390b008869a78927e85850fa71990a75681
Author: Jesse van den Kieboom <jesse vandenkieboom epfl ch>
Date:   Fri May 4 17:10:10 2012 +0200

    Fix various autotools dependencies for building without installing

 configure.ac            |   23 +++++++++++++----------
 gitg/Makefile.am        |    4 +++-
 libgitg-ext/Makefile.am |    6 ++++--
 libgitg-gtk/Makefile.am |    6 ++++--
 libgitg/Makefile.am     |    1 +
 5 files changed, 25 insertions(+), 15 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 6ad537a..ae875df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -207,16 +207,19 @@ AC_SUBST(GITG_PLUGIN_LIBS)
 GITG_PLUGIN_LIBTOOL_FLAGS="-module -avoid-version"
 AC_SUBST(GITG_PLUGIN_LIBTOOL_FLAGS)
 
-GITG_PLUGIN_VALAFLAGS="			\
-	--pkg GitgExt-1.0		\
-	--pkg Ggit-1.0 			\
-	--pkg Gitg-1.0			\
-	--pkg GitgGtk-1.0		\
-	--pkg gio-2.0			\
-	--pkg gtk+-3.0			\
-	--pkg libpeas-1.0		\
-	--pkg gee-1.0			\
-	--vapidir \$(top_srcdir)/vapi	\
+GITG_PLUGIN_VALAFLAGS="				\
+	--pkg GitgExt-1.0			\
+	--pkg Ggit-1.0 				\
+	--pkg Gitg-1.0				\
+	--pkg GitgGtk-1.0			\
+	--pkg gio-2.0				\
+	--pkg gtk+-3.0				\
+	--pkg libpeas-1.0			\
+	--pkg gee-1.0				\
+	--vapidir \$(top_srcdir)/vapi		\
+	--girdir \$(top_builddir)/libgitg	\
+	--girdir \$(top_builddir)/libgitg-gtk	\
+	--girdir \$(top_builddir)/libgitg-ext	\
 	--pkg config"
 
 AC_SUBST(GITG_PLUGIN_VALAFLAGS)
diff --git a/gitg/Makefile.am b/gitg/Makefile.am
index 1b06d97..8598c7a 100644
--- a/gitg/Makefile.am
+++ b/gitg/Makefile.am
@@ -18,7 +18,9 @@ VALAFLAGS = \
 	--pkg gtk+-3.0						\
 	--pkg gio-2.0						\
 	--pkg libpeas-1.0					\
-	--pkg gobject-introspection-1.0
+	--pkg gobject-introspection-1.0				\
+	--girdir "$(top_builddir)/libgitg"			\
+	--girdir "$(top_builddir)/libgitg-ext"
 
 VALASOURCES =							\
 	gitg.vala						\
diff --git a/libgitg-ext/Makefile.am b/libgitg-ext/Makefile.am
index 37cad6c..2602755 100644
--- a/libgitg-ext/Makefile.am
+++ b/libgitg-ext/Makefile.am
@@ -17,7 +17,8 @@ VALAFLAGS = 				\
 	--includedir libgitg-ext	\
 	--basedir $(top_srcdir)		\
 	--gir GitgExt-1.0.gir		\
-	--library libgitg-ext-1.0
+	--library libgitg-ext-1.0	\
+	--girdir $(top_builddir)/libgitg
 
 libgitg_ext_1_0_la_LDFLAGS = \
 	-export-dynamic -no-undefined -export-symbols-regex "^[^_].*"
@@ -45,6 +46,7 @@ headerdir = $(prefix)/include/libgitg-ext-1.0/libgitg-ext
 header_DATA = $(INST_H_FILES)
 
 GitgExt-1.0.gir: libgitg-ext-1.0.la
+libgitg-ext.h: libgitg-ext-1.0.la
 
 # Ignore all warnings for vala code...
 libgitg_ext_1_0_la_CFLAGS = \
@@ -57,7 +59,7 @@ typelibdir = $(INTROSPECTION_TYPELIBDIR)
 typelib_DATA = GitgExt-1.0.typelib
 
 %.typelib: %.gir
-	$(INTROSPECTION_COMPILER) $(INTROSPECTION_COMPILER_ARGS) --includedir=. -o $@ $<
+	$(INTROSPECTION_COMPILER) $(INTROSPECTION_COMPILER_ARGS) --includedir=. --includedir=$(top_builddir)/libgitg -o $@ $<
 
 if ENABLE_PYTHON
 overridesdir = $(pyoverridesdir)
diff --git a/libgitg-gtk/Makefile.am b/libgitg-gtk/Makefile.am
index 6aeafcc..a6abab8 100644
--- a/libgitg-gtk/Makefile.am
+++ b/libgitg-gtk/Makefile.am
@@ -29,9 +29,11 @@ VALAFLAGS = 				\
 	--includedir libgitg-gtk	\
 	--basedir $(top_srcdir)		\
 	--gir GitgGtk-1.0.gir		\
-	--library libgitg-gtk-1.0
+	--library libgitg-gtk-1.0	\
+	--girdir "$(top_builddir)/libgitg"
 
 GitgGtk-1.0.gir: libgitg-gtk-1.0.la
+libgitg-gtk.h: libgitg-gtk-1.0.la
 
 VALA_FILES =					\
 	gitg-gtk-commit-model.vala		\
@@ -56,7 +58,7 @@ typelibdir = $(INTROSPECTION_TYPELIBDIR)
 typelib_DATA = GitgGtk-1.0.typelib
 
 %.typelib: %.gir
-	$(INTROSPECTION_COMPILER) $(INTROSPECTION_COMPILER_ARGS) --includedir=. -o $@ $<
+	$(INTROSPECTION_COMPILER) $(INTROSPECTION_COMPILER_ARGS) --includedir=. --includedir="$(top_builddir)/libgitg" -o $@ $<
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libgitg-gtk-1.0.pc
diff --git a/libgitg/Makefile.am b/libgitg/Makefile.am
index 7dec0e8..6848a8f 100644
--- a/libgitg/Makefile.am
+++ b/libgitg/Makefile.am
@@ -26,6 +26,7 @@ VALAFLAGS = 				\
 	--library libgitg-1.0
 
 Gitg-1.0.gir: libgitg-1.0.la
+libgitg.h: libgitg-1.0.la
 
 VALA_FILES =				\
 	gitg-repository.vala		\