From: Martin Storsjo <martin@martin.st>
Date: Tue, 15 Nov 2011 09:29:58 +0000 (+0200)
Subject: Add dependencies from the def files to the libraries that generate them
X-Git-Tag: gnutls_3_0_9~56
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b774d6d772da3ee1a4d8b7d92a86ff7a52ec96b8;p=thirdparty%2Fgnutls.git

Add dependencies from the def files to the libraries that generate them

This avoids build failures in parallel builds, where builds
could fail with this error message:

make[2]: *** No rule to make target `libgnutls-26.def', needed by `all-am'.  Stop.

There is no direct rules that generate it, but it is generated
as a byproduct when building libgnutls.la. By marking the la
file as a dependency, make won't bail out by not finding the file
until that dependency is built, and at that point, the def file
exists.

Signed-off-by: Simon Josefsson <simon@josefsson.org>
---

diff --git a/extra/Makefile.am b/extra/Makefile.am
index cfcdbd5719..5d6a41b409 100644
--- a/extra/Makefile.am
+++ b/extra/Makefile.am
@@ -68,6 +68,7 @@ endif
 if HAVE_LD_OUTPUT_DEF
 libgnutls_openssl_la_LDFLAGS += \
 	-Wl,--output-def,libgnutls-openssl-$(DLL_VERSION).def
+libgnutls-openssl-$(DLL_VERSION).def: libgnutls-openssl.la
 defexec_DATA += libgnutls-openssl-$(DLL_VERSION).def
 endif
 endif
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 74258b5f45..d944c2f708 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -141,6 +141,7 @@ endif
 
 if HAVE_LD_OUTPUT_DEF
 libgnutls_la_LDFLAGS += -Wl,--output-def,libgnutls-$(DLL_VERSION).def
+libgnutls-$(DLL_VERSION).def: libgnutls.la
 defexecdir = $(bindir)
 defexec_DATA = libgnutls-$(DLL_VERSION).def
 DISTCLEANFILES += $(defexec_DATA)