diff options
| author | Werner Koch <wk@gnupg.org> | 2013-06-26 23:23:18 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2013-06-26 23:23:18 +0200 |
| commit | 136f190a2f20c6ec4d5c3ca3ac7f0440c14e4dc2 (patch) | |
| tree | b397281bd9af75203e75ecc12f0549eb4a7eaed4 /agent/Makefile.am | |
| parent | Implement unattended OpenPGP secret key import. (diff) | |
| download | gnupg2-136f190a2f20c6ec4d5c3ca3ac7f0440c14e4dc2.tar.xz gnupg2-136f190a2f20c6ec4d5c3ca3ac7f0440c14e4dc2.zip | |
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
Diffstat (limited to '')
| -rw-r--r-- | agent/Makefile.am | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/agent/Makefile.am b/agent/Makefile.am index 92f8fc031..ff15d0305 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 \ |