[gtk-doc] tests: add test-env to all Makefiles. Fixes #581237



commit 2f1c86ec4d3c19d02ac1789fedea44aa8687a558
Author: Stefan Kost <ensonic users sf net>
Date:   Tue Sep 29 13:39:08 2009 +0300

    tests: add test-env to all Makefiles. Fixes #581237
    
    Also don't dist override.txt files as we don't use them.

 tests/annotations/docs/Makefile.am  |    5 +++++
 tests/bugs/docs/Makefile.am         |    5 +++++
 tests/fail/docs/Makefile.am         |    5 +++++
 tests/gobject/docs-tmpl/Makefile.am |    5 +++++
 tests/gobject/docs/Makefile.am      |    5 +++++
 tests/gtk-doc.make                  |    3 +--
 tests/gtk-doc.notmpl.make           |    3 +--
 7 files changed, 27 insertions(+), 4 deletions(-)
---
diff --git a/tests/annotations/docs/Makefile.am b/tests/annotations/docs/Makefile.am
index e1b3bd9..67dc817 100644
--- a/tests/annotations/docs/Makefile.am
+++ b/tests/annotations/docs/Makefile.am
@@ -76,5 +76,10 @@ DISTCLEANFILES = \
 	gtkdoc-mkhtml.log \
 	gtkdoc-fixxref.log
 
+if BUILD_TESTS
+TESTS_ENVIRONMENT = \
+	PATH=$(abs_top_builddir):$(srcdir):$(PATH) \
+	PERL5LIB=$(abs_top_builddir):$(PERL5LIB)
+endif
 
 -include $(top_srcdir)/git.mk
diff --git a/tests/bugs/docs/Makefile.am b/tests/bugs/docs/Makefile.am
index 3100175..b17a15d 100644
--- a/tests/bugs/docs/Makefile.am
+++ b/tests/bugs/docs/Makefile.am
@@ -77,5 +77,10 @@ DISTCLEANFILES = \
 	gtkdoc-mkhtml.log \
 	gtkdoc-fixxref.log
 
+if BUILD_TESTS
+TESTS_ENVIRONMENT = \
+	PATH=$(abs_top_builddir):$(srcdir):$(PATH) \
+	PERL5LIB=$(abs_top_builddir):$(PERL5LIB)
+endif
 
 -include $(top_srcdir)/git.mk
diff --git a/tests/fail/docs/Makefile.am b/tests/fail/docs/Makefile.am
index 17a8a5f..262655e 100644
--- a/tests/fail/docs/Makefile.am
+++ b/tests/fail/docs/Makefile.am
@@ -76,5 +76,10 @@ DISTCLEANFILES = \
 	gtkdoc-mkhtml.log \
 	gtkdoc-fixxref.log
 
+if BUILD_TESTS
+TESTS_ENVIRONMENT = \
+	PATH=$(abs_top_builddir):$(srcdir):$(PATH) \
+	PERL5LIB=$(abs_top_builddir):$(PERL5LIB)
+endif
 
 -include $(top_srcdir)/git.mk
diff --git a/tests/gobject/docs-tmpl/Makefile.am b/tests/gobject/docs-tmpl/Makefile.am
index f57ea76..8af7e5e 100644
--- a/tests/gobject/docs-tmpl/Makefile.am
+++ b/tests/gobject/docs-tmpl/Makefile.am
@@ -74,5 +74,10 @@ DISTCLEANFILES = \
 	gtkdoc-mkhtml.log \
 	gtkdoc-fixxref.log
 
+if BUILD_TESTS
+TESTS_ENVIRONMENT = \
+	PATH=$(abs_top_builddir):$(srcdir):$(PATH) \
+	PERL5LIB=$(abs_top_builddir):$(PERL5LIB)
+endif
 
 -include $(top_srcdir)/git.mk
diff --git a/tests/gobject/docs/Makefile.am b/tests/gobject/docs/Makefile.am
index 3660ebe..68e489b 100644
--- a/tests/gobject/docs/Makefile.am
+++ b/tests/gobject/docs/Makefile.am
@@ -76,5 +76,10 @@ DISTCLEANFILES = \
 	gtkdoc-mkhtml.log \
 	gtkdoc-fixxref.log
 
+if BUILD_TESTS
+TESTS_ENVIRONMENT = \
+	PATH=$(abs_top_builddir):$(srcdir):$(PATH) \
+	PERL5LIB=$(abs_top_builddir):$(PERL5LIB)
+endif
 
 -include $(top_srcdir)/git.mk
diff --git a/tests/gtk-doc.make b/tests/gtk-doc.make
index d8f3cae..4868a2f 100644
--- a/tests/gtk-doc.make
+++ b/tests/gtk-doc.make
@@ -28,8 +28,7 @@ EXTRA_DIST = 				\
 	$(content_files)		\
 	$(HTML_IMAGES)			\
 	$(DOC_MAIN_SGML_FILE)		\
-	$(DOC_MODULE)-sections.txt	\
-	$(DOC_MODULE)-overrides.txt
+	$(DOC_MODULE)-sections.txt
 
 DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
 	pdf-build.stamp \
diff --git a/tests/gtk-doc.notmpl.make b/tests/gtk-doc.notmpl.make
index bb9083f..f266437 100644
--- a/tests/gtk-doc.notmpl.make
+++ b/tests/gtk-doc.notmpl.make
@@ -28,8 +28,7 @@ EXTRA_DIST = 				\
 	$(content_files)		\
 	$(HTML_IMAGES)			\
 	$(DOC_MAIN_SGML_FILE)		\
-	$(DOC_MODULE)-sections.txt	\
-	$(DOC_MODULE)-overrides.txt
+	$(DOC_MODULE)-sections.txt
 
 DOC_STAMPS=scan-build.stamp sgml-build.stamp html-build.stamp pdf-build.stamp \
 	$(srcdir)/sgml.stamp $(srcdir)/html.stamp  \



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