summaryrefslogtreecommitdiff
path: root/Build/source/libs/graphite2
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-07-07 14:29:53 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-07-07 14:29:53 +0000
commit0df6dd4d8aea6edc733de81fb7eec115ea59a36e (patch)
treee2f7056cb53c58c8ef5779450ac468091b2bd86d /Build/source/libs/graphite2
parent3675a91dd83af3eaa1c1a12e91af1e6c86f710f8 (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/graphite2')
-rw-r--r--Build/source/libs/graphite2/ChangeLog3
-rw-r--r--Build/source/libs/graphite2/Makefile.in19
-rw-r--r--Build/source/libs/graphite2/gr2test.c2
3 files changed, 12 insertions, 12 deletions
diff --git a/Build/source/libs/graphite2/ChangeLog b/Build/source/libs/graphite2/ChangeLog
index 5b5561cde2d..120b7e80d3b 100644
--- a/Build/source/libs/graphite2/ChangeLog
+++ b/Build/source/libs/graphite2/ChangeLog
@@ -1,11 +1,10 @@
2013-07-06 Peter Breitenlohner <peb@mppmu.mpg.de>
- * Makefile.am: Use ../am/rebuild.am.
+ * Makefile.am: Use ../../am/rebuild.am.
* graphite2.test (new): Shell script for a basic test.
* gr2test.c (new): Source code for test program.
-
2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de>
* include/graphite2/Makefile.am:
diff --git a/Build/source/libs/graphite2/Makefile.in b/Build/source/libs/graphite2/Makefile.in
index ed0ac04ada2..60619a30c55 100644
--- a/Build/source/libs/graphite2/Makefile.in
+++ b/Build/source/libs/graphite2/Makefile.in
@@ -1733,15 +1733,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/graphite2/gr2test.c b/Build/source/libs/graphite2/gr2test.c
index 1e877f77fee..20b7965fb49 100644
--- a/Build/source/libs/graphite2/gr2test.c
+++ b/Build/source/libs/graphite2/gr2test.c
@@ -15,6 +15,6 @@ int main (int argc, char **argv)
int nMajor, nMinor, nBugFix;
gr_engine_version(&nMajor, &nMinor, &nBugFix);
- printf ("%s: using graphite2 %d.%d.%d\n", argv[0], nMajor, nMinor, nBugFix);
+ printf ("%s: using Graphite2 version %d.%d.%d\n", argv[0], nMajor, nMinor, nBugFix);
return 0;
}