[common.mk] Add builddir,srcdir and top_srcdir/gir

They are now required with the updated Makefile.introspection rules,
as the path to cairo-1.0.gir is no longer absolute we will have to add
the src manually as it's references when srcdir != builddir, for instance
in make distcheck.

diff --git a/common.mk b/common.mk
index 45aaf1d..a741dc1 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -14,11 +14,14 @@ INTROSPECTION_SCANNER = \
     $(top_builddir)/tools/g-ir-scanner$(EXEEXT)
 INTROSPECTION_SCANNER_ARGS = \
     --verbose \
-    --add-include-path=. \
+    --add-include-path=$(srcdir) \
+    --add-include-path=$(top_srcdir)/gir \
+    --add-include-path=$(builddir) \
     --add-include-path=$(top_builddir)/gir
 
 INTROSPECTION_COMPILER = $(top_builddir)/tools/g-ir-compiler$(EXEEXT)
 INTROSPECTION_COMPILER_ARGS = \
     --includedir=$(srcdir) \
     --includedir=$(top_srcdir)/gir \
+    --includedir=$(builddir) \
     --includedir=$(top_builddir)/gir