summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2006-01-14 11:59:40 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2006-01-14 11:59:40 +0000
commit25c0f073ba7dd22869690028274422d31e328f7c (patch)
treefb2c4db8aaf5dff5f06251ac095abf1efc950321
parent590e58dc29a6f731da16bd78ecf2755cdb9dea24 (diff)
downloadgstreamer-25c0f073ba7dd22869690028274422d31e328f7c.tar.gz
docs/manual/Makefile.am: do not parallel-build manual
Original commit message from CVS: * docs/manual/Makefile.am: do not parallel-build manual
-rw-r--r--ChangeLog5
m---------common0
-rw-r--r--docs/manual/Makefile.am3
3 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 2ea40ead19..e9ce8523b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-14 Thomas Vander Stichele <thomas at apestaart dot org>
+
+ * docs/manual/Makefile.am:
+ do not parallel-build manual
+
2006-01-04 Tim-Philipp Müller <tim at centricular dot net>
* gst/gstcaps.h:
diff --git a/common b/common
-Subproject 5f10c872cafb3eb8058d63e438cae029ed9e8d7
+Subproject e0b121388ece524c0b7035a72bddd191d122d8b
diff --git a/docs/manual/Makefile.am b/docs/manual/Makefile.am
index 8ee9e30038..856d92d7c0 100644
--- a/docs/manual/Makefile.am
+++ b/docs/manual/Makefile.am
@@ -1,5 +1,8 @@
### this is the part you can customize if you need to
+# parallel builds don't work, probably due to temporary files
+MAKEFLAGS = -j1
+
# base name of doc
DOC = manual
# formats defined for upload.mak