From f239fc6fbea0c7297e28f903237a3eb0377c336b Mon Sep 17 00:00:00 2001 From: Johan Dahlin Date: Sat, 13 Aug 2011 10:06:49 -0300 Subject: [PATCH] Move doctool over to common.mk --- common.mk | 2 ++ tests/doctool/Makefile.am | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/common.mk b/common.mk index 21485fd..df72b20 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 640759e..1552930 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" -- 2.7.4