Commit 662f544d authored by Sebastian Dröge's avatar Sebastian Dröge 🍵

Use $(MAKE) instead of make to fix the build if GNU make is called something else on the system.

Original commit message from CVS:
* check.mak:
* coverage/lcov.mak:
* gtk-doc-plugins.mak:
* release.mak:
Use $(MAKE) instead of make to fix the build if GNU make is called
something else on the system.
* m4/as-docbook.m4:
Fix path for docbook.xsl if we have no /etc/xml/catalog and add a
docbook-xsl search path for FreeBSD.
parent b6bd1a35
2008-01-20 Sebastian Dröge <slomo@circular-chaos.org>
* check.mak:
* coverage/lcov.mak:
* gtk-doc-plugins.mak:
* release.mak:
Use $(MAKE) instead of make to fix the build if GNU make is called
something else on the system.
* m4/as-docbook.m4:
Fix path for docbook.xsl if we have no /etc/xml/catalog and add a
docbook-xsl search path for FreeBSD.
2008-01-18 Sebastian Dröge <slomo@circular-chaos.org>
* gst.supp:
......
......@@ -6,7 +6,7 @@ clean-local-check:
if HAVE_VALGRIND
# hangs spectacularly on some machines, so let's not do this by default yet
check-valgrind:
make valgrind
$(MAKE) valgrind
else
check-valgrind:
@true
......@@ -71,7 +71,7 @@ LOOPS = 10
# valgrind any given test until failure by running make test.valgrind-forever
%.valgrind-forever: %
@while make $*.valgrind; do \
@while $(MAKE) $*.valgrind; do \
true; done
# gdb any given test by running make test.gdb
......@@ -86,7 +86,7 @@ torture: $(TESTS)
-rm test-registry.xml
@echo "Torturing tests ..."
for i in `seq 1 $(LOOPS)`; do \
make check || \
$(MAKE) check || \
(echo "Failure after $$i runs"; exit 1) || \
exit 1; \
done
......@@ -99,7 +99,7 @@ forever: $(TESTS)
-rm test-registry.xml
@echo "Forever tests ..."
while true; do \
make check || \
$(MAKE) check || \
(echo "Failure"; exit 1) || \
exit 1; \
done
......@@ -109,7 +109,7 @@ valgrind: $(TESTS)
@echo "Valgrinding tests ..."
@failed=0; \
for t in $(filter-out $(VALGRIND_TESTS_DISABLE),$(TESTS)); do \
make $$t.valgrind; \
$(MAKE) $$t.valgrind; \
if test "$$?" -ne 0; then \
echo "Valgrind error for test $$t"; \
failed=`expr $$failed + 1`; \
......
......@@ -3,12 +3,12 @@
# run lcov from scratch, always
lcov-reset:
make lcov-run
make lcov-report
$(MAKE) lcov-run
$(MAKE) lcov-report
# run lcov from scratch if the dir is not there
lcov:
make lcov-reset
$(MAKE) lcov-reset
if GST_GCOV_ENABLED
# reset run coverage tests
......
......@@ -7,8 +7,8 @@ help:
# update the stuff maintained by doc maintainers
update:
make inspect-update
make scanobj-update
$(MAKE) inspect-update
$(MAKE) scanobj-update
# We set GPATH here; this gives us semantics for GNU make
# which are more like other make's VPATH, when it comes to
......@@ -92,7 +92,7 @@ all-local: html-build.stamp
#### scan gobjects; done by documentation maintainer ####
scanobj-update:
-rm scanobj-build.stamp
make scanobj-build.stamp
$(MAKE) scanobj-build.stamp
# in the case of non-srcdir builds, the built gst directory gets added
# to gtk-doc scanning; but only then, to avoid duplicates
......@@ -138,7 +138,7 @@ inspect:
inspect-update: inspect
-rm $(INSPECT_REGISTRY)
-rm inspect-build.stamp
make inspect-build.stamp
$(MAKE) inspect-build.stamp
# FIXME: inspect.stamp should be written to by gst-xmlinspect.py
# IFF the output changed; see gtkdoc-mktmpl
......
......@@ -15,7 +15,7 @@ AC_DEFUN([AS_DOCBOOK],
DOCBOOK_VERSION=4.1.2
if test ! -f /etc/xml/catalog; then
for i in /usr/share/sgml/docbook/stylesheet/xsl/nwalsh /usr/share/sgml/docbook/xsl-stylesheets/;
for i in /usr/share/sgml/docbook/stylesheet/xsl/nwalsh /usr/share/sgml/docbook/xsl-stylesheets/ /usr/local/share/xsl/docbook ;
do
if test -d "$i"; then
DOCBOOK_ROOT=$i
......@@ -36,7 +36,7 @@ AC_DEFUN([AS_DOCBOOK],
if test -n "$XML_CATALOG"; then
DB_FILE="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"
else
DB_FILE="$DOCBOOK_ROOT/docbook.xsl"
DB_FILE="$DOCBOOK_ROOT/xhtml/docbook.xsl"
fi
$XSLTPROC $XSLTPROC_FLAGS $DB_FILE >/dev/null 2>&1 << END
<?xml version="1.0" encoding='ISO-8859-1'?>
......
......@@ -5,8 +5,8 @@
AUTOMAKE_OPTIONS = dist-bzip2
release: dist
make $(PACKAGE)-$(VERSION).tar.gz.md5
make $(PACKAGE)-$(VERSION).tar.bz2.md5
$(MAKE) $(PACKAGE)-$(VERSION).tar.gz.md5
$(MAKE) $(PACKAGE)-$(VERSION).tar.bz2.md5
# generate md5 sum files
%.md5: %
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment