summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Dahlin <johan@gnome.org>2010-05-26 14:05:19 -0300
committerJohan Dahlin <johan@gnome.org>2010-05-26 14:24:55 -0300
commitbbddbb94528308f8ee43661cacee2fbdc6b59b81 (patch)
tree7e1d7559527563f6f3ae8748dd907fb6286c4a3a
parenta7e3ba116614e27af22a3f6ff6bd1788642be0b2 (diff)
downloadgobject-introspection-bbddbb94528308f8ee43661cacee2fbdc6b59b81.tar.gz
[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.
-rw-r--r--common.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/common.mk b/common.mk
index 45aaf1d2..a741dc1f 100644
--- 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