X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=common.mk;h=87ceaee217bd5a1e641a13678958a202d753d006;hb=f885e3ecce5e4f1df19659b76a89598d5df4fab5;hp=f05d4aff9a2369e003d708b32a9e63a260c8f6b1;hpb=c1836c4e455eb4c98f3a2a5ce97995e070cf9377;p=platform%2Fupstream%2Fgobject-introspection.git

diff --git a/common.mk b/common.mk
index f05d4af..87ceaee 100644
--- a/common.mk
+++ b/common.mk
@@ -1,19 +1,42 @@
-SCANNER_BIN = $(top_builddir)/tools/g-ir-scanner
-SCANNER_PYTHONPATH = $(top_builddir):$(top_srcdir):$$PYTHONPATH
-SCANNER_ENV = env PYTHONPATH=$(SCANNER_PYTHONPATH) \
-	UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \
-	UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir)
-SCANNER_ARGS = -v --add-include-path=$(top_builddir)/gir --add-include-path=.
-SCANNER = env LPATH=.libs $(CHECK_DEBUG) $(SCANNER_ENV) $(SCANNER_BIN) $(SCANNER_ARGS)
-SCANNER_LIBS = \
-	$(top_srcdir)/giscanner/*.py \
-	$(top_builddir)/giscanner/libgiscanner.la \
-	$(top_builddir)/girepository/libgirepository-1.0.la
+# -*- Mode: make -*-
+# Copyright 2009-2010 Johan Dahlin
+#
+# This file defines variables that are compatible with
+# Makefile.introspection, but for use within the gobject-introspection
+# module itself.
+#
+
+INTROSPECTION_SCANNER = \
+    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
+
+INTROSPECTION_SCANNER_ARGS = \
+    --verbose \
+    -I$(top_srcdir) \
+    --add-include-path=$(srcdir) \
+    --add-include-path=$(top_srcdir)/gir \
+    --add-include-path=$(builddir) \
+    --add-include-path=$(top_builddir)
+
+INTROSPECTION_COMPILER = \
+    env PATH=.libs:$(PATH) \
+        $(top_builddir)/g-ir-compiler$(EXEEXT)
 
-INTROSPECTION_SCANNER = $(SCANNER)
-INTROSPECTION_SCANNER_ARGS = $(SCANNER_ARGS)
-INTROSPECTION_COMPILER = $(top_builddir)/tools/g-ir-compiler$(EXEEXT)
 INTROSPECTION_COMPILER_ARGS = \
-	--includedir=$(srcdir) \
-	--includedir=$(top_srcdir)/gir \
-    --includedir=$(top_builddir)/gir
+    --includedir=$(srcdir) \
+    --includedir=$(top_srcdir)/gir \
+    --includedir=$(builddir) \
+    --includedir=$(top_builddir)
+
+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