[git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-414-g57011da

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  57011da53e43f9c8a6c7e7314166c3e17ff8627a (commit)
      from  359c643d747c890f73f68b42e0aeb896016f05fd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 57011da53e43f9c8a6c7e7314166c3e17ff8627a
Author: Werner Koch <wk at gnupg.org>
Date:   Wed May 7 16:37:15 2014 +0200

    Make -jN work again.
    
    * common/Makefile.am ($(PROGRAMS)): New rule
    (t_http_LDADD): Use libcommontls.a without directory prefix.
    * dirmngr/Makefile.am ($(PROGRAMS)): New rule.

diff --git a/common/Makefile.am b/common/Makefile.am
index 439c29b..b955539 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -220,4 +220,7 @@ t_zb32_LDADD = $(t_common_ldadd)
 # http tests
 t_http_SOURCES = t-http.c
 t_http_CFLAGS  = $(t_common_cflags) $(LIBGNUTLS_CFLAGS)
-t_http_LDADD   = $(libcommontls) $(t_common_ldadd) $(LIBGNUTLS_LIBS) $(DNSLIBS)
+t_http_LDADD   = libcommontls.a $(t_common_ldadd) $(LIBGNUTLS_LIBS) $(DNSLIBS)
+
+# All programs should depend on the created libs.
+$(PROGRAMS) : libcommon.a libcommonpth.a libcommontls.a libcommontlsnpth.a
diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am
index b5bef45..7e2449f 100644
--- a/dirmngr/Makefile.am
+++ b/dirmngr/Makefile.am
@@ -87,3 +87,6 @@ dirmngr_client_LDFLAGS = $(extra_bin_ldflags)
 
 no-libgcrypt.c : $(top_srcdir)/tools/no-libgcrypt.c
 	cat $(top_srcdir)/tools/no-libgcrypt.c > no-libgcrypt.c
+
+
+$(PROGRAMS) : $(libcommon) $(libcommonpth) $(libcommontls) $(libcommontlsnpth)

-----------------------------------------------------------------------

Summary of changes:
 common/Makefile.am  |    5 ++++-
 dirmngr/Makefile.am |    3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org