summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.am2
-rw-r--r--libxslt/Makefile.am3
-rw-r--r--tests/REC/Makefile.am2
-rw-r--r--tests/REC1/Makefile.am2
-rw-r--r--tests/REC2/Makefile.am2
-rw-r--r--tests/XSLTMark/Makefile.am2
-rw-r--r--tests/docbook/Makefile.am2
-rw-r--r--tests/documents/Makefile.am2
-rw-r--r--tests/exslt/common/Makefile.am2
-rw-r--r--tests/exslt/functions/Makefile.am2
-rw-r--r--tests/exslt/math/Makefile.am2
12 files changed, 16 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 3d09101d..92258959 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Aug 18 15:57:46 CEST 2001 Daniel Veillard <daniel@veillard.com>
+
+ * //Makefile.am : fixed a number of small problems with
+ Makefiles spotted by Albert Chin
+
Thu Aug 16 14:37:55 CEST 2001 Daniel Veillard <daniel@veillard.com>
* win32/dsp/libxslt.def: minimal changes to compile 1.0.2 on
diff --git a/Makefile.am b/Makefile.am
index b5ae68c6..4e331e1c 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 b48ecad2..3db65ce6 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 5da83bbc..1fcf0ae6 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 5ec52199..81753eb9 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 6399063a..e3092ec8 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 31bd5335..e4ae0044 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 99d991a4..562be694 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 078d618f..d3cb78a7 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 b0fb12bc..a69b4b23 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 c78ad706..128340c6 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 6cbbf6e7..e73dfbf4 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 \