[PATCH] Correct cherry-pick conflicts in agent's Makefile

[Christian Aistleitner]

--
Signed-off-by: Christian Aistleitner <christian at quelltextlich.at>
---
 agent/Makefile.am | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/agent/Makefile.am b/agent/Makefile.am
index 92f8fc0..d7fae8c 100644
--- a/agent/Makefile.am
+++ b/agent/Makefile.am
@@ -71,9 +71,6 @@ gpg_agent_LDADD = $(commonpth_libs) \
 		$(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_protect_tool_SOURCES = \
 	protect-tool.c \
-- 
1.8.1.5