[gtk-doc] build: make distcehck fixes



commit 4abb767a78a04da243ec96a95c4c09d3802ab73f
Author: Stefan Sauer <ensonic users sf net>
Date:   Sat Feb 8 23:21:14 2014 +0100

    build: make distcehck fixes

 tests/Makefile.am         |    2 ++
 tests/gtk-doc.make        |    2 +-
 tests/gtk-doc.notmpl.make |    2 +-
 tests/gtkdoctest.sh       |    3 ++-
 tests/sanity.sh           |    3 ++-
 5 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 63162e7..2fb48ae 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -6,6 +6,8 @@ if BUILD_TESTS
 
 TESTS = tools.sh gobject.sh bugs.sh annotations.sh fail.sh empty.sh sanity.sh
 TESTS_ENVIRONMENT = \
+       BUILDDIR=$(abs_builddir) \
+       SRCDIR=$(abs_srcdir) \
        ABS_TOP_BUILDDIR=$(abs_top_builddir) \
        ABS_TOP_SRCDIR=$(abs_top_srcdir) \
        PATH=$(abs_top_builddir):$(srcdir):$(PATH) \
diff --git a/tests/gtk-doc.make b/tests/gtk-doc.make
index b307c48..382bf9f 100644
--- a/tests/gtk-doc.make
+++ b/tests/gtk-doc.make
@@ -212,7 +212,7 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 
 # we need to enforce a rebuild for the tests
 clean-local:
-       @rm -f *~ *.bak ts
+       @rm -f *~ *.bak ts gtkdoc-*.log
        @rm -rf .libs
        @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \
          rm -f $(DOC_MODULE).types; \
diff --git a/tests/gtk-doc.notmpl.make b/tests/gtk-doc.notmpl.make
index e2969cc..1864bd4 100644
--- a/tests/gtk-doc.notmpl.make
+++ b/tests/gtk-doc.notmpl.make
@@ -188,7 +188,7 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 
 # we need to enforce a rebuild for the tests
 clean-local:
-       @rm -f *~ *.bak ts
+       @rm -f *~ *.bak ts gtkdoc-*.log
        @rm -rf .libs
        @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \
          rm -f $(DOC_MODULE).types; \
diff --git a/tests/gtkdoctest.sh b/tests/gtkdoctest.sh
index 694c4c5..93f3b36 100755
--- a/tests/gtkdoctest.sh
+++ b/tests/gtkdoctest.sh
@@ -3,7 +3,8 @@
 suite=$1
 dir=`dirname $0`
 
-cd $dir/$suite/docs && gtkdoc-check
+cd $dir/$suite/docs && \
+env BUILDDIR=$BUILDDIR/$suite/docs SRCDIR=$SRCDIR/$suite/docs gtkdoc-check
 
 # xmllint --noout --nonet --schema ../devhelp2.xsd ./bugs/docs/html/tester.devhelp2
 #
diff --git a/tests/sanity.sh b/tests/sanity.sh
index 4f064fb..6ef67bc 100755
--- a/tests/sanity.sh
+++ b/tests/sanity.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-dir=`dirname $0`
+dir=$BUILDDIR
+#`dirname $0`
 suite="sanity"
 
 failed=0


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]