summaryrefslogtreecommitdiff
path: root/common.mk
diff options
context:
space:
mode:
authorDieter Verfaillie <dieterv@optionexplicit.be>2015-03-30 22:01:41 +0200
committerDieter Verfaillie <dieterv@optionexplicit.be>2015-06-24 21:59:00 +0200
commit5f72748c8f1e8313b7f6c4c296cffdae7095cfbe (patch)
tree353fcae8f270d88389430736d6acc91d667a82f8 /common.mk
parentb491e9ae51ef330d595277e13d5d1556b47450c9 (diff)
downloadgobject-introspection-5f72748c8f1e8313b7f6c4c296cffdae7095cfbe.tar.gz
tests: make sure g-ir-scanner can find cairo-1.0.gir
"cairo-1.0.gir" is generated into "$(top_builddir)/gir" but g-ir-scanner is never instructed to look into that directory. This fails somewhat when there is no system installed copy of it when VPATH building "tests/scanner/Regress-1.0.gir": Couldn't find include cairo-1.0.gir (search path: "everything except the correct value") https://bugzilla.gnome.org/show_bug.cgi?id=745636
Diffstat (limited to 'common.mk')
-rw-r--r--common.mk9
1 files changed, 6 insertions, 3 deletions
diff --git a/common.mk b/common.mk
index 303622fa..e26c6377 100644
--- a/common.mk
+++ b/common.mk
@@ -21,7 +21,8 @@ INTROSPECTION_SCANNER_ARGS = \
--add-include-path=$(srcdir) \
--add-include-path=$(top_srcdir)/gir \
--add-include-path=$(builddir) \
- --add-include-path=$(top_builddir)
+ --add-include-path=$(top_builddir) \
+ --add-include-path=$(top_builddir)/gir
INTROSPECTION_COMPILER = \
env PATH=".libs:$(PATH)" \
@@ -31,7 +32,8 @@ INTROSPECTION_COMPILER_ARGS = \
--includedir=$(srcdir) \
--includedir=$(top_srcdir)/gir \
--includedir=$(builddir) \
- --includedir=$(top_builddir)
+ --includedir=$(top_builddir) \
+ --includedir=$(top_builddir)/gir
INTROSPECTION_DOCTOOL = \
env PATH=".libs:$(PATH)" \
@@ -45,4 +47,5 @@ INTROSPECTION_DOCTOOL_ARGS = \
--add-include-path=$(srcdir) \
--add-include-path=$(top_srcdir)/gir \
--add-include-path=$(builddir) \
- --add-include-path=$(top_builddir)
+ --add-include-path=$(top_builddir) \
+ --add-include-path=$(top_builddir)/gir