From: Mark Wooding <mdw@distorted.org.uk>
Date: Wed, 18 Jan 2012 22:54:56 +0000 (+0000)
Subject: priv/Makefile.am: Hack `libpriv' so that parallel builds work.
X-Git-Tag: 1.0.0pre11~46
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/commitdiff_plain/2bbdcefb05942b804b0e4097c14619bd9789e89d

priv/Makefile.am: Hack `libpriv' so that parallel builds work.

The library `libpriv.a' is built here, but the `libpriv' variable is set
to `$(top_builddir)/priv/libpriv.a' instead, which doesn't match.  The
result is that a parallel build might try to link the helper before
building the library, find that the library (found via the variable)
doesn't exist, and fail.

Fix this by hardwiring the library name locally, since we know where
it's meant to be.  I'd override the variable value but Automake is
petty and prints warnings if I do that.
---

diff --git a/priv/Makefile.am b/priv/Makefile.am
index 37650d16..e0a46769 100644
--- a/priv/Makefile.am
+++ b/priv/Makefile.am
@@ -29,7 +29,7 @@ noinst_LIBRARIES	 = libpriv.a
 libexec_PROGRAMS	 = tripe-privhelper
 man_MANS		 =
 
-LDADD			 = $(libpriv) $(libtripe) $(mLib_LIBS)
+LDADD			 = libpriv.a $(libtripe) $(mLib_LIBS)
 
 ###--------------------------------------------------------------------------
 ### Library.