summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Dahlin <jdahlin@litl.com>2011-08-13 10:06:49 -0300
committerJohan Dahlin <jdahlin@litl.com>2011-08-13 10:06:49 -0300
commitf239fc6fbea0c7297e28f903237a3eb0377c336b (patch)
tree3092a154f0a8cc4feae59c87e4a0aaa481e4e8bf
parentb81b91a9cb89a073a04e8df325525d102f770b6b (diff)
downloadgobject-introspection-f239fc6fbea0c7297e28f903237a3eb0377c336b.tar.gz
Move doctool over to common.mk
-rw-r--r--common.mk2
-rw-r--r--tests/doctool/Makefile.am2
2 files changed, 3 insertions, 1 deletions
diff --git a/common.mk b/common.mk
index 21485fd2..df72b208 100644
--- a/common.mk
+++ b/common.mk
@@ -26,3 +26,5 @@ INTROSPECTION_COMPILER_ARGS = \
--includedir=$(top_srcdir)/gir \
--includedir=$(builddir) \
--includedir=$(top_builddir)
+
+INTROSPECTION_DOCTOOL = $(top_builddir)/g-ir-doc-tool$(EXEEXT)
diff --git a/tests/doctool/Makefile.am b/tests/doctool/Makefile.am
index 640759e9..1552930a 100644
--- a/tests/doctool/Makefile.am
+++ b/tests/doctool/Makefile.am
@@ -12,7 +12,7 @@ BUILT_SOURCES = $(DOCBOOK_FILES)
EXTRA_DIST = $(EXPECTEDDOCBOOKFILES)
%.xml: %.gir
- @g-ir-doc-tool $*.gir -o $*.xml && echo " GEN $*.xml"
+ $(INTROSPECTION_DOCTOOL) $*.gir -o $*.xml && echo " GEN $*.xml"
%.xml.check: %.xml
@diff -u -U 10 $(srcdir)/$*-expected.xml $*.xml && echo " TEST $*.xml"