From 0df6dd4d8aea6edc733de81fb7eec115ea59a36e Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Sun, 7 Jul 2013 14:29:53 +0000 Subject: build system: additional Makefile fragments better handling of dependencies for highly parallel make git-svn-id: svn://tug.org/texlive/trunk@31127 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/pixman/ChangeLog | 2 +- Build/source/libs/pixman/Makefile.in | 19 ++++++++++--------- Build/source/libs/pixman/pixtest.c | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) (limited to 'Build/source/libs/pixman') diff --git a/Build/source/libs/pixman/ChangeLog b/Build/source/libs/pixman/ChangeLog index 3d8e6a95839..1b8fd8581e6 100644 --- a/Build/source/libs/pixman/ChangeLog +++ b/Build/source/libs/pixman/ChangeLog @@ -1,6 +1,6 @@ 2013-07-06 Peter Breitenlohner - * Makefile.am: Use ../am/rebuild.am. + * Makefile.am: Use ../../am/rebuild.am. 2013-07-05 Peter Breitenlohner diff --git a/Build/source/libs/pixman/Makefile.in b/Build/source/libs/pixman/Makefile.in index 6e5fa0fbcd8..00c6e9a85ee 100644 --- a/Build/source/libs/pixman/Makefile.in +++ b/Build/source/libs/pixman/Makefile.in @@ -1471,15 +1471,16 @@ rebuild: $(rebuild_prereq) *n*) dry=:;; \ esac; \ done; \ - $$dry rm -f rebuild.stamp; \ - $$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \ - if $$dry mkdir rebuild.lock 2>/dev/null; then \ - $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \ - $$dry rmdir rebuild.lock; \ - else \ - while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \ - fi; \ - $$dry test -f rebuild.stamp + if test -f rebuild.stamp; then :; else \ + $$dry trap 'rm -rf rebuild.lock' 1 2 13 15; \ + if $$dry mkdir rebuild.lock 2>/dev/null; then \ + $(MAKE) $(AM_MAKEFLAGS) $(rebuild_target) rebuild.stamp; \ + $$dry rmdir rebuild.lock; \ + else \ + while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \ + $$dry test -f rebuild.stamp; exit $$?; \ + fi; \ + fi # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/Build/source/libs/pixman/pixtest.c b/Build/source/libs/pixman/pixtest.c index 4aeb0821fe9..f77fe27c9aa 100644 --- a/Build/source/libs/pixman/pixtest.c +++ b/Build/source/libs/pixman/pixtest.c @@ -9,6 +9,6 @@ int main (int argc, char **argv) { - printf ("%s: using pixman %s\n", argv[0], pixman_version_string ()); + printf ("%s: using pixman version %s\n", argv[0], pixman_version_string ()); return 0; } -- cgit v1.2.3