From f89de317a2e5bc02b9d12a362e9969234c4d7be9 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Sat, 18 Aug 2001 14:00:41 +0000 Subject: [PATCH] fixed a number of small problems with Makefiles spotted by Albert Chin * //Makefile.am : fixed a number of small problems with Makefiles spotted by Albert Chin Daniel --- ChangeLog | 5 +++++ Makefile.am | 2 +- libxslt/Makefile.am | 3 +-- tests/REC/Makefile.am | 2 +- tests/REC1/Makefile.am | 2 +- tests/REC2/Makefile.am | 2 +- tests/XSLTMark/Makefile.am | 2 +- tests/docbook/Makefile.am | 2 +- tests/documents/Makefile.am | 2 +- tests/exslt/common/Makefile.am | 2 +- tests/exslt/functions/Makefile.am | 2 +- tests/exslt/math/Makefile.am | 2 +- 12 files changed, 16 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3d09101..9225895 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Aug 18 15:57:46 CEST 2001 Daniel Veillard + + * //Makefile.am : fixed a number of small problems with + Makefiles spotted by Albert Chin + Thu Aug 16 14:37:55 CEST 2001 Daniel Veillard * win32/dsp/libxslt.def: minimal changes to compile 1.0.2 on diff --git a/Makefile.am b/Makefile.am index b5ae68c..4e331e1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -37,7 +37,7 @@ check-local: tests dummy: tests: dummy - @(cd tests ; make test) + @(cd tests ; $(MAKE) test) cleantar: @(rm -f libxslt*.tar.gz) diff --git a/libxslt/Makefile.am b/libxslt/Makefile.am index b48ecad..3db65ce 100644 --- a/libxslt/Makefile.am +++ b/libxslt/Makefile.am @@ -1,5 +1,4 @@ -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libxslt \ - $(LIBXML_CFLAGS) $(CFLAGS) +INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libxslt $(LIBXML_CFLAGS) lib_LTLIBRARIES = libxslt.la diff --git a/tests/REC/Makefile.am b/tests/REC/Makefile.am index 5da83bb..1fcf0ae 100644 --- a/tests/REC/Makefile.am +++ b/tests/REC/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in $(top_builddir)/xsltproc/xsltproc: - @(cd ../../xsltproc ; make xsltproc) + @(cd ../../xsltproc ; xsltproc) EXTRA_DIST = \ article.xsl bigfont.xsl \ diff --git a/tests/REC1/Makefile.am b/tests/REC1/Makefile.am index 5ec5219..81753eb 100644 --- a/tests/REC1/Makefile.am +++ b/tests/REC1/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in $(top_builddir)/xsltproc/xsltproc: - @(cd ../../xsltproc ; make xsltproc) + @(cd ../../xsltproc ; xsltproc) EXTRA_DIST = doc.xsl doc.xml doc.dtd result.xml diff --git a/tests/REC2/Makefile.am b/tests/REC2/Makefile.am index 6399063..e3092ec 100644 --- a/tests/REC2/Makefile.am +++ b/tests/REC2/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in $(top_builddir)/xsltproc/xsltproc: - @(cd ../../xsltproc ; make xsltproc) + @(cd ../../xsltproc ; xsltproc) EXTRA_DIST = data.xml vrml.xsl vrml.xml svg.xsl svg.xml html.xsl html.xml diff --git a/tests/XSLTMark/Makefile.am b/tests/XSLTMark/Makefile.am index 31bd533..e4ae004 100644 --- a/tests/XSLTMark/Makefile.am +++ b/tests/XSLTMark/Makefile.am @@ -48,7 +48,7 @@ EXTRA_DIST = \ xslbenchdream.xml $(top_builddir)/xsltproc/xsltproc: - @(cd ../../xsltproc ; make xsltproc) + @(cd ../../xsltproc ; xsltproc) all: alphabetize attsets avts axis backwards bottles breadth brutal chart \ creation current dbonerow dbtail decoy depth encrypt functions game \ diff --git a/tests/docbook/Makefile.am b/tests/docbook/Makefile.am index 99d991a..562be69 100644 --- a/tests/docbook/Makefile.am +++ b/tests/docbook/Makefile.am @@ -3,7 +3,7 @@ all: single xtchunk # Avoid doing the test in normal pass $(top_builddir)/xsltproc/xsltproc: - @(cd ../../xsltproc ; make xsltproc) + @(cd ../../xsltproc ; xsltproc) EXTRA_DIST = README VERSION diff --git a/tests/documents/Makefile.am b/tests/documents/Makefile.am index 078d618..d3cb78a 100644 --- a/tests/documents/Makefile.am +++ b/tests/documents/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in $(top_builddir)/xsltproc/xsltproc: - @(cd ../../xsltproc ; make xsltproc) + @(cd ../../xsltproc ; xsltproc) EXTRA_DIST = bredfort.css index.xml system.xml \ bredfort.xsl menu.xml worklog.xml \ diff --git a/tests/exslt/common/Makefile.am b/tests/exslt/common/Makefile.am index b0fb12b..a69b4b2 100644 --- a/tests/exslt/common/Makefile.am +++ b/tests/exslt/common/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in $(top_builddir)/xsltproc/xsltproc: - @(cd ../../../xsltproc ; make xsltproc) + @(cd ../../../xsltproc ; xsltproc) EXTRA_DIST = \ node-set.1.xml node-set.1.xsl node-set.1.out \ diff --git a/tests/exslt/functions/Makefile.am b/tests/exslt/functions/Makefile.am index c78ad70..128340c 100644 --- a/tests/exslt/functions/Makefile.am +++ b/tests/exslt/functions/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in $(top_builddir)/xsltproc/xsltproc: - @(cd ../../../xsltproc ; make xsltproc) + @(cd ../../../xsltproc ; xsltproc) EXTRA_DIST = \ function.1.out function.1.xml function.1.xsl \ diff --git a/tests/exslt/math/Makefile.am b/tests/exslt/math/Makefile.am index 6cbbf6e..e73dfbf 100644 --- a/tests/exslt/math/Makefile.am +++ b/tests/exslt/math/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in $(top_builddir)/xsltproc/xsltproc: - @(cd ../../../xsltproc ; make xsltproc) + @(cd ../../../xsltproc ; xsltproc) EXTRA_DIST = \ highest.1.out highest.1.xml highest.1.xsl \ -- 2.7.4