diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-07-07 14:29:53 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-07-07 14:29:53 +0000 |
commit | 0df6dd4d8aea6edc733de81fb7eec115ea59a36e (patch) | |
tree | e2f7056cb53c58c8ef5779450ac468091b2bd86d /Build/source/libs/zlib | |
parent | 3675a91dd83af3eaa1c1a12e91af1e6c86f710f8 (diff) |
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
Diffstat (limited to 'Build/source/libs/zlib')
-rw-r--r-- | Build/source/libs/zlib/ChangeLog | 2 | ||||
-rw-r--r-- | Build/source/libs/zlib/Makefile.in | 19 |
2 files changed, 11 insertions, 10 deletions
diff --git a/Build/source/libs/zlib/ChangeLog b/Build/source/libs/zlib/ChangeLog index f56c393e9cb..82efbf35c34 100644 --- a/Build/source/libs/zlib/ChangeLog +++ b/Build/source/libs/zlib/ChangeLog @@ -1,6 +1,6 @@ 2012-07-06 Peter Breitenlohner <peb@mppmu.mpg.de> - * Makefile.am: Use ../am/rebuild.am. + * Makefile.am: Use ../../am/rebuild.am. 2012-07-05 Peter Breitenlohner <peb@mppmu.mpg.de> diff --git a/Build/source/libs/zlib/Makefile.in b/Build/source/libs/zlib/Makefile.in index 47794e687af..b5f4b2bc37e 100644 --- a/Build/source/libs/zlib/Makefile.in +++ b/Build/source/libs/zlib/Makefile.in @@ -1365,15 +1365,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. |