gimarshallingtests:: Add test for returning a caller-allocated GArray

[platform/upstream/gobject-introspection.git] / common.mk

diff --git a/common.mk b/common.mk
index df72b20..87ceaee 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -7,11 +7,14 @@
 #
 
 INTROSPECTION_SCANNER = \
-    env LPATH=.libs \
+    env PATH=.libs:$(PATH) \
+        LPATH=.libs \
+        CC="$(CC)" \
         PYTHONPATH=$(top_builddir):$(top_srcdir) \
-       UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \
-       UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir) \
-    $(top_builddir)/g-ir-scanner$(EXEEXT)
+        UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \
+        UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir) \
+        $(top_builddir)/g-ir-scanner
+
 INTROSPECTION_SCANNER_ARGS = \
     --verbose \
     -I$(top_srcdir) \
@@ -20,11 +23,20 @@ INTROSPECTION_SCANNER_ARGS = \
     --add-include-path=$(builddir) \
     --add-include-path=$(top_builddir)
 
-INTROSPECTION_COMPILER = $(top_builddir)/g-ir-compiler$(EXEEXT)
+INTROSPECTION_COMPILER = \
+    env PATH=.libs:$(PATH) \
+        $(top_builddir)/g-ir-compiler$(EXEEXT)
+
 INTROSPECTION_COMPILER_ARGS = \
     --includedir=$(srcdir) \
     --includedir=$(top_srcdir)/gir \
     --includedir=$(builddir) \
     --includedir=$(top_builddir)
 
-INTROSPECTION_DOCTOOL = $(top_builddir)/g-ir-doc-tool$(EXEEXT)
+INTROSPECTION_DOCTOOL = \
+    env PATH=.libs:$(PATH) \
+        LPATH=.libs \
+        PYTHONPATH=$(top_builddir):$(top_srcdir) \
+        UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \
+        UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir) \
+        $(top_builddir)/g-ir-doc-tool