diff options
-rw-r--r-- | Build/source/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/am/rebuild.am | 5 | ||||
-rw-r--r-- | Build/source/libs/cairo/Makefile.in | 5 | ||||
-rw-r--r-- | Build/source/libs/freetype/Makefile.in | 5 | ||||
-rw-r--r-- | Build/source/libs/freetype2/Makefile.in | 5 | ||||
-rw-r--r-- | Build/source/libs/gd/Makefile.in | 5 | ||||
-rw-r--r-- | Build/source/libs/graphite2/Makefile.in | 5 | ||||
-rw-r--r-- | Build/source/libs/harfbuzz/Makefile.in | 5 | ||||
-rw-r--r-- | Build/source/libs/icu/Makefile.in | 5 | ||||
-rw-r--r-- | Build/source/libs/libpng/Makefile.in | 5 | ||||
-rw-r--r-- | Build/source/libs/lua52/Makefile.in | 5 | ||||
-rw-r--r-- | Build/source/libs/pixman/Makefile.in | 5 | ||||
-rw-r--r-- | Build/source/libs/poppler/Makefile.in | 5 | ||||
-rw-r--r-- | Build/source/libs/potrace/Makefile.in | 5 | ||||
-rw-r--r-- | Build/source/libs/teckit/Makefile.in | 5 | ||||
-rw-r--r-- | Build/source/libs/xpdf/Makefile.in | 5 | ||||
-rw-r--r-- | Build/source/libs/zlib/Makefile.in | 5 | ||||
-rw-r--r-- | Build/source/libs/zziplib/Makefile.in | 5 | ||||
-rw-r--r-- | Build/source/texk/kpathsea/Makefile.in | 5 | ||||
-rw-r--r-- | Build/source/texk/ptexenc/Makefile.in | 5 |
20 files changed, 42 insertions, 57 deletions
diff --git a/Build/source/ChangeLog b/Build/source/ChangeLog index 52b4d17f718..464566f220c 100644 --- a/Build/source/ChangeLog +++ b/Build/source/ChangeLog @@ -1,3 +1,7 @@ +2013-07-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/rebuild.am: Avoid still more 'parallel make' problems. + 2013-07-15 Peter Breitenlohner <peb@mppmu.mpg.de> * am/rebuild.am: Avoid more 'parallel make' problems. diff --git a/Build/source/am/rebuild.am b/Build/source/am/rebuild.am index db8f5b11fca..81f7d33b623 100644 --- a/Build/source/am/rebuild.am +++ b/Build/source/am/rebuild.am @@ -8,7 +8,7 @@ ## Serialize concurrent rebuild attempts ## Compare Automake manual (info Automake) 27.9: Multiple Outputs ## -rebuild.stamp: +rebuild.stamp: $(rebuild_target) echo timestamp >$@ .PHONY: rebuild @@ -22,8 +22,7 @@ rebuild: $(rebuild_prereq) 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) \ - && echo timestamp >rebuild.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) rebuild.stamp; \ $$dry rmdir rebuild.lock; \ else \ while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \ diff --git a/Build/source/libs/cairo/Makefile.in b/Build/source/libs/cairo/Makefile.in index c7572798d22..231a4a68a2c 100644 --- a/Build/source/libs/cairo/Makefile.in +++ b/Build/source/libs/cairo/Makefile.in @@ -2316,7 +2316,7 @@ config.force: $(reconfig_prereq) test -f $@; \ fi; \ fi -rebuild.stamp: +rebuild.stamp: $(rebuild_target) echo timestamp >$@ .PHONY: rebuild @@ -2330,8 +2330,7 @@ rebuild: $(rebuild_prereq) 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) \ - && echo timestamp >rebuild.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) rebuild.stamp; \ $$dry rmdir rebuild.lock; \ else \ while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \ diff --git a/Build/source/libs/freetype/Makefile.in b/Build/source/libs/freetype/Makefile.in index e179eda8694..f80114e589e 100644 --- a/Build/source/libs/freetype/Makefile.in +++ b/Build/source/libs/freetype/Makefile.in @@ -590,7 +590,7 @@ libttf.a: ft-build/Makefile clean-local: rm -rf libttf.a freetype ft-build ft-install -rebuild.stamp: +rebuild.stamp: $(rebuild_target) echo timestamp >$@ .PHONY: rebuild @@ -604,8 +604,7 @@ rebuild: $(rebuild_prereq) 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) \ - && echo timestamp >rebuild.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) rebuild.stamp; \ $$dry rmdir rebuild.lock; \ else \ while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \ diff --git a/Build/source/libs/freetype2/Makefile.in b/Build/source/libs/freetype2/Makefile.in index fac534fb461..507bab37542 100644 --- a/Build/source/libs/freetype2/Makefile.in +++ b/Build/source/libs/freetype2/Makefile.in @@ -599,7 +599,7 @@ libfreetype.a: ft-config clean-local: rm -rf freetype2 ft2build.h ft-* libfreetype.* pkgconfig -rebuild.stamp: +rebuild.stamp: $(rebuild_target) echo timestamp >$@ .PHONY: rebuild @@ -613,8 +613,7 @@ rebuild: $(rebuild_prereq) 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) \ - && echo timestamp >rebuild.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) rebuild.stamp; \ $$dry rmdir rebuild.lock; \ else \ while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \ diff --git a/Build/source/libs/gd/Makefile.in b/Build/source/libs/gd/Makefile.in index 2e7ed79e285..cb4633f0e13 100644 --- a/Build/source/libs/gd/Makefile.in +++ b/Build/source/libs/gd/Makefile.in @@ -1193,7 +1193,7 @@ config.force: $(reconfig_prereq) test -f $@; \ fi; \ fi -rebuild.stamp: +rebuild.stamp: $(rebuild_target) echo timestamp >$@ .PHONY: rebuild @@ -1207,8 +1207,7 @@ rebuild: $(rebuild_prereq) 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) \ - && echo timestamp >rebuild.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) rebuild.stamp; \ $$dry rmdir rebuild.lock; \ else \ while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \ diff --git a/Build/source/libs/graphite2/Makefile.in b/Build/source/libs/graphite2/Makefile.in index e4b9c6613e0..7ba7b4d8d1a 100644 --- a/Build/source/libs/graphite2/Makefile.in +++ b/Build/source/libs/graphite2/Makefile.in @@ -1722,7 +1722,7 @@ uninstall-am: # in case of an SVN repository dist-hook: rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'` -rebuild.stamp: +rebuild.stamp: $(rebuild_target) echo timestamp >$@ .PHONY: rebuild @@ -1736,8 +1736,7 @@ rebuild: $(rebuild_prereq) 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) \ - && echo timestamp >rebuild.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) rebuild.stamp; \ $$dry rmdir rebuild.lock; \ else \ while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \ diff --git a/Build/source/libs/harfbuzz/Makefile.in b/Build/source/libs/harfbuzz/Makefile.in index 426e344d37d..4756cb3a42d 100644 --- a/Build/source/libs/harfbuzz/Makefile.in +++ b/Build/source/libs/harfbuzz/Makefile.in @@ -1676,7 +1676,7 @@ config.force: $(reconfig_prereq) test -f $@; \ fi; \ fi -rebuild.stamp: +rebuild.stamp: $(rebuild_target) echo timestamp >$@ .PHONY: rebuild @@ -1690,8 +1690,7 @@ rebuild: $(rebuild_prereq) 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) \ - && echo timestamp >rebuild.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) rebuild.stamp; \ $$dry rmdir rebuild.lock; \ else \ while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \ diff --git a/Build/source/libs/icu/Makefile.in b/Build/source/libs/icu/Makefile.in index 0cfdd6d0488..273c4e5ab1d 100644 --- a/Build/source/libs/icu/Makefile.in +++ b/Build/source/libs/icu/Makefile.in @@ -1312,7 +1312,7 @@ check-makeflags: distclean-local: rm -rf icu-build icu-native -rebuild.stamp: +rebuild.stamp: $(rebuild_target) echo timestamp >$@ .PHONY: rebuild @@ -1326,8 +1326,7 @@ rebuild: $(rebuild_prereq) 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) \ - && echo timestamp >rebuild.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) rebuild.stamp; \ $$dry rmdir rebuild.lock; \ else \ while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \ diff --git a/Build/source/libs/libpng/Makefile.in b/Build/source/libs/libpng/Makefile.in index 761f983af1f..8d641df2493 100644 --- a/Build/source/libs/libpng/Makefile.in +++ b/Build/source/libs/libpng/Makefile.in @@ -1351,7 +1351,7 @@ config.force: $(reconfig_prereq) test -f $@; \ fi; \ fi -rebuild.stamp: +rebuild.stamp: $(rebuild_target) echo timestamp >$@ .PHONY: rebuild @@ -1365,8 +1365,7 @@ rebuild: $(rebuild_prereq) 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) \ - && echo timestamp >rebuild.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) rebuild.stamp; \ $$dry rmdir rebuild.lock; \ else \ while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \ diff --git a/Build/source/libs/lua52/Makefile.in b/Build/source/libs/lua52/Makefile.in index 8ae31b5b2ba..11c7561fc5a 100644 --- a/Build/source/libs/lua52/Makefile.in +++ b/Build/source/libs/lua52/Makefile.in @@ -1021,7 +1021,7 @@ uninstall-am: # in case of an SVN repository dist-hook: rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'` -rebuild.stamp: +rebuild.stamp: $(rebuild_target) echo timestamp >$@ .PHONY: rebuild @@ -1035,8 +1035,7 @@ rebuild: $(rebuild_prereq) 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) \ - && echo timestamp >rebuild.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) rebuild.stamp; \ $$dry rmdir rebuild.lock; \ else \ while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \ diff --git a/Build/source/libs/pixman/Makefile.in b/Build/source/libs/pixman/Makefile.in index 76796586aa4..0b4d382bd8f 100644 --- a/Build/source/libs/pixman/Makefile.in +++ b/Build/source/libs/pixman/Makefile.in @@ -1460,7 +1460,7 @@ uninstall-am: dist-hook: rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'` rm -f $(distdir)/$(PIXMAN_SRC)/pixman-version.h -rebuild.stamp: +rebuild.stamp: $(rebuild_target) echo timestamp >$@ .PHONY: rebuild @@ -1474,8 +1474,7 @@ rebuild: $(rebuild_prereq) 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) \ - && echo timestamp >rebuild.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) rebuild.stamp; \ $$dry rmdir rebuild.lock; \ else \ while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \ diff --git a/Build/source/libs/poppler/Makefile.in b/Build/source/libs/poppler/Makefile.in index 4904bc5f904..dc8f5c390d9 100644 --- a/Build/source/libs/poppler/Makefile.in +++ b/Build/source/libs/poppler/Makefile.in @@ -1399,7 +1399,7 @@ config.force: $(reconfig_prereq) test -f $@; \ fi; \ fi -rebuild.stamp: +rebuild.stamp: $(rebuild_target) echo timestamp >$@ .PHONY: rebuild @@ -1413,8 +1413,7 @@ rebuild: $(rebuild_prereq) 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) \ - && echo timestamp >rebuild.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) rebuild.stamp; \ $$dry rmdir rebuild.lock; \ else \ while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \ diff --git a/Build/source/libs/potrace/Makefile.in b/Build/source/libs/potrace/Makefile.in index 180d286dfde..83c66d42c54 100644 --- a/Build/source/libs/potrace/Makefile.in +++ b/Build/source/libs/potrace/Makefile.in @@ -1290,7 +1290,7 @@ uninstall-am: # in case of an SVN repository dist-hook: rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'` -rebuild.stamp: +rebuild.stamp: $(rebuild_target) echo timestamp >$@ .PHONY: rebuild @@ -1304,8 +1304,7 @@ rebuild: $(rebuild_prereq) 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) \ - && echo timestamp >rebuild.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) rebuild.stamp; \ $$dry rmdir rebuild.lock; \ else \ while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \ diff --git a/Build/source/libs/teckit/Makefile.in b/Build/source/libs/teckit/Makefile.in index 6bb97dbd408..10cb9b156a1 100644 --- a/Build/source/libs/teckit/Makefile.in +++ b/Build/source/libs/teckit/Makefile.in @@ -1384,7 +1384,7 @@ config.force: $(reconfig_prereq) test -f $@; \ fi; \ fi -rebuild.stamp: +rebuild.stamp: $(rebuild_target) echo timestamp >$@ .PHONY: rebuild @@ -1398,8 +1398,7 @@ rebuild: $(rebuild_prereq) 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) \ - && echo timestamp >rebuild.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) rebuild.stamp; \ $$dry rmdir rebuild.lock; \ else \ while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \ diff --git a/Build/source/libs/xpdf/Makefile.in b/Build/source/libs/xpdf/Makefile.in index 02a5f180f2f..643624821f6 100644 --- a/Build/source/libs/xpdf/Makefile.in +++ b/Build/source/libs/xpdf/Makefile.in @@ -1151,7 +1151,7 @@ uninstall-am: dist-hook: rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'` rm -f $(distdir)/$(XPDF_TREE)/install-sh -rebuild.stamp: +rebuild.stamp: $(rebuild_target) echo timestamp >$@ .PHONY: rebuild @@ -1165,8 +1165,7 @@ rebuild: $(rebuild_prereq) 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) \ - && echo timestamp >rebuild.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) rebuild.stamp; \ $$dry rmdir rebuild.lock; \ else \ while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \ diff --git a/Build/source/libs/zlib/Makefile.in b/Build/source/libs/zlib/Makefile.in index e399bfc3110..aad454dc625 100644 --- a/Build/source/libs/zlib/Makefile.in +++ b/Build/source/libs/zlib/Makefile.in @@ -1354,7 +1354,7 @@ $(libz_a_OBJECTS): zconf.h zconf.h: $(ZLIB_TREE)/zconf.h.in config.status echo '$(SHELL) ./config.status $@' $(SHELL) ./config.status $@ -rebuild.stamp: +rebuild.stamp: $(rebuild_target) echo timestamp >$@ .PHONY: rebuild @@ -1368,8 +1368,7 @@ rebuild: $(rebuild_prereq) 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) \ - && echo timestamp >rebuild.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) rebuild.stamp; \ $$dry rmdir rebuild.lock; \ else \ while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \ diff --git a/Build/source/libs/zziplib/Makefile.in b/Build/source/libs/zziplib/Makefile.in index 19fbc516883..258671bfddb 100644 --- a/Build/source/libs/zziplib/Makefile.in +++ b/Build/source/libs/zziplib/Makefile.in @@ -1357,7 +1357,7 @@ config.force: $(reconfig_prereq) test -f $@; \ fi; \ fi -rebuild.stamp: +rebuild.stamp: $(rebuild_target) echo timestamp >$@ .PHONY: rebuild @@ -1371,8 +1371,7 @@ rebuild: $(rebuild_prereq) 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) \ - && echo timestamp >rebuild.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) rebuild.stamp; \ $$dry rmdir rebuild.lock; \ else \ while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \ diff --git a/Build/source/texk/kpathsea/Makefile.in b/Build/source/texk/kpathsea/Makefile.in index 6dfa18d4ddf..97fbc457996 100644 --- a/Build/source/texk/kpathsea/Makefile.in +++ b/Build/source/texk/kpathsea/Makefile.in @@ -2283,7 +2283,7 @@ uninstall-bin-links: install-exec-hook: install-bin-links uninstall-hook: uninstall-bin-links -rebuild.stamp: +rebuild.stamp: $(rebuild_target) echo timestamp >$@ .PHONY: rebuild @@ -2297,8 +2297,7 @@ rebuild: $(rebuild_prereq) 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) \ - && echo timestamp >rebuild.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) rebuild.stamp; \ $$dry rmdir rebuild.lock; \ else \ while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \ diff --git a/Build/source/texk/ptexenc/Makefile.in b/Build/source/texk/ptexenc/Makefile.in index 1aca1351c85..9712115a71f 100644 --- a/Build/source/texk/ptexenc/Makefile.in +++ b/Build/source/texk/ptexenc/Makefile.in @@ -936,7 +936,7 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-nobase_includeHEADERS $(libptexenc_la_OBJECTS): $(KPATHSEA_DEPEND) @KPATHSEA_RULE@ -rebuild.stamp: +rebuild.stamp: $(rebuild_target) echo timestamp >$@ .PHONY: rebuild @@ -950,8 +950,7 @@ rebuild: $(rebuild_prereq) 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) \ - && echo timestamp >rebuild.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) rebuild.stamp; \ $$dry rmdir rebuild.lock; \ else \ while test -d rebuild.lock && test -z "$$dry"; do sleep 1; done; \ |