summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaiki Ueno <ueno@gnu.org>2014-08-08 13:29:04 +0900
committerDaiki Ueno <ueno@gnu.org>2014-08-08 13:31:22 +0900
commit2d783313ecd0b63a9696f7ff823beeaeeda431a5 (patch)
treebf32605a54fc5b53548068d7e2f0f561e9b90033
parent184c56c2bdbadeb668c5d88b4aaffbe7f705439d (diff)
downloadlibunistring-2d783313ecd0b63a9696f7ff823beeaeeda431a5.tar.gz
Fix parallel make race when generating unistring/cdefs.h.
Trivial fix by Richard Purdie in: http://lists.openembedded.org/pipermail/openembedded-core/2012-April/059850.html * lib/Makefile.am (unistring/cdefs.h): Add $(UNUSED_PARAMETER_H) to prerequisites. Reported by Ludovic Courtès.
-rw-r--r--ChangeLog9
-rw-r--r--lib/Makefile.am2
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2917c79..13855a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2014-08-08 Daiki Ueno <ueno@gnu.org>
+
+ Fix parallel make race when generating unistring/cdefs.h.
+ Trivial fix by Richard Purdie in:
+ http://lists.openembedded.org/pipermail/openembedded-core/2012-April/059850.html
+ * lib/Makefile.am (unistring/cdefs.h): Add $(UNUSED_PARAMETER_H)
+ to prerequisites.
+ Reported by Ludovic Courtès.
+
2013-01-19 Bruno Haible <bruno@clisp.org>
Fix license headers to be LGPL.
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 917ace1..265ff46 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -159,7 +159,7 @@ nobase_nodist_include_HEADERS += unistring/version.h
# unistring/cdefs.h is not public, but is included by other header files.
nobase_nodist_include_HEADERS += unistring/cdefs.h
-unistring/cdefs.h : unistring/cdefs.in.h
+unistring/cdefs.h : unistring/cdefs.in.h $(UNUSED_PARAMETER_H)
@MKDIR_P@ unistring
rm -f $@-t $@
sed -e '/definition of _GL_UNUSED_PARAMETER/r $(UNUSED_PARAMETER_H)' \