Various "make distcheck" and other fixes

Makefile.am:

* Use $(VAR), not @VAR@, as the former is the correct form for AC_SUBST'ed
   variables in Makefile.am files

* Touch these *.xml/*.syms files in the "dist-hook" target to prevent them
   from being regenerated, because the "make dist" process in itself
   updates the timestamps of the source files when it copies them into
   $(distdir)

* Add EXTRA_LIBS (-lrt on my system) to xsltConf.sh, as this is a required
   dependency when client applications link against -lxslt

   (note that the definition of EXTRA_LIBS has been changed; see below)

* Removed MAKEFLAGS+=--silent bits, as this is not compatible with non-GNU
   Make programs

autogen.sh:

* Add --warnings=all options to automake and autoconf invocations, to
   better catch potential problems (most of which I've fixed in this patch)

configure.in:

* Replaced obsolete macros with their current equivalents; for reference,
   see

     http://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.69/html_node/Obsolete-Macros.html

   (I removed AC_ISC_POSIX outright because the doc states it is no longer
   useful)

* test(1) uses "=" as an operator, not "=="

* Fixed quoting on an AC_LINK_IFELSE() invocation to quell Autoconf errors

* Don't add redundant libraries to EXTRA_LIBS, because (1) this variable
   already contains LibXSLT's own additional system-library deps, and is
   useful in that form, and (2) the LibXML2 deps are already handled by
   Libtool

* Don't delete files in srcdir, and don't create the symlink to
   "Copyright" there either

   (I don't understand why this is being symlinked in the first place...)

doc/Makefile.am:

* Can't use wildcards in EXTRA_DIST, because this breaks dependencies
   (e.g. you can't "make EXSLT/\*.html"), and they only work properly when
   building inside the source tree; these have been replaced with their
   expansions. Other entries have been added here in lieu of the wildcards
   in the dist-hook target, as well as opportunistic use of the $(*PAGES)
   variables.

* Don't define an "all" target, because this steps on Automake's toes; use
   "all-local" instead

* Define and use an "xsltproc" variable to reference an in-tree-built
   version of xsltproc, instead of e.g. $(bindir)/xsltproc

   NOTE: The makefile also uses $(XSLTPROC), which names an external
   instance of the program found at configure time. Some instances of this
   could probably be changed to $(xsltproc) to remove the dependency on an
   existing installed program.

* Qualified various filenames as appropriate with $(srcdir)

* Use $(XMLLINT) consistently instead of $(bindir)/xmllint

* In the "libxslt-api.xml ..." rule, cd into $(srcdir) before invoking
   apibuild.py as this script has to run in srcdir anyway

* In the "clean-local" rule, clear out some additional files to allow
   "make distcheck" to pass

* Eliminated the redundant "maintainer-clean-local" rule

* Added a "distclean-local" rule to clear out the build directory in an
   out-of-source build to allow "make distcheck" to pass

* Added a "check-extra-dist" target to make it easier to check that
   EXTRA_DIST isn't missing anything

* Use $(MKDIR_P), not $(mkinstalldirs), as the latter name is obsolete

* Use $(VAR) instead of @VAR@

* The "dist-hook" target didn't work (if any generated files were in
   builddir and not in srcdir), and is no longer needed thanks to the
   comprehensive EXTRA_DIST variable

* Added an "uninstall-local" rule to allow "make distcheck" to pass

* Updated the .PHONY target list, removed non-existent targets

doc/symbols.xml:

* Needed to add this bit to make the generation scripts shut up

libexslt/Makefile.am:

* AM_CPPFLAGS should be used instead of INCLUDES, as the latter is an
   obsolete name

* Moved $(LIBXML_CFLAGS) to AM_CFLAGS, to segregate CFLAGS from CPPFLAGS

   (Note that $(CFLAGS) need not be added to AM_CFLAGS, because Automake
   already references both in the build rules)

* Use $(VAR) instead of @VAR@

libxslt.pc.in:

* Add EXTRA_LIBS (-lrt on my system), as this is a required dependency
   when client applications link against -lxslt

libxslt/Makefile.am:

* AM_CPPFLAGS should be used instead of INCLUDES, as the latter is an
   obsolete name

* Moved $(LIBXML_CFLAGS) to AM_CFLAGS, to segregate CFLAGS from CPPFLAGS

* Use $(VAR) instead of @VAR@, $(MKDIR_P) instead of $(mkinstalldirs)

* Use $(MKDIR_P), not $(mkinstalldirs), as the latter name is obsolete

libxslt/xsltutils.c:

* Some systems don't know about CLOCK_MONOTONIC; older Solaris knows about
   CLOCK_HIGHRES. Some systems, alas, have no usable alternative to
   CLOCK_REALTIME.

python/Makefile.am:

* AM_CPPFLAGS should be used instead of INCLUDES, as the latter is an
   obsolete name

* Moved $(LIBXML_CFLAGS) to AM_CFLAGS, to segregate CFLAGS from CPPFLAGS

* Because libxslt-py.c is (presumably) supposed to be generated every time
   at build time, don't bundle it in the dist tarball

* Use $(VAR) instead of @VAR@

* libxsltclass.py is a generated file, so it doesn't get qualified with
   $(srcdir)

* Use $(MKDIR_P) instead of (mkinstalldirs)

* Added an uninstall-local rule so that "make distcheck" passes

* Removed the $(srcdir) qualifications in the GENERATED file list, as
   these files may exist in builddir

* In the gen_prog rule, qualify the script invocation with $(srcdir), and
   set the SRCDIR environment variable so that the script can find the
   files it needs when builddir != srcdir

* Don't define an "all" target, as this steps on Automake's toes

python/generator.py:

* Get the source directory from the SRCDIR environment variable, and use
   it appropriately

python/tests/Makefile.am:

* Set CLEANFILES instead of defining a "clean" rule

* Use $(VAR) instead of @VAR@, $(MKDIR_P) instead of $(mkinstalldirs)

tests/*/Makefile.am, tests/exslt/*/Makefile.am:

* Need to clean up .memdump files for "make distcheck" to pass

* Don't define an "all" target, as this steps on Automake's toes

tests/REC/Makefile.am:

* Added two missing *.stand.out files to EXTRA_DIST

tests/XSLTMark/Makefile.am:

* Replaced the GNU-Make-specific %.out bit with a more broadly compatible
   rule

   (the "dummy" bit shuts up Automake)

* Use "$(xsltproc)" instead of "$(top_builddir)/xsltproc/xsltproc"

* Use a less $(MAKE)-heavy invocation in the "tests" target

* Replaced a conflicting "clean" target with CLEANFILES

* Added a dependency on $(xsltproc) to all the test targets

* Added a .PHONY target list

tests/docbook/Makefile.am:

* Ditched the "echo -n" bit, because it wasn't working as advertised

* Create output directories for out-of-source builds

* "$(basename $$i)" is a typo in a makefile

* Don't embed $(srcdir) in $out/$html/$fo/$msg/$xhtml, so that we can
   refer to these files in builddir or srcdir

* Add a trailing "echo" to complete the "echo -n"

* Don't output files unconditionally to srcdir (it may be read-only, for
   starters)

tests/plugins/Makefile.am:

* AM_CPPFLAGS should be used instead of INCLUDES, as the latter is an
   obsolete name

   (Note that the "$(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS)" bit that was here
   can be dropped entirely, because these already appear in
   xmlsoft_org_xslt_testplugin_la_CFLAGS)

* Use noinst_LTLIBRARIES inside the WITH_MODULES conditional instead of
   EXTRA_LTLIBRARIES, as this is cleaner (and disallows building the plugin
   if module support is disabled)

* Need to clean up *.res files for "make distcheck" to pass

* Use the abs_builddir variable conveniently provided to us by Automake
   instead of a GNU Make $(shell ...) construct

xslt-config.in:

* Add EXTRA_LIBS (-lrt on my system), as this is a required dependency
   when client applications link against -lxslt

xsltproc/Makefile.am:

* AM_CPPFLAGS should be used instead of INCLUDES, as the latter is an
   obsolete name

* Moved $(LIBXML_CFLAGS) into AM_CFLAGS

* Use $(VAR) instead of @VAR@

* Need to clean .memdump for "make distcheck" to pass

* Added rules to build lib[e]xslt.la if needed, which allows test
   makefiles to build xsltproc on the fly even if nothing else has been
   built already

* Create .memdump file in the "tests" target, as it's being grepped
   afterward

25 files changed, 177 insertions, 174 deletions

diff --git a/tests/REC/Makefile.am b/tests/REC/Makefile.am
index 0e299d21..6f89310c 100644
--- a/tests/REC/Makefile.am
+++ b/tests/REC/Makefile.am
@@ -77,10 +77,10 @@ EXTRA_DIST = 						\
     test-9.2-1.xsl					\
     stand-2.7-1.dtd stand-2.7-1.stand.out stand-2.7-1.xsl \
     stand-2.7-1.out stand-2.7-1.xml			\
-    stand-2.7-2.xml stand-2.7-3.xml
+    stand-2.7-2.stand.out stand-2.7-2.xml stand-2.7-3.xml \
+    stand-2.7-3.stand.out
 
-
-all:
+CLEANFILES = .memdump
 
 valgrind:
 	@echo '## Running the regression tests under Valgrind'
diff --git a/tests/REC1/Makefile.am b/tests/REC1/Makefile.am
index 3b00f0be..0688daa3 100644
--- a/tests/REC1/Makefile.am
+++ b/tests/REC1/Makefile.am
@@ -5,7 +5,7 @@ $(top_builddir)/xsltproc/xsltproc:
 
 EXTRA_DIST = doc.xsl doc.xml doc.dtd result.xml
 
-all:
+CLEANFILES = .memdump
 
 valgrind:
 	@echo '## Running the regression tests under Valgrind'
diff --git a/tests/REC2/Makefile.am b/tests/REC2/Makefile.am
index 06c679bd..72e9af11 100644
--- a/tests/REC2/Makefile.am
+++ b/tests/REC2/Makefile.am
@@ -5,7 +5,7 @@ $(top_builddir)/xsltproc/xsltproc:
 
 EXTRA_DIST = data.xml vrml.xsl vrml.xml svg.xsl svg.xml	html.xsl html.xml
 
-all:
+CLEANFILES = .memdump
 
 valgrind:
 	@echo '## Running the regression tests under Valgrind'
diff --git a/tests/XSLTMark/Makefile.am b/tests/XSLTMark/Makefile.am
index 5f68d024..eb64cb4b 100644
--- a/tests/XSLTMark/Makefile.am
+++ b/tests/XSLTMark/Makefile.am
@@ -1,5 +1,4 @@
 ## Process this file with automake to produce Makefile.in
-%.out : %
 
 EXTRA_DIST = \
   dbgen.pl \
@@ -53,22 +52,23 @@ ALL_TESTS=	alphabetize attsets avts axis backwards bottles breadth brutal chart
   priority products queens reverser stringsort summarize total tower trend \
   union xpath xslbench1 xslbench2 xslbench3
 
+dummy $(ALL_TESTS:=.out):
+	$(MAKE) $(@:.out=)
 
-$(top_builddir)/xsltproc/xsltproc:
-	@(cd ../../xsltproc ; $(MAKE) xsltproc)
+xsltproc = $(top_builddir)/xsltproc/xsltproc
 
-all:
+$(xsltproc):
+	cd ../../xsltproc && $(MAKE) xsltproc
 
 test tests:
 	@echo '## Running XSLTMark tests'
-	@for i in $(ALL_TESTS); do $(MAKE) $$i; done
+	@$(MAKE) $(ALL_TESTS)
 
 valgrind:
 	@echo '## Running the regression tests under Valgrind'
 	$(MAKE) CHECKER='valgrind -q' tests
 
-clean:
-	rm -f *.tmp *~ core db100.xml db1000.xml db10000.xml
+CLEANFILES = *.tmp *~ .memdump core db100.xml db1000.xml db10000.xml
 
 
 if WITH_PERL
@@ -81,9 +81,9 @@ db1000.xml: $(srcdir)/dbgen.pl
 db10000.xml: $(srcdir)/dbgen.pl
 	$(PERL) $(srcdir)/dbgen.pl 10000 > db10000.xml
 
-alphabetize:	db100.xml
+alphabetize:	db100.xml $(xsltproc)
 	@(echo > .memdump)
-	@log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+	@log=`$(CHECKER) $(xsltproc) \
 		$(srcdir)/$@.xsl $< > $@.tmp; \
 	  if [ ! -f $(srcdir)/$@.out ] ; then \
 		cp $@.tmp $(srcdir)/$@.out ; \
@@ -97,9 +97,9 @@ alphabetize:	db100.xml
 	fi
 	@rm -f $@.tmp
 
-avts:			db100.xml
+avts:			db100.xml $(xsltproc)
 	@(echo > .memdump)
-	@log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+	@log=`$(CHECKER) $(xsltproc) \
 		$(srcdir)/$@.xsl $< > $@.tmp; \
 	  if [ ! -f $(srcdir)/$@.out ] ; then \
 		cp $@.tmp $(srcdir)/$@.out ; \
@@ -113,9 +113,9 @@ avts:			db100.xml
 	fi
 	@rm -f $@.tmp
 
-creation:		db100.xml
+creation:		db100.xml $(xsltproc)
 	@(echo > .memdump)
-	@log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+	@log=`$(CHECKER) $(xsltproc) \
 		$(srcdir)/$@.xsl $< > $@.tmp; \
 	  if [ ! -f $(srcdir)/$@.out ] ; then \
 		cp $@.tmp $(srcdir)/$@.out ; \
@@ -129,9 +129,9 @@ creation:		db100.xml
 	fi
 	@rm -f $@.tmp
 
-dbonerow:		db10000.xml
+dbonerow:		db10000.xml $(xsltproc)
 	@(echo > .memdump)
-	@log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+	@log=`$(CHECKER) $(xsltproc) \
 		$(srcdir)/$@.xsl $< > $@.tmp; \
 	  if [ ! -f $(srcdir)/$@.out ] ; then \
 		cp $@.tmp $(srcdir)/$@.out ; \
@@ -145,9 +145,9 @@ dbonerow:		db10000.xml
 	fi
 	@rm -f $@.tmp
 
-dbtail:		db100.xml
+dbtail:		db100.xml $(xsltproc)
 	@(echo > .memdump)
-	@log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+	@log=`$(CHECKER) $(xsltproc) \
 		$(srcdir)/$@.xsl $< > $@.tmp; \
 	  if [ ! -f $(srcdir)/$@.out ] ; then \
 		cp $@.tmp $(srcdir)/$@.out ; \
@@ -161,9 +161,9 @@ dbtail:		db100.xml
 	fi
 	@rm -f $@.tmp
 
-decoy:		db100.xml
+decoy:		db100.xml $(xsltproc)
 	@(echo > .memdump)
-	@log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+	@log=`$(CHECKER) $(xsltproc) \
 		$(srcdir)/$@.xsl $< > $@.tmp; \
 	  if [ ! -f $(srcdir)/$@.out ] ; then \
 		cp $@.tmp $(srcdir)/$@.out ; \
@@ -177,9 +177,9 @@ decoy:		db100.xml
 	fi
 	@rm -f $@.tmp
 
-encrypt:		db100.xml
+encrypt:		db100.xml $(xsltproc)
 	@(echo > .memdump)
-	@log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+	@log=`$(CHECKER) $(xsltproc) \
 		$(srcdir)/$@.xsl $< > $@.tmp; \
 	  if [ ! -f $(srcdir)/$@.out ] ; then \
 		cp $@.tmp $(srcdir)/$@.out ; \
@@ -193,9 +193,9 @@ encrypt:		db100.xml
 	fi
 	@rm -f $@.tmp
 
-functions:		db100.xml
+functions:		db100.xml $(xsltproc)
 	@(echo > .memdump)
-	@log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+	@log=`$(CHECKER) $(xsltproc) \
 		$(srcdir)/$@.xsl $< > $@.tmp; \
 	  if [ ! -f $(srcdir)/$@.out ] ; then \
 		cp $@.tmp $(srcdir)/$@.out ; \
@@ -209,9 +209,9 @@ functions:		db100.xml
 	fi
 	@rm -f $@.tmp
 
-identity:		db1000.xml
+identity:		db1000.xml $(xsltproc)
 	@(echo > .memdump)
-	@log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+	@log=`$(CHECKER) $(xsltproc) \
 		$(srcdir)/$@.xsl $< > $@.tmp; \
 	  if [ ! -f $(srcdir)/$@.out ] ; then \
 		cp $@.tmp $(srcdir)/$@.out ; \
@@ -225,9 +225,9 @@ identity:		db1000.xml
 	fi
 	@rm -f $@.tmp
 
-patterns:		db100.xml
+patterns:		db100.xml $(xsltproc)
 	@(echo > .memdump)
-	@log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+	@log=`$(CHECKER) $(xsltproc) \
 		$(srcdir)/$@.xsl $< > $@.tmp; \
 	  if [ ! -f $(srcdir)/$@.out ] ; then \
 		cp $@.tmp $(srcdir)/$@.out ; \
@@ -241,9 +241,9 @@ patterns:		db100.xml
 	fi
 	@rm -f $@.tmp
 
-prettyprint:	db100.xml
+prettyprint:	db100.xml $(xsltproc)
 	@(echo > .memdump)
-	@log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+	@log=`$(CHECKER) $(xsltproc) \
 		$(srcdir)/$@.xsl $< > $@.tmp; \
 	  if [ ! -f $(srcdir)/$@.out ] ; then \
 		cp $@.tmp $(srcdir)/$@.out ; \
@@ -257,9 +257,9 @@ prettyprint:	db100.xml
 	fi
 	@rm -f $@.tmp
 
-stringsort:		db1000.xml
+stringsort:		db1000.xml $(xsltproc)
 	@(echo > .memdump)
-	@log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+	@log=`$(CHECKER) $(xsltproc) \
 		$(srcdir)/$@.xsl $< > $@.tmp; \
 	  if [ ! -f $(srcdir)/$@.out ] ; then \
 		cp $@.tmp $(srcdir)/$@.out ; \
@@ -289,9 +289,9 @@ stringsort:
 
 endif
 
-attsets:		chart.xml
+attsets:		chart.xml $(xsltproc)
 	@(echo > .memdump)
-	@log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+	@log=`$(CHECKER) $(xsltproc) \
 		$(srcdir)/$@.xsl $< > $@.tmp; \
 	  if [ ! -f $(srcdir)/$@.out ] ; then \
 		cp $@.tmp $(srcdir)/$@.out ; \
@@ -305,9 +305,9 @@ attsets:		chart.xml
 	fi
 	@rm -f $@.tmp
 
-axis:			axis.xml
+axis:			axis.xml $(xsltproc)
 	@(echo > .memdump)
-	@log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+	@log=`$(CHECKER) $(xsltproc) \
 		$(srcdir)/$@.xsl $< > $@.tmp; \
 	  if [ ! -f $(srcdir)/$@.out ] ; then \
 		cp $@.tmp $(srcdir)/$@.out ; \
@@ -321,9 +321,9 @@ axis:			axis.xml
 	fi
 	@rm -f $@.tmp
 
-backwards:		game.xml
+backwards:		game.xml $(xsltproc)
 	@(echo > .memdump)
-	@log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+	@log=`$(CHECKER) $(xsltproc) \
 		$(srcdir)/$@.xsl $< > $@.tmp; \
 	  if [ ! -f $(srcdir)/$@.out ] ; then \
 		cp $@.tmp $(srcdir)/$@.out ; \
@@ -337,9 +337,9 @@ backwards:		game.xml
 	fi
 	@rm -f $@.tmp
 
-bottles:		bottles.xml
+bottles:		bottles.xml $(xsltproc)
 	@(echo > .memdump)
-	@log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+	@log=`$(CHECKER) $(xsltproc) \
 		$(srcdir)/$@.xsl $< > $@.tmp; \
 	  if [ ! -f $(srcdir)/$@.out ] ; then \
 		cp $@.tmp $(srcdir)/$@.out ; \
@@ -353,9 +353,9 @@ bottles:		bottles.xml
 	fi
 	@rm -f $@.tmp
 
-brutal:		brutal.xml
+brutal:		brutal.xml $(xsltproc)
 	@(echo > .memdump)
-	@log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+	@log=`$(CHECKER) $(xsltproc) \
 		$(srcdir)/$@.xsl $< > $@.tmp; \
 	  if [ ! -f $(srcdir)/$@.out ] ; then \
 		cp $@.tmp $(srcdir)/$@.out ; \
@@ -369,9 +369,9 @@ brutal:		brutal.xml
 	fi
 	@rm -f $@.tmp
 
-chart:		chart.xml
+chart:		chart.xml $(xsltproc)
 	@(echo > .memdump)
-	@log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+	@log=`$(CHECKER) $(xsltproc) \
 		$(srcdir)/$@.xsl $< > $@.tmp; \
 	  if [ ! -f $(srcdir)/$@.out ] ; then \
 		cp $@.tmp $(srcdir)/$@.out ; \
@@ -385,9 +385,9 @@ chart:		chart.xml
 	fi
 	@rm -f $@.tmp
 
-current:		current.xml
+current:		current.xml $(xsltproc)
 	@(echo > .memdump)
-	@log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+	@log=`$(CHECKER) $(xsltproc) \
 		$(srcdir)/$@.xsl $< > $@.tmp; \
 	  if [ ! -f $(srcdir)/$@.out ] ; then \
 		cp $@.tmp $(srcdir)/$@.out ; \
@@ -401,9 +401,9 @@ current:		current.xml
 	fi
 	@rm -f $@.tmp
 
-game:			game.xml
+game:			game.xml $(xsltproc)
 	@(echo > .memdump)
-	@log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+	@log=`$(CHECKER) $(xsltproc) \
 		$(srcdir)/$@.xsl $< > $@.tmp; \
 	  if [ ! -f $(srcdir)/$@.out ] ; then \
 		cp $@.tmp $(srcdir)/$@.out ; \
@@ -417,9 +417,9 @@ game:			game.xml
 	fi
 	@rm -f $@.tmp
 
-html:			html.xml
+html:			html.xml $(xsltproc)
 	@(echo > .memdump)
-	@log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+	@log=`$(CHECKER) $(xsltproc) \
 		$(srcdir)/$@.xsl $< > $@.tmp; \
 	  if [ ! -f $(srcdir)/$@.out ] ; then \
 		cp $@.tmp $(srcdir)/$@.out ; \
@@ -433,9 +433,9 @@ html:			html.xml
 	fi
 	@rm -f $@.tmp
 
-inventory:		inventory.xml
+inventory:		inventory.xml $(xsltproc)
 	@(echo > .memdump)
-	@log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+	@log=`$(CHECKER) $(xsltproc) \
 		$(srcdir)/$@.xsl $< > $@.tmp; \
 	  if [ ! -f $(srcdir)/$@.out ] ; then \
 		cp $@.tmp $(srcdir)/$@.out ; \
@@ -449,9 +449,9 @@ inventory:		inventory.xml
 	fi
 	@rm -f $@.tmp
 
-metric:		metric.xml
+metric:		metric.xml $(xsltproc)
 	@(echo > .memdump)
-	@log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+	@log=`$(CHECKER) $(xsltproc) \
 		$(srcdir)/$@.xsl $< > $@.tmp; \
 	  if [ ! -f $(srcdir)/$@.out ] ; then \
 		cp $@.tmp $(srcdir)/$@.out ; \
@@ -465,9 +465,9 @@ metric:		metric.xml
 	fi
 	@rm -f $@.tmp
 
-number:		number.xml
+number:		number.xml $(xsltproc)
 	@(echo > .memdump)
-	@log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+	@log=`$(CHECKER) $(xsltproc) \
 		$(srcdir)/$@.xsl $< > $@.tmp; \
 	  if [ ! -f $(srcdir)/$@.out ] ; then \
 		cp $@.tmp $(srcdir)/$@.out ; \
@@ -481,9 +481,9 @@ number:		number.xml
 	fi
 	@rm -f $@.tmp
 
-oddtemplate:	oddtemplate.xml
+oddtemplate:	oddtemplate.xml $(xsltproc)
 	@(echo > .memdump)
-	@log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+	@log=`$(CHECKER) $(xsltproc) \
 		$(srcdir)/$@.xsl $< > $@.tmp; \
 	  if [ ! -f $(srcdir)/$@.out ] ; then \
 		cp $@.tmp $(srcdir)/$@.out ; \
@@ -497,9 +497,9 @@ oddtemplate:	oddtemplate.xml
 	fi
 	@rm -f $@.tmp
 
-priority:		priority.xml
+priority:		priority.xml $(xsltproc)
 	@(echo > .memdump)
-	@log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+	@log=`$(CHECKER) $(xsltproc) \
 		$(srcdir)/$@.xsl $< > $@.tmp; \
 	  if [ ! -f $(srcdir)/$@.out ] ; then \
 		cp $@.tmp $(srcdir)/$@.out ; \
@@ -513,9 +513,9 @@ priority:		priority.xml
 	fi
 	@rm -f $@.tmp
 
-products:		products.xml
+products:		products.xml $(xsltproc)
 	@(echo > .memdump)
-	@log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+	@log=`$(CHECKER) $(xsltproc) \
 		$(srcdir)/$@.xsl $< > $@.tmp; \
 	  if [ ! -f $(srcdir)/$@.out ] ; then \
 		cp $@.tmp $(srcdir)/$@.out ; \
@@ -529,9 +529,9 @@ products:		products.xml
 	fi
 	@rm -f $@.tmp
 
-queens:		queens.xml
+queens:		queens.xml $(xsltproc)
 	@(echo > .memdump)
-	@log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+	@log=`$(CHECKER) $(xsltproc) \
 		$(srcdir)/$@.xsl $< > $@.tmp; \
 	  if [ ! -f $(srcdir)/$@.out ] ; then \
 		cp $@.tmp $(srcdir)/$@.out ; \
@@ -545,9 +545,9 @@ queens:		queens.xml
 	fi
 	@rm -f $@.tmp
 
-reverser:		gettysburg.xml
+reverser:		gettysburg.xml $(xsltproc)
 	@(echo > .memdump)
-	@log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+	@log=`$(CHECKER) $(xsltproc) \
 		$(srcdir)/$@.xsl $< > $@.tmp; \
 	  if [ ! -f $(srcdir)/$@.out ] ; then \
 		cp $@.tmp $(srcdir)/$@.out ; \
@@ -561,9 +561,9 @@ reverser:		gettysburg.xml
 	fi
 	@rm -f $@.tmp
 
-summarize:		queens.xsl
+summarize:		queens.xsl $(xsltproc)
 	@(echo > .memdump)
-	@log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+	@log=`$(CHECKER) $(xsltproc) \
 		$(srcdir)/$@.xsl $< > $@.tmp; \
 	  if [ ! -f $(srcdir)/$@.out ] ; then \
 		cp $@.tmp $(srcdir)/$@.out ; \
@@ -577,9 +577,9 @@ summarize:		queens.xsl
 	fi
 	@rm -f $@.tmp
 
-total:		chart.xml
+total:		chart.xml $(xsltproc)
 	@(echo > .memdump)
-	@log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+	@log=`$(CHECKER) $(xsltproc) \
 		$(srcdir)/$@.xsl $< > $@.tmp; \
 	  if [ ! -f $(srcdir)/$@.out ] ; then \
 		cp $@.tmp $(srcdir)/$@.out ; \
@@ -593,9 +593,9 @@ total:		chart.xml
 	fi
 	@rm -f $@.tmp
 
-tower:		tower.xml
+tower:		tower.xml $(xsltproc)
 	@(echo > .memdump)
-	@log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+	@log=`$(CHECKER) $(xsltproc) \
 		$(srcdir)/$@.xsl $< > $@.tmp; \
 	  if [ ! -f $(srcdir)/$@.out ] ; then \
 		cp $@.tmp $(srcdir)/$@.out ; \
@@ -609,9 +609,9 @@ tower:		tower.xml
 	fi
 	@rm -f $@.tmp
 
-trend:		trend.xml
+trend:		trend.xml $(xsltproc)
 	@(echo > .memdump)
-	@log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+	@log=`$(CHECKER) $(xsltproc) \
 		$(srcdir)/$@.xsl $< > $@.tmp; \
 	  if [ ! -f $(srcdir)/$@.out ] ; then \
 		cp $@.tmp $(srcdir)/$@.out ; \
@@ -625,9 +625,9 @@ trend:		trend.xml
 	fi
 	@rm -f $@.tmp
 
-union:		union.xml
+union:		union.xml $(xsltproc)
 	@(echo > .memdump)
-	@log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+	@log=`$(CHECKER) $(xsltproc) \
 		$(srcdir)/$@.xsl $< > $@.tmp; \
 	  if [ ! -f $(srcdir)/$@.out ] ; then \
 		cp $@.tmp $(srcdir)/$@.out ; \
@@ -641,9 +641,9 @@ union:		union.xml
 	fi
 	@rm -f $@.tmp
 
-xpath:		xpath.xml
+xpath:		xpath.xml $(xsltproc)
 	@(echo > .memdump)
-	@log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+	@log=`$(CHECKER) $(xsltproc) \
 		$(srcdir)/$@.xsl $< > $@.tmp; \
 	  if [ ! -f $(srcdir)/$@.out ] ; then \
 		cp $@.tmp $(srcdir)/$@.out ; \
@@ -657,9 +657,9 @@ xpath:		xpath.xml
 	fi
 	@rm -f $@.tmp
 
-xslbench1:		xslbench1.xml
+xslbench1:		xslbench1.xml $(xsltproc)
 	@(echo > .memdump)
-	@log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+	@log=`$(CHECKER) $(xsltproc) \
 		$(srcdir)/$@.xsl $< > $@.tmp; \
 	  if [ ! -f $(srcdir)/$@.out ] ; then \
 		cp $@.tmp $(srcdir)/$@.out ; \
@@ -673,9 +673,9 @@ xslbench1:		xslbench1.xml
 	fi
 	@rm -f $@.tmp
 
-xslbench2:		xslbenchdream.xml
+xslbench2:		xslbenchdream.xml $(xsltproc)
 	@(echo > .memdump)
-	@log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+	@log=`$(CHECKER) $(xsltproc) \
 		$(srcdir)/$@.xsl $< > $@.tmp; \
 	  if [ ! -f $(srcdir)/$@.out ] ; then \
 		cp $@.tmp $(srcdir)/$@.out ; \
@@ -689,9 +689,9 @@ xslbench2:		xslbenchdream.xml
 	fi
 	@rm -f $@.tmp
 
-xslbench3:		xslbenchdream.xml
+xslbench3:		xslbenchdream.xml $(xsltproc)
 	@(echo > .memdump)
-	@log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+	@log=`$(CHECKER) $(xsltproc) \
 		$(srcdir)/$@.xsl $< > $@.tmp; \
 	  if [ ! -f $(srcdir)/$@.out ] ; then \
 		cp $@.tmp $(srcdir)/$@.out ; \
@@ -705,9 +705,10 @@ xslbench3:		xslbenchdream.xml
 	fi
 	@rm -f $@.tmp
 
-breadth:		
+breadth: $(xsltproc)
+	@test -f breadth.xml || $(LN_S) $(srcdir)/breadth.xml .
 	@(echo > .memdump)
-	@log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+	@log=`$(CHECKER) $(xsltproc) \
 		$(srcdir)/find.xsl $@.xml > $@.tmp; \
 	  if [ ! -f $(srcdir)/$@.out ] ; then \
 		cp $@.tmp $(srcdir)/$@.out ; \
@@ -721,9 +722,10 @@ breadth:
 	fi
 	@rm -f $@.tmp
 
-depth:		
+depth: $(xsltproc)
+	@test -f depth.xml || $(LN_S) $(srcdir)/depth.xml .
 	@(echo > .memdump)
-	@log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+	@log=`$(CHECKER) $(xsltproc) \
 		$(srcdir)/find.xsl $@.xml > $@.tmp; \
 	  if [ ! -f $(srcdir)/$@.out ] ; then \
 		cp $@.tmp $(srcdir)/$@.out ; \
@@ -737,4 +739,4 @@ depth:
 	fi
 	@rm -f $@.tmp
 
-
+.PHONY: test tests valgrind $(ALL_TESTS)
diff --git a/tests/docbook/Makefile.am b/tests/docbook/Makefile.am
index a785a0d7..1c0e48bc 100644
--- a/tests/docbook/Makefile.am
+++ b/tests/docbook/Makefile.am
@@ -1,9 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
-all:
-
 tests:
-	@echo -n '## Running docbook tests: '
+	@echo '## Running docbook tests'
 	$(MAKE) single
 	$(MAKE) xtchunk
 
@@ -16,85 +14,93 @@ $(top_builddir)/xsltproc/xsltproc:
 
 EXTRA_DIST = README VERSION
 
+CLEANFILES = .memdump
+
 full: tests htmltests xhtmltests fotests
 
 #
 # a single tests to check that stuff ain't broken
 #
 single:
+	@$(MKDIR_P) result/html
+	@$(MKDIR_P) result/fo
+	@$(MKDIR_P) result/xhtml
 	@(echo > .memdump)
 	@(for i in $(srcdir)/test/gdp-handbook.xml ; do \
-	  echo -n "$(basename $$i) : html " ; \
-	  out=$(srcdir)/result/html/`basename $$i .xml`.tst; \
-	  html=$(srcdir)/result/html/`basename $$i .xml`.html; \
+	  echo -n "`basename $$i` : html " ; \
+	  out=result/html/`basename $$i .xml`.tst; \
+	  html=result/html/`basename $$i .xml`.html; \
 	  log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc --nonet \
 		$(srcdir)/html/docbook.xsl $$i > $$out ; \
-	    if [ -f $$html ] ; then \
-	  	grep -v id < $$html > $$html.noid ; \
+	    if [ -f $(srcdir)/$$html ] ; then \
+		grep -v id < $(srcdir)/$$html > $$html.noid ; \
 		grep -v id < $$out > $$out.noid ; \
 		diff $$html.noid $$out.noid ; \
 		rm -f $$html.noid $$out.noid ; \
 	    else \
-		mv $$out $$html ; \
+		mv $$out $(srcdir)/$$html ; \
 	    fi ; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true` ; \
 	  if [ -n "$$log" ] ; then \
 		echo ; \
-	  	echo result ; \
+		echo result ; \
 		echo $$log ; \
 	  fi ; \
 	  rm -f $$out ; \
 	  echo -n "fo " ; \
-	  out=$(srcdir)/result/fo/`basename $$i .xml`.tst; \
-	  fo=$(srcdir)/result/fo/`basename $$i .xml`.fo; \
-	  msg=$(srcdir)/result/fo/`basename $$i .xml`.msg; \
+	  out=result/fo/`basename $$i .xml`.tst; \
+	  fo=result/fo/`basename $$i .xml`.fo; \
+	  msg=result/fo/`basename $$i .xml`.msg; \
 	  log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc --nonet \
 		$(srcdir)/fo/docbook.xsl $$i > $$out 2> $$msg ; \
-	  if [ -f $$fo ] ; then \
-	      grep -v id < $$fo > $$fo.noid ; \
+	  if [ -f $(srcdir)/$$fo ] ; then \
+	      grep -v id < $(srcdir)/$$fo > $$fo.noid ; \
 	      grep -v id < $$out > $$out.noid ; \
 	      diff $$fo.noid $$out.noid ; \
 	      rm -f $$fo.noid $$out.noid ; \
 	  else \
-		mv $$out $$fo ; \
+		mv $$out $(srcdir)/$$fo ; \
 	  fi ; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true` ; \
 	  if [ -n "$$log" ] ; then \
 		echo ; \
-	  	echo result ; \
+		echo result ; \
 		echo $$log ; \
 	  fi ; \
 	  rm -f $$out $$msg ; \
 	  echo -n "xhtml " ; \
-	  out=$(srcdir)/result/xhtml/`basename $$i .xml`.tst; \
-	  xhtml=$(srcdir)/result/xhtml/`basename $$i .xml`.xhtml; \
+	  out=result/xhtml/`basename $$i .xml`.tst; \
+	  xhtml=result/xhtml/`basename $$i .xml`.xhtml; \
 	  log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc --nonet \
 		$(srcdir)/xhtml/docbook.xsl $$i > $$out ; \
-	  if [ -f $$xhtml ] ; then \
-	      grep -v id < $$xhtml > $$xhtml.noid ; \
+	  if [ -f $(srcdir)/$$xhtml ] ; then \
+	      grep -v id < $(srcdir)/$$xhtml > $$xhtml.noid ; \
 	      grep -v id < $$out > $$out.noid ; \
 	      diff $$xhtml.noid $$out.noid ; \
 	      rm -f $$xhtml.noid $$out.noid ; \
 	  else \
-		mv $$out $$xhtml ; \
+		mv $$out $(srcdir)/$$xhtml ; \
 	  fi ; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true` ; \
 	  if [ -n "$$log" ] ; then \
 		echo ; \
-	  	echo result ; \
+		echo result ; \
 		echo $$log ; \
 	  fi ; \
 	  rm -f $$out ; \
 	  done )
+	@echo
 
 xtchunk:
+	@$(MKDIR_P) result/html
+	@$(MKDIR_P) result/xtchunk
 	@(echo > .memdump)
 	@echo -n html-chunking
 	@(for i in $(srcdir)/test/gdp-handbook.xml ; do \
 	  base=`basename $$i .xml` ; \
-	  html=$(srcdir)/result/html/$$base.html; \
+	  html=result/html/$$base.html; \
 	  log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
-		-o $(srcdir)/result/xtchunk/html/gdp-handbook \
+		-o result/xtchunk/html/gdp-handbook \
 		$(srcdir)/html/xtchunk.xsl $$i 2> $$base.err ; \
 	    if [ -f $(srcdir)/result/html/$$base.err ] ; then \
 		diff $(srcdir)/result/html/$$base.err $$base.err ; \
@@ -102,24 +108,24 @@ xtchunk:
 	    else \
 		mv $$base.err $(srcdir)/result/html/$$base.err ; \
 	    fi ; \
-	    for html in $(srcdir)/result/xtchunk/html/*.html ; do \
-	      orig=$(srcdir)/result/xtchunk/html/\`basename $$html .html\`.orig ;\
-	      if [ -f $$orig ] ; then \
+	    for html in result/xtchunk/html/*.html ; do \
+	      orig=result/xtchunk/html/\`basename $$html .html\`.orig ;\
+	      if [ -f $(srcdir)/$$orig ] ; then \
 		  grep -v id < $$html > $$html.noid ; \
-		  grep -v id < $$orig > $$orig.noid ; \
+		  grep -v id < $(srcdir)/$$orig > $$orig.noid ; \
 		  diff $$orig.noid $$html.noid ; \
 		  rm -f $$html.noid $$orig.noid $$html; \
 	      else \
-		  mv $$html $$orig ; \
+		  mv $$html $(srcdir)/$$orig ; \
 		fi ; \
 	    done ; \
 	    grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true` ; \
 	  if [ -n "$$log" ] ; then \
 		echo ; \
-	  	echo result ; \
+		echo result ; \
 		echo $$log ; \
 	  fi ; \
-	  rm -f $(srcdir)/result/xtchunk/html/gdp-handbook ; \
+	  rm -f result/xtchunk/html/gdp-handbook ; \
 	  done )
 	@echo
 
@@ -127,61 +133,64 @@ xtchunk:
 # The full set of tests
 #
 htmltests: $(top_builddir)/xsltproc/xsltproc
+	@$(MKDIR_P) result/html
 	@(echo > .memdump)
 	@echo "##"
 	@echo "## HTML stylesheets regression tests"
 	@echo "##"
 	@(for i in $(srcdir)/test/*.xml ; do \
 	  echo $$i ; \
-	  out=$(srcdir)/result/html/`basename $$i .xml`.tst; \
-	  html=$(srcdir)/result/html/`basename $$i .xml`.html; \
+	  out=result/html/`basename $$i .xml`.tst; \
+	  html=result/html/`basename $$i .xml`.html; \
 	  $(CHECKER) $(top_builddir)/xsltproc/xsltproc --nonet $(srcdir)/html/docbook.xsl $$i > $$out ; \
-	  if [ -f $$html ] ; then \
-	      grep -v id < $$html > $$html.noid ; \
+	  if [ -f $(srcdir)/$$html ] ; then \
+	      grep -v id < $(srcdir)/$$html > $$html.noid ; \
 	      grep -v id < $$out > $$out.noid ; \
 	      diff $$html.noid $$out.noid ; \
 	      rm -f $$html.noid $$out.noid ; \
-	  else mv $$out $$html ; fi ; \
+	  else mv $$out $(srcdir)/$$html ; fi ; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true;\
 	  rm -f $$out ; done )
 
 fotests: $(top_builddir)/xsltproc/xsltproc
+	@$(MKDIR_P) result/fo
 	@(echo > .memdump)
 	@echo "##"
 	@echo "## XSL FO stylesheets regression tests"
 	@echo "##"
 	@(for i in $(srcdir)/test/*.xml ; do \
 	  echo $$i ; \
-	  out=$(srcdir)/result/fo/`basename $$i .xml`.tst; \
-	  fo=$(srcdir)/result/fo/`basename $$i .xml`.fo; \
-	  msg=$(srcdir)/result/fo/`basename $$i .xml`.msg; \
+	  out=result/fo/`basename $$i .xml`.tst; \
+	  fo=result/fo/`basename $$i .xml`.fo; \
+	  msg=result/fo/`basename $$i .xml`.msg; \
 	  $(CHECKER) $(top_builddir)/xsltproc/xsltproc --nonet $(srcdir)/fo/docbook.xsl $$i > $$out  2> $$msg ; \
-	  if [ -f $$fo ] ; then \
-	      grep -v id < $$fo > $$fo.noid ; \
+	  if [ -f $(srcdir)/$$fo ] ; then \
+	      grep -v id < $(srcdir)/$$fo > $$fo.noid ; \
 	      grep -v id < $$out > $$out.noid ; \
 	      diff $$fo.noid $$out.noid ; \
 	      rm -f $$fo.noid $$out.noid ; \
-	  else mv $$out $$fo ; fi ; \
+	  else mv $$out $(srcdir)/$$fo ; fi ; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true;\
 	  rm -f $$out $$msg ; \
 	  done )
 
 xhtmltests: $(top_builddir)/xsltproc/xsltproc
+	@$(MKDIR_P) result/xhtml
 	@(echo > .memdump)
 	@echo "##"
 	@echo "## XHTML stylesheets regression tests"
 	@echo "##"
 	@(for i in $(srcdir)/test/*.xml ; do \
 	  echo $$i ; \
-	  out=$(srcdir)/result/xhtml/`basename $$i .xml`.tst; \
-	  xhtml=$(srcdir)/result/xhtml/`basename $$i .xml`.xhtml; \
+	  out=result/xhtml/`basename $$i .xml`.tst; \
+	  xhtml=result/xhtml/`basename $$i .xml`.xhtml; \
 	  $(CHECKER) $(top_builddir)/xsltproc/xsltproc --nonet $(srcdir)/xhtml/docbook.xsl $$i > $$out ; \
-	  if [ -f $$xhtml ] ; then \
-	      grep -v id < $$xhtml > $$xhtml.noid ; \
+	  if [ -f $(srcdir)/$$xhtml ] ; then \
+	      grep -v id < $(srcdir)/$$xhtml > $$xhtml.noid ; \
 	      grep -v id < $$out > $$out.noid ; \
 	      diff $$xhtml.noid $$out.noid ; \
 	      rm -f $$xhtml.noid $$out.noid ; \
-	  else mv $$out $$xhtml ; fi ; \
+	  else mv $$out $(srcdir)/$$xhtml ; fi ; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true;\
 	  rm -f $$out ; done )
 
diff --git a/tests/docs/Makefile.am b/tests/docs/Makefile.am
index 43937399..9e2204ff 100644
--- a/tests/docs/Makefile.am
+++ b/tests/docs/Makefile.am
@@ -172,6 +172,4 @@ EXTRA_DIST =	\
 	array.xml \
 	items.xml
 
-all:
-
 tests:
diff --git a/tests/documents/Makefile.am b/tests/documents/Makefile.am
index 88a9c733..6cd98a08 100644
--- a/tests/documents/Makefile.am
+++ b/tests/documents/Makefile.am
@@ -10,8 +10,7 @@ EXTRA_DIST = \
     result.xhtml system.xml test_bad.err test_bad.result \
     test_bad.xml test.result test.xml test.xsl worklog.xml
 
-
-all:
+CLEANFILES = .memdump
 
 valgrind:
 	@echo '## Running the regression tests under Valgrind'
diff --git a/tests/exslt/Makefile.am b/tests/exslt/Makefile.am
index bbfc7e3e..800701b1 100644
--- a/tests/exslt/Makefile.am
+++ b/tests/exslt/Makefile.am
@@ -2,8 +2,6 @@
 
 SUBDIRS=common functions math sets strings dynamic date
 
-all:
-
 test tests:
 	@(cur=`pwd` ; for dir in $(SUBDIRS) ; do cd $$dir ; $(MAKE) CHECKER='$(CHECKER)' tests ; cd $$cur ; done)
 
diff --git a/tests/exslt/common/Makefile.am b/tests/exslt/common/Makefile.am
index 176ec77b..cde7a449 100644
--- a/tests/exslt/common/Makefile.am
+++ b/tests/exslt/common/Makefile.am
@@ -16,7 +16,7 @@ EXTRA_DIST = 						\
 	import-test1a.imp import-test1b.imp import-test1.out \
 	import-test1.xml import-test1.xsl
 
-all:
+CLEANFILES = .memdump
 
 valgrind:
 	@echo '## Running the regression tests under Valgrind'
diff --git a/tests/exslt/date/Makefile.am b/tests/exslt/date/Makefile.am
index 52e23082..7e0e22b6 100644
--- a/tests/exslt/date/Makefile.am
+++ b/tests/exslt/date/Makefile.am
@@ -34,7 +34,7 @@ EXTRA_DIST = 						\
 	seconds.1.out	seconds.1.xml	seconds.1.xsl	\
 	seconds.2.out	seconds.2.xml	seconds.2.xsl
 
-all:
+CLEANFILES = .memdump
 
 test-current:
 	@(echo > .memdump)
diff --git a/tests/exslt/dynamic/Makefile.am b/tests/exslt/dynamic/Makefile.am
index 3cf82638..bcc7eb38 100644
--- a/tests/exslt/dynamic/Makefile.am
+++ b/tests/exslt/dynamic/Makefile.am
@@ -6,7 +6,7 @@ $(top_builddir)/xsltproc/xsltproc:
 EXTRA_DIST = 							\
   dynmap.out     dynmap.xml     dynmap.xsl
 
-all:
+CLEANFILES = .memdump
 
 valgrind:
 	@echo '## Running the regression tests under Valgrind'
diff --git a/tests/exslt/functions/Makefile.am b/tests/exslt/functions/Makefile.am
index 88e8c8d2..32481061 100644
--- a/tests/exslt/functions/Makefile.am
+++ b/tests/exslt/functions/Makefile.am
@@ -15,7 +15,7 @@ EXTRA_DIST = 						\
 	function.9.out  function.9.xml  function.9.xsl  \
 	function.10.out function.10.xml function.10.xsl
 
-all:
+CLEANFILES = .memdump
 
 valgrind:
 	@echo '## Running the regression tests under Valgrind'
diff --git a/tests/exslt/math/Makefile.am b/tests/exslt/math/Makefile.am
index 117901c2..a4785d72 100644
--- a/tests/exslt/math/Makefile.am
+++ b/tests/exslt/math/Makefile.am
@@ -17,7 +17,7 @@ EXTRA_DIST = 						\
 	min.1.out      min.1.xml      min.1.xsl		\
 	min.2.out      min.2.xml      min.2.xsl
 
-all:
+CLEANFILES = .memdump
 
 valgrind:
 	@echo '## Running the regression tests under Valgrind'
diff --git a/tests/exslt/sets/Makefile.am b/tests/exslt/sets/Makefile.am
index 3eaac3cb..634acb4e 100644
--- a/tests/exslt/sets/Makefile.am
+++ b/tests/exslt/sets/Makefile.am
@@ -10,7 +10,7 @@ EXTRA_DIST = 							\
   leading.1.out        leading.1.xml        leading.1.xsl	\
   trailing.1.out       trailing.1.xml       trailing.1.xsl
 
-all:
+CLEANFILES = .memdump
 
 valgrind:
 	@echo '## Running the regression tests under Valgrind'
diff --git a/tests/exslt/strings/Makefile.am b/tests/exslt/strings/Makefile.am
index 5bdbd2a0..0645b6d3 100644
--- a/tests/exslt/strings/Makefile.am
+++ b/tests/exslt/strings/Makefile.am
@@ -10,7 +10,7 @@ EXTRA_DIST = 						\
 	split.1.xml split.1.xsl split.1.out \
 	replace.1.xml replace.1.xsl replace.1.out 
 
-all:
+CLEANFILES = .memdump
 
 valgrind:
 	@echo '## Running the regression tests under Valgrind'
diff --git a/tests/extensions/Makefile.am b/tests/extensions/Makefile.am
index 31cfe67d..4cf132d3 100644
--- a/tests/extensions/Makefile.am
+++ b/tests/extensions/Makefile.am
@@ -7,8 +7,7 @@ EXTRA_DIST = \
     module.xml module.xsl module.out \
     list.xml list.xsl list.out
 
-
-all:
+CLEANFILES = .memdump
 
 valgrind:
 	@echo '## Running the regression tests under Valgrind'
diff --git a/tests/general/Makefile.am b/tests/general/Makefile.am
index 72d649b5..b6c738bd 100644
--- a/tests/general/Makefile.am
+++ b/tests/general/Makefile.am
@@ -185,8 +185,7 @@ EXTRA_DIST = \
     itemschoose.out itemschoose.xsl \
     inner.xsl date_add.xsl
 
-
-all:
+CLEANFILES = .memdump
 
 valgrind:
 	@echo '## Running the regression tests under Valgrind'
diff --git a/tests/keys/Makefile.am b/tests/keys/Makefile.am
index 2666a703..08e645d9 100644
--- a/tests/keys/Makefile.am
+++ b/tests/keys/Makefile.am
@@ -5,7 +5,7 @@ $(top_builddir)/xsltproc/xsltproc:
 
 EXTRA_DIST = dates.xml month.xml month.xsl month.out
 
-all:
+CLEANFILES = .memdump
 
 valgrind:
 	@echo '## Running the regression tests under Valgrind'
diff --git a/tests/multiple/Makefile.am b/tests/multiple/Makefile.am
index d2e4abc9..ceaaa760 100644
--- a/tests/multiple/Makefile.am
+++ b/tests/multiple/Makefile.am
@@ -28,7 +28,7 @@ GENERATED = \
 	out/letterw.html out/letterx.html out/lettery.html out/letterz.html \
 	out/titlepage.html
 
-all:
+CLEANFILES = .memdump
 
 valgrind:
 	@echo '## Running the regression tests under Valgrind'
diff --git a/tests/namespaces/Makefile.am b/tests/namespaces/Makefile.am
index edc9b2f3..72f976e8 100644
--- a/tests/namespaces/Makefile.am
+++ b/tests/namespaces/Makefile.am
@@ -16,7 +16,7 @@ EXTRA_DIST = \
     tst8.xml tst8.xsl tst8.out \
     tst9.xml tst9.xsl tst9.out
 
-all:
+CLEANFILES = .memdump
 
 valgrind:
 	@echo '## Running the regression tests under Valgrind'
diff --git a/tests/numbers/Makefile.am b/tests/numbers/Makefile.am
index b03e7230..2ca6eba5 100644
--- a/tests/numbers/Makefile.am
+++ b/tests/numbers/Makefile.am
@@ -5,7 +5,7 @@ $(top_builddir)/xsltproc/xsltproc:
 
 EXTRA_DIST = format-number.xsl format-number.xml format-number.out
 
-all:
+CLEANFILES = .memdump
 
 valgrind:
 	@echo '## Running the regression tests under Valgrind'
diff --git a/tests/plugins/Makefile.am b/tests/plugins/Makefile.am
index b008f622..e0736ab9 100644
--- a/tests/plugins/Makefile.am
+++ b/tests/plugins/Makefile.am
@@ -5,28 +5,28 @@ $(top_builddir)/xsltproc/xsltproc:
 
 EXTRA_DIST = plugin.out	plugin.xml plugin.xsl
 
-INCLUDES = -I$(top_srcdir) -I../../libxslt $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir) -I../../libxslt
 
-EXTRA_LTLIBRARIES = xmlsoft_org_xslt_testplugin.la
+CLEANFILES = *.res
+
+if WITH_MODULES
+
+noinst_LTLIBRARIES = xmlsoft_org_xslt_testplugin.la
 
 # our rpath is a rather unorthodox location as we 
 # don't want to pollute $(DESTDIR) with the test plugin
 
-plugindir=$(shell pwd)/.libs/
+plugindir = $(abs_builddir)/.libs
 
 xmlsoft_org_xslt_testplugin_la_CFLAGS = -DMODULE_COMPILE $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS)
 xmlsoft_org_xslt_testplugin_la_SOURCES = testplugin.c
 xmlsoft_org_xslt_testplugin_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(EXTRA_LIBS)
 xmlsoft_org_xslt_testplugin_la_LDFLAGS = -module -avoid-version -rpath $(plugindir)
 
-all:
-
-if WITH_MODULES
-
 test-logall:
 	@echo '## Running plugin tests'
 
-test tests: $(top_builddir)/xsltproc/xsltproc test-logall $(EXTRA_LTLIBRARIES)
+test tests: $(top_builddir)/xsltproc/xsltproc test-logall $(noinst_LTLIBRARIES)
 	@LD_LIBRARY_PATH=$(plugindir):$(top_builddir)/libxslt/.libs:$(LD_LIBRARY_PATH) \
 	 LIBXSLT_PLUGINS_PATH=$(plugindir) \
 	 $(top_builddir)/xsltproc/xsltproc plugin.xsl plugin.xml > plugin.res
diff --git a/tests/reports/Makefile.am b/tests/reports/Makefile.am
index 14bb655d..bd08d249 100644
--- a/tests/reports/Makefile.am
+++ b/tests/reports/Makefile.am
@@ -11,8 +11,7 @@ EXTRA_DIST = \
 	recglobparam.xsl recglobvar.xsl reclocparam.xsl reclocvar.xsl \
 	recglobparam.xml recglobvar.xml reclocparam.xml reclocvar.xml 
 
-
-all:
+CLEANFILES = .memdump
 
 valgrind:
 	@echo '## Running the regression tests under Valgrind'
diff --git a/tests/xinclude/Makefile.am b/tests/xinclude/Makefile.am
index 60009df3..8d408ded 100644
--- a/tests/xinclude/Makefile.am
+++ b/tests/xinclude/Makefile.am
@@ -11,7 +11,7 @@ EXTRA_DIST =		\
 	normal.out	\
 	xinclude.out
 
-all:
+CLEANFILES = .memdump
 
 valgrind:
 	@echo '## Running the regression tests under Valgrind'
diff --git a/tests/xmlspec/Makefile.am b/tests/xmlspec/Makefile.am
index babe870b..ff55d82d 100644
--- a/tests/xmlspec/Makefile.am
+++ b/tests/xmlspec/Makefile.am
@@ -7,7 +7,7 @@ EXTRA_DIST = REC-xml-20001006.xml xmlspec-v21.dtd W3C-REC.css \
              logo-REC xmlspec.xsl REC-xml-2e.xsl diffspec.xsl \
 	     REC-xml-20001006.html REC-xml-20001006-review.html
 
-all:
+CLEANFILES = .memdump debug
 
 valgrind:
 	@echo '## Running the regression tests under Valgrind'