[git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-217-g136f190

[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  136f190a2f20c6ec4d5c3ca3ac7f0440c14e4dc2 (commit)
      from  7777e68d0482c942f527e91c04adbcfb40bc8bef (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 136f190a2f20c6ec4d5c3ca3ac7f0440c14e4dc2
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Jun 26 23:23:18 2013 +0200

    Fix Makefile regression.
    
    * agent/Makefile.am (gpg_agent_DEPENDENCIES): Remove cruft from wrong
    resolve conflict 2013-04-25.
    (gpg_agent_DEPENDENCIES): Remove obsolete gpg_agent_res_deps
    (gpg_agent_LDFLAGS): Remove obsolete gpg_agent_res_ldflags.
    --
    
    This fixes 88e24341e57c96e31a25e92e09d67989e64cc1c1.  Thanks to
    Christian Aistleitner for pinpointing this bug.  Am sorry for accusing
    automake to have introduced this bug; I should have washed my own eyes.
    
    GnuPG-bug-id: 1511

diff --git a/agent/Makefile.am b/agent/Makefile.am
index 92f8fc0..ff15d03 100644
--- a/agent/Makefile.am
+++ b/agent/Makefile.am
@@ -69,11 +69,8 @@ gpg_agent_LDADD = $(commonpth_libs) \
                 $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(NPTH_LIBS) \
 	        $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV) \
 		$(resource_objs)
-gpg_agent_LDFLAGS = $(extra_bin_ldflags) $(gpg_agent_res_ldflags)
-gpg_agent_DEPENDENCIES = $(gpg_agent_res_deps)
-                $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(PTH_LIBS) \
-	        $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV) \
-		$(resource_objs)
+gpg_agent_LDFLAGS = $(extra_bin_ldflags)
+gpg_agent_DEPENDENCIES = $(resource_objs)
 
 gpg_protect_tool_SOURCES = \
 	protect-tool.c \

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

Summary of changes:
 agent/Makefile.am |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)


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