- tests/documents/Makefile.am tests/general/Makefile.am

  tests/multiple/Makefile.am tests/namespaces/Makefile.am
  tests/numbers/Makefile.am tests/xmlspec/Makefile.am:
  Seems some of the changes I made for 0.9.0 Makefiles were
  not commited ...
Daniel

9 files changed, 109 insertions, 108 deletions

diff --git a/tests/REC2/Makefile.am b/tests/REC2/Makefile.am
index 0e03c5ae..683f3acc 100644
--- a/tests/REC2/Makefile.am
+++ b/tests/REC2/Makefile.am
@@ -8,17 +8,17 @@ EXTRA_DIST = data.xml vrml.xsl vrml.xml svg.xsl svg.xml	html.xsl html.xml
 all: test
 
 test tests: $(top_builddir)/libxslt/xsltproc
-	@(rm -f .memdump ; touch .memdump)
-	@($(top_builddir)/libxslt/xsltproc vrml.xsl data.xml > vrml.res ; \
-	diff vrml.xml vrml.res ; \
+	@(echo > .memdump)
+	@($(top_builddir)/libxslt/xsltproc $(srcdir)/vrml.xsl $(srcdir)/data.xml > vrml.res ; \
+	diff $(srcdir)/vrml.xml vrml.res ; \
 	grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
 	rm -f vrml.res)
-	@($(top_builddir)/libxslt/xsltproc svg.xsl data.xml > svg.res ; \
-	diff svg.xml svg.res ; \
+	@($(top_builddir)/libxslt/xsltproc $(srcdir)/svg.xsl $(srcdir)/data.xml > svg.res ; \
+	diff $(srcdir)/svg.xml svg.res ; \
 	grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
 	rm -f svg.res)
-	@($(top_builddir)/libxslt/xsltproc html.xsl data.xml > html.res ; \
-	diff html.xml html.res ; \
+	@($(top_builddir)/libxslt/xsltproc $(srcdir)/html.xsl $(srcdir)/data.xml > html.res ; \
+	diff $(srcdir)/html.xml html.res ; \
 	grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
 	rm -f html.res)
 
diff --git a/tests/XSLTMark/Makefile.am b/tests/XSLTMark/Makefile.am
index 2ed853a5..9be0d110 100644
--- a/tests/XSLTMark/Makefile.am
+++ b/tests/XSLTMark/Makefile.am
@@ -76,9 +76,9 @@ db10000.xml: $(srcdir)/dbgen.pl
 	perl $(srcdir)/dbgen.pl 10000 > db10000.xml
 
 alphabetize: db100.xml
-	@(rm -f .memdump ; touch .memdump)
+	@(echo > .memdump)
 	@(echo alphabetize)
-	@($(top_builddir)/libxslt/xsltproc alphabetize.xsl db100.xml > alphabetize.tmp; \
+	@($(top_builddir)/libxslt/xsltproc $(srcdir)/alphabetize.xsl db100.xml > alphabetize.tmp; \
 	  if [ ! -f $(srcdir)/alphabetize.out ] ; then cp alphabetize.tmp $(srcdir)/alphabetize.out ; \
 	  else diff $(srcdir)/alphabetize.out alphabetize.tmp ; fi ; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0 )
@@ -87,9 +87,9 @@ alphabetize: db100.xml
 # reference=alphabetize.ref
 
 avts: db100.xml
-	@(rm -f .memdump ; touch .memdump)
+	@(echo > .memdump)
 	@(echo avts)
-	@($(top_builddir)/libxslt/xsltproc avts.xsl db100.xml > avts.tmp; \
+	@($(top_builddir)/libxslt/xsltproc $(srcdir)/avts.xsl db100.xml > avts.tmp; \
 	  if [ ! -f $(srcdir)/avts.out ] ; then cp avts.tmp $(srcdir)/avts.out ; \
 	  else diff $(srcdir)/avts.out avts.tmp ; fi ; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0 )
@@ -97,9 +97,9 @@ avts: db100.xml
 # reference=avts.ref
 
 creation: db100.xml
-	@(rm -f .memdump ; touch .memdump)
+	@(echo > .memdump)
 	@(echo creation)
-	@($(top_builddir)/libxslt/xsltproc creation.xsl db100.xml > creation.tmp; \
+	@($(top_builddir)/libxslt/xsltproc $(srcdir)/creation.xsl db100.xml > creation.tmp; \
 	  if [ ! -f $(srcdir)/creation.out ] ; then cp creation.tmp $(srcdir)/creation.out ; \
 	  else diff $(srcdir)/creation.out creation.tmp ; fi ; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0 )
@@ -107,9 +107,9 @@ creation: db100.xml
 # reference=creation.ref
 
 dbonerow: db10000.xml
-	@(rm -f .memdump ; touch .memdump)
+	@(echo > .memdump)
 	@(echo dbonerow)
-	@($(top_builddir)/libxslt/xsltproc dbonerow.xsl db10000.xml > dbonerow.tmp; \
+	@($(top_builddir)/libxslt/xsltproc $(srcdir)/dbonerow.xsl db10000.xml > dbonerow.tmp; \
 	  if [ ! -f $(srcdir)/dbonerow.out ] ; then cp dbonerow.tmp $(srcdir)/dbonerow.out ; \
 	  else diff $(srcdir)/dbonerow.out dbonerow.tmp ; fi ; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0 )
@@ -117,9 +117,9 @@ dbonerow: db10000.xml
 # reference=dbonerow.ref
 
 dbtail: db100.xml
-	@(rm -f .memdump ; touch .memdump)
+	@(echo > .memdump)
 	@(echo dbtail)
-	@($(top_builddir)/libxslt/xsltproc dbtail.xsl db100.xml > dbtail.tmp; \
+	@($(top_builddir)/libxslt/xsltproc $(srcdir)/dbtail.xsl db100.xml > dbtail.tmp; \
 	  if [ ! -f $(srcdir)/dbtail.out ] ; then cp dbtail.tmp $(srcdir)/dbtail.out ; \
 	  else diff $(srcdir)/dbtail.out dbtail.tmp ; fi ; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0 )
@@ -127,9 +127,9 @@ dbtail: db100.xml
 # reference=dbtail.ref
 
 decoy: db100.xml
-	@(rm -f .memdump ; touch .memdump)
+	@(echo > .memdump)
 	@(echo decoy)
-	@($(top_builddir)/libxslt/xsltproc decoy.xsl db100.xml > decoy.tmp; \
+	@($(top_builddir)/libxslt/xsltproc $(srcdir)/decoy.xsl db100.xml > decoy.tmp; \
 	  if [ ! -f $(srcdir)/decoy.out ] ; then cp decoy.tmp $(srcdir)/decoy.out ; \
 	  else diff $(srcdir)/decoy.out decoy.tmp ; fi ; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0 )
@@ -137,9 +137,9 @@ decoy: db100.xml
 # reference=patterns.ref
 
 encrypt: db100.xml
-	@(rm -f .memdump ; touch .memdump)
+	@(echo > .memdump)
 	@(echo encrypt)
-	@($(top_builddir)/libxslt/xsltproc encrypt.xsl db100.xml > encrypt.tmp; \
+	@($(top_builddir)/libxslt/xsltproc $(srcdir)/encrypt.xsl db100.xml > encrypt.tmp; \
 	  if [ ! -f $(srcdir)/encrypt.out ] ; then cp encrypt.tmp $(srcdir)/encrypt.out ; \
 	  else diff $(srcdir)/encrypt.out encrypt.tmp ; fi ; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0 )
@@ -147,9 +147,9 @@ encrypt: db100.xml
 # reference=encrypt.ref
 
 functions: db100.xml
-	@(rm -f .memdump ; touch .memdump)
+	@(echo > .memdump)
 	@(echo functions)
-	@($(top_builddir)/libxslt/xsltproc functions.xsl db100.xml > functions.tmp; \
+	@($(top_builddir)/libxslt/xsltproc $(srcdir)/functions.xsl db100.xml > functions.tmp; \
 	  if [ ! -f $(srcdir)/functions.out ] ; then cp functions.tmp $(srcdir)/functions.out ; \
 	  else diff $(srcdir)/functions.out functions.tmp ; fi ; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0 )
@@ -157,9 +157,9 @@ functions: db100.xml
 # reference=functions.ref
 
 identity: db1000.xml
-	@(rm -f .memdump ; touch .memdump)
+	@(echo > .memdump)
 	@(echo identity)
-	@($(top_builddir)/libxslt/xsltproc identity.xsl db1000.xml > identity.tmp; \
+	@($(top_builddir)/libxslt/xsltproc $(srcdir)/identity.xsl db1000.xml > identity.tmp; \
 	  if [ ! -f $(srcdir)/identity.out ] ; then cp identity.tmp $(srcdir)/identity.out ; \
 	  else diff $(srcdir)/identity.out identity.tmp ; fi ; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0 )
@@ -167,9 +167,9 @@ identity: db1000.xml
 # reference=identity.ref
 
 inventory:
-	@(rm -f .memdump ; touch .memdump)
+	@(echo > .memdump)
 	@(echo inventory)
-	@($(top_builddir)/libxslt/xsltproc inventory.xsl inventory.xml > inventory.tmp; \
+	@($(top_builddir)/libxslt/xsltproc $(srcdir)/inventory.xsl $(srcdir)/inventory.xml > inventory.tmp; \
 	  if [ ! -f $(srcdir)/inventory.out ] ; then cp inventory.tmp $(srcdir)/inventory.out ; \
 	  else diff $(srcdir)/inventory.out inventory.tmp ; fi ; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0 )
@@ -177,9 +177,9 @@ inventory:
 # reference=inventory.ref
 
 patterns: db100.xml
-	@(rm -f .memdump ; touch .memdump)
+	@(echo > .memdump)
 	@(echo patterns)
-	@($(top_builddir)/libxslt/xsltproc patterns.xsl db100.xml > patterns.tmp; \
+	@($(top_builddir)/libxslt/xsltproc $(srcdir)/patterns.xsl db100.xml > patterns.tmp; \
 	  if [ ! -f $(srcdir)/patterns.out ] ; then cp patterns.tmp $(srcdir)/patterns.out ; \
 	  else diff $(srcdir)/patterns.out patterns.tmp ; fi ; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0 )
@@ -187,9 +187,9 @@ patterns: db100.xml
 # reference=patterns.ref
 
 prettyprint: db100.xml
-	@(rm -f .memdump ; touch .memdump)
+	@(echo > .memdump)
 	@(echo prettyprint)
-	@($(top_builddir)/libxslt/xsltproc prettyprint.xsl db100.xml > prettyprint.tmp; \
+	@($(top_builddir)/libxslt/xsltproc $(srcdir)/prettyprint.xsl db100.xml > prettyprint.tmp; \
 	  if [ ! -f $(srcdir)/prettyprint.out ] ; then cp prettyprint.tmp $(srcdir)/prettyprint.out ; \
 	  else diff $(srcdir)/prettyprint.out prettyprint.tmp ; fi ; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0 )
@@ -197,9 +197,9 @@ prettyprint: db100.xml
 # reference=prettyprint.ref
 
 stringsort: db1000.xml
-	@(rm -f .memdump ; touch .memdump)
+	@(echo > .memdump)
 	@(echo stringsort)
-	@($(top_builddir)/libxslt/xsltproc stringsort.xsl db1000.xml > stringsort.tmp; \
+	@($(top_builddir)/libxslt/xsltproc $(srcdir)/stringsort.xsl db1000.xml > stringsort.tmp; \
 	  if [ ! -f $(srcdir)/stringsort.out ] ; then cp stringsort.tmp $(srcdir)/stringsort.out ; \
 	  else diff $(srcdir)/stringsort.out stringsort.tmp ; fi ; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0 )
@@ -209,9 +209,9 @@ stringsort: db1000.xml
 endif
 
 attsets:
-	@(rm -f .memdump ; touch .memdump)
+	@(echo > .memdump)
 	@(echo attsets)
-	@($(top_builddir)/libxslt/xsltproc attsets.xsl chart.xml > attsets.tmp; \
+	@($(top_builddir)/libxslt/xsltproc $(srcdir)/attsets.xsl $(srcdir)/chart.xml > attsets.tmp; \
 	  if [ ! -f $(srcdir)/attsets.out ] ; then cp attsets.tmp $(srcdir)/attsets.out ; \
 	  else diff $(srcdir)/attsets.out attsets.tmp ; fi ; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0 )
@@ -219,9 +219,9 @@ attsets:
 # reference=attsets.ref
 
 axis:
-	@(rm -f .memdump ; touch .memdump)
+	@(echo > .memdump)
 	@(echo axis)
-	@($(top_builddir)/libxslt/xsltproc axis.xsl axis.xml > axis.tmp; \
+	@($(top_builddir)/libxslt/xsltproc $(srcdir)/axis.xsl $(srcdir)/axis.xml > axis.tmp; \
 	  if [ ! -f $(srcdir)/axis.out ] ; then cp axis.tmp $(srcdir)/axis.out ; \
 	  else diff $(srcdir)/axis.out axis.tmp ; fi ; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0 )
@@ -229,9 +229,9 @@ axis:
 # reference=axis.ref
 
 backwards:
-	@(rm -f .memdump ; touch .memdump)
+	@(echo > .memdump)
 	@(echo backwards)
-	@($(top_builddir)/libxslt/xsltproc backwards.xsl game.xml > backwards.tmp; \
+	@($(top_builddir)/libxslt/xsltproc $(srcdir)/backwards.xsl $(srcdir)/game.xml > backwards.tmp; \
 	  if [ ! -f $(srcdir)/backwards.out ] ; then cp backwards.tmp $(srcdir)/backwards.out ; \
 	  else diff $(srcdir)/backwards.out backwards.tmp ; fi ; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0 )
@@ -239,9 +239,9 @@ backwards:
 # reference=backwards.ref
 
 bottles:
-	@(rm -f .memdump ; touch .memdump)
+	@(echo > .memdump)
 	@(echo bottles)
-	@($(top_builddir)/libxslt/xsltproc bottles.xsl bottles.xml > bottles.tmp; \
+	@($(top_builddir)/libxslt/xsltproc $(srcdir)/bottles.xsl $(srcdir)/bottles.xml > bottles.tmp; \
 	  if [ ! -f $(srcdir)/bottles.out ] ; then cp bottles.tmp $(srcdir)/bottles.out ; \
 	  else diff $(srcdir)/bottles.out bottles.tmp ; fi ; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0 )
@@ -249,9 +249,9 @@ bottles:
 # reference=bottles.ref
 
 breadth:
-	@(rm -f .memdump ; touch .memdump)
+	@(echo > .memdump)
 	@(echo breadth)
-	@($(top_builddir)/libxslt/xsltproc find.xsl breadth.xml > breadth.tmp; \
+	@($(top_builddir)/libxslt/xsltproc $(srcdir)/find.xsl $(srcdir)/breadth.xml > breadth.tmp; \
 	  if [ ! -f $(srcdir)/breadth.out ] ; then cp breadth.tmp $(srcdir)/breadth.out ; \
 	  else diff $(srcdir)/breadth.out breadth.tmp ; fi ; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0 )
@@ -259,9 +259,9 @@ breadth:
 # reference=breadth.ref
 
 brutal:
-	@(rm -f .memdump ; touch .memdump)
+	@(echo > .memdump)
 	@(echo brutal)
-	@($(top_builddir)/libxslt/xsltproc brutal.xsl brutal.xml > brutal.tmp; \
+	@($(top_builddir)/libxslt/xsltproc $(srcdir)/brutal.xsl $(srcdir)/brutal.xml > brutal.tmp; \
 	  if [ ! -f $(srcdir)/brutal.out ] ; then cp brutal.tmp $(srcdir)/brutal.out ; \
 	  else diff $(srcdir)/brutal.out brutal.tmp ; fi ; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0 )
@@ -269,9 +269,9 @@ brutal:
 # reference=brutal.ref
 
 chart:
-	@(rm -f .memdump ; touch .memdump)
+	@(echo > .memdump)
 	@(echo chart)
-	@($(top_builddir)/libxslt/xsltproc chart.xsl chart.xml > chart.tmp; \
+	@($(top_builddir)/libxslt/xsltproc $(srcdir)/chart.xsl $(srcdir)/chart.xml > chart.tmp; \
 	  if [ ! -f $(srcdir)/chart.out ] ; then cp chart.tmp $(srcdir)/chart.out ; \
 	  else diff $(srcdir)/chart.out chart.tmp ; fi ; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0 )
@@ -279,9 +279,9 @@ chart:
 # reference=chart.ref
 
 current:
-	@(rm -f .memdump ; touch .memdump)
+	@(echo > .memdump)
 	@(echo current)
-	@($(top_builddir)/libxslt/xsltproc current.xsl current.xml > current.tmp; \
+	@($(top_builddir)/libxslt/xsltproc $(srcdir)/current.xsl $(srcdir)/current.xml > current.tmp; \
 	  if [ ! -f $(srcdir)/current.out ] ; then cp current.tmp $(srcdir)/current.out ; \
 	  else diff $(srcdir)/current.out current.tmp ; fi ; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0 )
@@ -289,9 +289,9 @@ current:
 # reference=current.ref
 
 depth:
-	@(rm -f .memdump ; touch .memdump)
+	@(echo > .memdump)
 	@(echo depth)
-	@($(top_builddir)/libxslt/xsltproc find.xsl depth.xml > depth.tmp; \
+	@($(top_builddir)/libxslt/xsltproc $(srcdir)/find.xsl $(srcdir)/depth.xml > depth.tmp; \
 	  if [ ! -f $(srcdir)/depth.out ] ; then cp depth.tmp $(srcdir)/depth.out ; \
 	  else diff $(srcdir)/depth.out depth.tmp ; fi ; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0 )
@@ -299,9 +299,9 @@ depth:
 # reference=depth.ref
 
 game:
-	@(rm -f .memdump ; touch .memdump)
+	@(echo > .memdump)
 	@(echo game)
-	@($(top_builddir)/libxslt/xsltproc game.xsl game.xml > game.tmp; \
+	@($(top_builddir)/libxslt/xsltproc $(srcdir)/game.xsl $(srcdir)/game.xml > game.tmp; \
 	  if [ ! -f $(srcdir)/game.out ] ; then cp game.tmp $(srcdir)/game.out ; \
 	  else diff $(srcdir)/game.out game.tmp ; fi ; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0 )
@@ -309,9 +309,9 @@ game:
 # reference=game.ref
 
 html:
-	@(rm -f .memdump ; touch .memdump)
+	@(echo > .memdump)
 	@(echo html)
-	@($(top_builddir)/libxslt/xsltproc html.xsl html.xml > html.tmp; \
+	@($(top_builddir)/libxslt/xsltproc $(srcdir)/html.xsl $(srcdir)/html.xml > html.tmp; \
 	  if [ ! -f $(srcdir)/html.out ] ; then cp html.tmp $(srcdir)/html.out ; \
 	  else diff $(srcdir)/html.out html.tmp ; fi ; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0 )
@@ -319,9 +319,9 @@ html:
 # reference=html.ref
 
 metric:
-	@(rm -f .memdump ; touch .memdump)
+	@(echo > .memdump)
 	@(echo metric)
-	@($(top_builddir)/libxslt/xsltproc metric.xsl metric.xml > metric.tmp; \
+	@($(top_builddir)/libxslt/xsltproc $(srcdir)/metric.xsl $(srcdir)/metric.xml > metric.tmp; \
 	  if [ ! -f $(srcdir)/metric.out ] ; then cp metric.tmp $(srcdir)/metric.out ; \
 	  else diff $(srcdir)/metric.out metric.tmp ; fi ; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0 )
@@ -329,9 +329,9 @@ metric:
 # reference=metric.ref
 
 number:
-	@(rm -f .memdump ; touch .memdump)
+	@(echo > .memdump)
 	@(echo number)
-	@($(top_builddir)/libxslt/xsltproc number.xsl number.xml > number.tmp; \
+	@($(top_builddir)/libxslt/xsltproc $(srcdir)/number.xsl $(srcdir)/number.xml > number.tmp; \
 	  if [ ! -f $(srcdir)/number.out ] ; then cp number.tmp $(srcdir)/number.out ; \
 	  else diff $(srcdir)/number.out number.tmp ; fi ; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0 )
@@ -339,9 +339,9 @@ iterations=100
 skipdriver=ExternalDriver:txdriver
 
 oddtemplate:
-	@(rm -f .memdump ; touch .memdump)
+	@(echo > .memdump)
 	@(echo oddtemplate)
-	@($(top_builddir)/libxslt/xsltproc oddtemplate.xsl oddtemplate.xml > oddtemplate.tmp; \
+	@($(top_builddir)/libxslt/xsltproc $(srcdir)/oddtemplate.xsl $(srcdir)/oddtemplate.xml > oddtemplate.tmp; \
 	  if [ ! -f $(srcdir)/oddtemplate.out ] ; then cp oddtemplate.tmp $(srcdir)/oddtemplate.out ; \
 	  else diff $(srcdir)/oddtemplate.out oddtemplate.tmp ; fi ; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0 )
@@ -349,9 +349,9 @@ oddtemplate:
 # reference=oddtemplate.ref
 
 priority:
-	@(rm -f .memdump ; touch .memdump)
+	@(echo > .memdump)
 	@(echo priority)
-	@($(top_builddir)/libxslt/xsltproc priority.xsl priority.xml > priority.tmp; \
+	@($(top_builddir)/libxslt/xsltproc $(srcdir)/priority.xsl $(srcdir)/priority.xml > priority.tmp; \
 	  if [ ! -f $(srcdir)/priority.out ] ; then cp priority.tmp $(srcdir)/priority.out ; \
 	  else diff $(srcdir)/priority.out priority.tmp ; fi ; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0 )
@@ -359,9 +359,9 @@ priority:
 # reference=priority.ref
 
 products:
-	@(rm -f .memdump ; touch .memdump)
+	@(echo > .memdump)
 	@(echo products)
-	@($(top_builddir)/libxslt/xsltproc products.xsl products.xml > products.tmp; \
+	@($(top_builddir)/libxslt/xsltproc $(srcdir)/products.xsl $(srcdir)/products.xml > products.tmp; \
 	  if [ ! -f $(srcdir)/products.out ] ; then cp products.tmp $(srcdir)/products.out ; \
 	  else diff $(srcdir)/products.out products.tmp ; fi ; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0 )
@@ -369,9 +369,9 @@ products:
 # reference=products.ref
 
 queens:
-	@(rm -f .memdump ; touch .memdump)
+	@(echo > .memdump)
 	@(echo queens)
-	@($(top_builddir)/libxslt/xsltproc queens.xsl queens.xml > queens.tmp; \
+	@($(top_builddir)/libxslt/xsltproc $(srcdir)/queens.xsl $(srcdir)/queens.xml > queens.tmp; \
 	  if [ ! -f $(srcdir)/queens.out ] ; then cp queens.tmp $(srcdir)/queens.out ; \
 	  else diff $(srcdir)/queens.out queens.tmp ; fi ; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0 )
@@ -379,9 +379,9 @@ queens:
 # reference=queens.ref
 
 reverser:
-	@(rm -f .memdump ; touch .memdump)
+	@(echo > .memdump)
 	@(echo reverser)
-	@($(top_builddir)/libxslt/xsltproc reverser.xsl gettysburg.xml > reverser.tmp; \
+	@($(top_builddir)/libxslt/xsltproc $(srcdir)/reverser.xsl $(srcdir)/gettysburg.xml > reverser.tmp; \
 	  if [ ! -f $(srcdir)/reverser.out ] ; then cp reverser.tmp $(srcdir)/reverser.out ; \
 	  else diff $(srcdir)/reverser.out reverser.tmp ; fi ; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0 )
@@ -389,9 +389,9 @@ reverser:
 # reference=reverser.ref
 
 summarize:
-	@(rm -f .memdump ; touch .memdump)
+	@(echo > .memdump)
 	@(echo summarize)
-	@($(top_builddir)/libxslt/xsltproc summarize.xsl queens.xsl > summarize.tmp; \
+	@($(top_builddir)/libxslt/xsltproc $(srcdir)/summarize.xsl $(srcdir)/queens.xsl > summarize.tmp; \
 	  if [ ! -f $(srcdir)/summarize.out ] ; then cp summarize.tmp $(srcdir)/summarize.out ; \
 	  else diff $(srcdir)/summarize.out summarize.tmp ; fi ; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0 )
@@ -399,9 +399,9 @@ summarize:
 # reference=summarize.ref
 
 total:
-	@(rm -f .memdump ; touch .memdump)
+	@(echo > .memdump)
 	@(echo total)
-	@($(top_builddir)/libxslt/xsltproc total.xsl chart.xml > total.tmp; \
+	@($(top_builddir)/libxslt/xsltproc $(srcdir)/total.xsl $(srcdir)/chart.xml > total.tmp; \
 	  if [ ! -f $(srcdir)/total.out ] ; then cp total.tmp $(srcdir)/total.out ; \
 	  else diff $(srcdir)/total.out total.tmp ; fi ; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0 )
@@ -409,9 +409,9 @@ total:
 # reference=total.ref
 
 tower:
-	@(rm -f .memdump ; touch .memdump)
+	@(echo > .memdump)
 	@(echo tower)
-	@($(top_builddir)/libxslt/xsltproc tower.xsl tower.xml > tower.tmp; \
+	@($(top_builddir)/libxslt/xsltproc $(srcdir)/tower.xsl $(srcdir)/tower.xml > tower.tmp; \
 	  if [ ! -f $(srcdir)/tower.out ] ; then cp tower.tmp $(srcdir)/tower.out ; \
 	  else diff $(srcdir)/tower.out tower.tmp ; fi ; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0 )
@@ -419,9 +419,9 @@ tower:
 # reference=tower.ref
 
 trend:
-	@(rm -f .memdump ; touch .memdump)
+	@(echo > .memdump)
 	@(echo trend)
-	@($(top_builddir)/libxslt/xsltproc trend.xsl trend.xml > trend.tmp; \
+	@($(top_builddir)/libxslt/xsltproc $(srcdir)/trend.xsl $(srcdir)/trend.xml > trend.tmp; \
 	  if [ ! -f $(srcdir)/trend.out ] ; then cp trend.tmp $(srcdir)/trend.out ; \
 	  else diff $(srcdir)/trend.out trend.tmp ; fi ; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0 )
@@ -429,9 +429,9 @@ trend:
 # reference=trend.ref
 
 union:
-	@(rm -f .memdump ; touch .memdump)
+	@(echo > .memdump)
 	@(echo union)
-	@($(top_builddir)/libxslt/xsltproc union.xsl union.xml > union.tmp; \
+	@($(top_builddir)/libxslt/xsltproc $(srcdir)/union.xsl $(srcdir)/union.xml > union.tmp; \
 	  if [ ! -f $(srcdir)/union.out ] ; then cp union.tmp $(srcdir)/union.out ; \
 	  else diff $(srcdir)/union.out union.tmp ; fi ; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0 )
@@ -439,9 +439,9 @@ union:
 # reference=union.ref
 
 xpath:
-	@(rm -f .memdump ; touch .memdump)
+	@(echo > .memdump)
 	@(echo xpath)
-	@($(top_builddir)/libxslt/xsltproc xpath.xsl xpath.xml > xpath.tmp; \
+	@($(top_builddir)/libxslt/xsltproc $(srcdir)/xpath.xsl $(srcdir)/xpath.xml > xpath.tmp; \
 	  if [ ! -f $(srcdir)/xpath.out ] ; then cp xpath.tmp $(srcdir)/xpath.out ; \
 	  else diff $(srcdir)/xpath.out xpath.tmp ; fi ; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0 )
@@ -449,25 +449,25 @@ xpath:
 # reference=xpath.ref
 
 xslbench1:
-	@(rm -f .memdump ; touch .memdump)
+	@(echo > .memdump)
 	@(echo xslbench1)
-	@($(top_builddir)/libxslt/xsltproc xslbench1.xsl xslbench1.xml > xslbench1.tmp; \
+	@($(top_builddir)/libxslt/xsltproc $(srcdir)/xslbench1.xsl $(srcdir)/xslbench1.xml > xslbench1.tmp; \
 	  if [ ! -f $(srcdir)/xslbench1.out ] ; then cp xslbench1.tmp $(srcdir)/xslbench1.out ; \
 	  else diff $(srcdir)/xslbench1.out xslbench1.tmp ; fi ; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0 )
 
 xslbench2:
-	@(rm -f .memdump ; touch .memdump)
+	@(echo > .memdump)
 	@(echo xslbench2)
-	@($(top_builddir)/libxslt/xsltproc xslbench2.xsl xslbenchdream.xml > xslbench2.tmp; \
+	@($(top_builddir)/libxslt/xsltproc $(srcdir)/xslbench2.xsl $(srcdir)/xslbenchdream.xml > xslbench2.tmp; \
 	  if [ ! -f $(srcdir)/xslbench2.out ] ; then cp xslbench2.tmp $(srcdir)/xslbench2.out ; \
 	  else diff $(srcdir)/xslbench2.out xslbench2.tmp ; fi ; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0 )
 
 xslbench3:
-	@(rm -f .memdump ; touch .memdump)
+	@(echo > .memdump)
 	@(echo xslbench3)
-	@($(top_builddir)/libxslt/xsltproc xslbench3.xsl xslbenchdream.xml > xslbench3.tmp; \
+	@($(top_builddir)/libxslt/xsltproc $(srcdir)/xslbench3.xsl $(srcdir)/xslbenchdream.xml > xslbench3.tmp; \
 	  if [ ! -f $(srcdir)/xslbench3.out ] ; then cp xslbench3.tmp $(srcdir)/xslbench3.out ; \
 	  else diff $(srcdir)/xslbench3.out xslbench3.tmp ; fi ; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" ; exit 0 )
diff --git a/tests/docbook/Makefile.am b/tests/docbook/Makefile.am
index 205ae9b3..88d885f8 100644
--- a/tests/docbook/Makefile.am
+++ b/tests/docbook/Makefile.am
@@ -10,11 +10,12 @@ EXTRA_DIST = README VERSION
 tests: html
 
 html: $(top_builddir)/libxslt/xsltproc
-	@(for i in test/*.xml ; do \
+	@(echo > .memdump)
+	@(for i in $(srcdir)/test/*.xml ; do \
 	  echo $$i ; \
-	  out=result/html/`basename $$i .xml`.tst; \
-	  html=result/html/`basename $$i .xml`.html; \
-	  $(top_builddir)/libxslt/xsltproc --nonet html/docbook.xsl $$i > $$out ; \
+	  out=$(srcdir)/result/html/`basename $$i .xml`.tst; \
+	  html=$(srcdir)/result/html/`basename $$i .xml`.html; \
+	  $(top_builddir)/libxslt/xsltproc --nonet $(srcdir)/html/docbook.xsl $$i > $$out ; \
 	  if [ -f $$html ] ; then \
 	      grep -v id < $$html > $$html.noid ; \
 	      grep -v id < $$out > $$out.noid ; \
diff --git a/tests/documents/Makefile.am b/tests/documents/Makefile.am
index 85ecf2b8..ffe5e2c3 100644
--- a/tests/documents/Makefile.am
+++ b/tests/documents/Makefile.am
@@ -11,9 +11,9 @@ EXTRA_DIST = bredfort.css index.xml system.xml \
 all: test
 
 test tests: $(top_builddir)/libxslt/xsltproc
-	@(rm -f .memdump ; touch .memdump)
-	@($(top_builddir)/libxslt/xsltproc bredfort.xsl index.xml > result ; \
-	diff result.xhtml result ; \
+	@(echo > .memdump)
+	@($(top_builddir)/libxslt/xsltproc $(srcdir)/bredfort.xsl $(srcdir)/index.xml > result ; \
+	diff $(srcdir)/result.xhtml result ; \
 	grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
 	rm -f result)
 
diff --git a/tests/general/Makefile.am b/tests/general/Makefile.am
index 8d6def1b..0cfcac53 100644
--- a/tests/general/Makefile.am
+++ b/tests/general/Makefile.am
@@ -41,7 +41,7 @@ EXTRA_DIST = \
 all: test
 
 test tests: $(top_builddir)/libxslt/xsltproc
-	@(rm -f .memdump ; touch .memdump)
+	@(echo > .memdump)
 	@(for i in $(srcdir)/../docs/*.xml ; do \
 	  if [ -d $$i ] ; then continue ; fi ; \
 	  doc=`basename $$i .xml` ; \
diff --git a/tests/multiple/Makefile.am b/tests/multiple/Makefile.am
index 4443df40..ebe1c738 100644
--- a/tests/multiple/Makefile.am
+++ b/tests/multiple/Makefile.am
@@ -21,12 +21,12 @@ EXTRA_DIST = dict.dtd  dict.xml  dict.xsl result.xml \
 all: test
 
 test tests: $(top_builddir)/libxslt/xsltproc
-	@(rm -f .memdump ; touch .memdump)
-	@($(top_builddir)/libxslt/xsltproc dict.xsl dict.xml > dict.res ; \
-	diff result.xml dict.res ; \
-	for i in out/letter*.orig ; do \
-	  diff $$i out/`basename $$i .orig`.html ; done ; \
-	diff out/titlepage.orig out/titlepage.html ; \
+	@(echo > .memdump)
+	@($(top_builddir)/libxslt/xsltproc $(srcdir)/dict.xsl $(srcdir)/dict.xml > dict.res ; \
+	diff $(srcdir)/result.xml dict.res ; \
+	for i in $(srcdir)/out/letter*.orig ; do \
+	  diff $$i $(srcdir)/out/`basename $$i .orig`.html ; done ; \
+	diff $(srcdir)/out/titlepage.orig $(srcdir)/out/titlepage.html ; \
 	grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
 	rm -f dict.res)
 
diff --git a/tests/namespaces/Makefile.am b/tests/namespaces/Makefile.am
index d034e4c7..bf65f96b 100644
--- a/tests/namespaces/Makefile.am
+++ b/tests/namespaces/Makefile.am
@@ -13,7 +13,7 @@ EXTRA_DIST = \
 all: test
 
 test tests: $(top_builddir)/libxslt/xsltproc
-	@(rm -f .memdump ; touch .memdump)
+	@(echo > .memdump)
 	@(for i in $(srcdir)/*.xml ; do \
 	  doc="`basename $$i .xml`" ; \
 	  j=$(srcdir)/"$$doc".xsl; \
diff --git a/tests/numbers/Makefile.am b/tests/numbers/Makefile.am
index b1f8daf4..803fdeda 100644
--- a/tests/numbers/Makefile.am
+++ b/tests/numbers/Makefile.am
@@ -8,9 +8,9 @@ EXTRA_DIST = format-number.xsl format-number.xml format-number.out
 all: test
 
 test tests: $(top_builddir)/libxslt/xsltproc
-	@(rm -f .memdump ; touch .memdump)
-	@($(top_builddir)/libxslt/xsltproc format-number.xsl format-number.xml > format-number.res ; \
-	diff format-number.out format-number.res ; \
+	@(echo > .memdump)
+	@($(top_builddir)/libxslt/xsltproc $(srcdir)/format-number.xsl $(srcdir)/format-number.xml > format-number.res ; \
+	diff $(srcdir)/format-number.out format-number.res ; \
 	grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
 	rm -f format-number.res)
 
diff --git a/tests/xmlspec/Makefile.am b/tests/xmlspec/Makefile.am
index 545c3c9f..25d21288 100644
--- a/tests/xmlspec/Makefile.am
+++ b/tests/xmlspec/Makefile.am
@@ -10,14 +10,14 @@ EXTRA_DIST = REC-xml-20001006.xml xmlspec-v21.dtd W3C-REC.css \
 all: test
 
 test tests: $(top_builddir)/libxslt/xsltproc
-	@(rm -f .memdump ; touch .memdump)
-	@($(top_builddir)/libxslt/xsltproc -timing REC-xml-2e.xsl REC-xml-20001006.xml > REC-xml-20001006.out 2> debug ; \
+	@(echo > .memdump)
+	@($(top_builddir)/libxslt/xsltproc -timing $(srcdir)/REC-xml-2e.xsl $(srcdir)/REC-xml-20001006.xml > REC-xml-20001006.out 2> debug ; \
 	diff $(srcdir)/REC-xml-20001006.html REC-xml-20001006.out | grep -v 'id[0-9]' | grep -v -- '---' | grep -v 158 | grep -v 4031 ; \
 	grep implemented debug | sort | uniq -c ; \
 	grep " ms$$" debug ; \
 	grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
 	rm -f REC-xml-20001006.out)
-	@($(top_builddir)/libxslt/xsltproc  -timing --param show.diff.markup 1 REC-xml-2e.xsl REC-xml-20001006.xml > REC-xml-20001006-review.out 2> debug ; \
+	@($(top_builddir)/libxslt/xsltproc  -timing --param show.diff.markup 1 $(srcdir)/REC-xml-2e.xsl $(srcdir)/REC-xml-20001006.xml > REC-xml-20001006-review.out 2> debug ; \
 	diff $(srcdir)/REC-xml-20001006-review.html REC-xml-20001006-review.out | grep -v 'id[0-9]' | grep -v -- '---' | grep -v 158 | grep -v 4031 ; \
 	grep implemented debug | sort | uniq -c ; \
 	grep " ms$$" debug ; \