diff options
| author | Werner Koch <wk@gnupg.org> | 2019-02-25 09:28:22 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2019-02-25 09:34:30 +0100 |
| commit | 28de5c0ea53373c56a4405fe6b08d194682dd1de (patch) | |
| tree | b720cb2577450d8f28641fada45e590d775241db /tools/Makefile.am | |
| parent | agent: Fix for suggested Libgcrypt use. (diff) | |
| download | gnupg2-28de5c0ea53373c56a4405fe6b08d194682dd1de.tar.xz gnupg2-28de5c0ea53373c56a4405fe6b08d194682dd1de.zip | |
card: Rename gpg-card-tool to gpg-card.
* tools/card-tool-keys.c: Rename to card-keys.c.
* tools/card-tool-misc.c: Rename to card-misc.c.
* tools/card-tool-yubikey.c: Rename to card-yubikey.c.
* tools/card-tool.h: Rename to gpg-card.h.
* tools/gpg-card-tool-w32info.rc: Rename to gpg-card-w32info.rc
* doc/card-tool.texi: Rename top gpg-card.texi
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'tools/Makefile.am')
| -rw-r--r-- | tools/Makefile.am | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index 69f4098ca..fb37c05e7 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -22,14 +22,14 @@ EXTRA_DIST = \ lspgpot mail-signed-keys convert-from-106 sockprox.c \ ccidmon.c ChangeLog-2011 \ gpg-connect-agent-w32info.rc \ - gpg-card-tool-w32info.rc + gpg-card-w32info.rc AM_CPPFLAGS = include $(top_srcdir)/am/cmacros.am if HAVE_W32_SYSTEM gpg_connect_agent_rc_objs = gpg-connect-agent-w32info.o -gpg_card_tool_rc_objs = gpg-card-tool-w32info.o +gpg_card_tool_rc_objs = gpg-card-w32info.o resource_objs += $(gpg_connect_agent_rc_objs) $(gpg_card_tool_rc_objs) endif @@ -51,7 +51,7 @@ endif libexec_PROGRAMS = gpg-wks-client gpg-pair-tool -bin_PROGRAMS = gpgconf gpg-connect-agent gpg-card-tool ${symcryptrun} +bin_PROGRAMS = gpgconf gpg-connect-agent gpg-card ${symcryptrun} if !HAVE_W32_SYSTEM bin_PROGRAMS += watchgnupg gpgparsemail ${gpg_wks_server} endif @@ -124,19 +124,20 @@ gpg_connect_agent_LDADD = ../common/libgpgrl.a $(common_libs) \ $(gpg_connect_agent_rc_objs) -gpg_card_tool_SOURCES = \ - gpg-card-tool.c \ - card-tool.h \ +gpg_card_SOURCES = \ + gpg-card.c \ + gpg-card.h \ card-call-scd.c \ - card-tool-keys.c \ - card-tool-yubikey.c \ - card-tool-misc.c - -gpg_card_tool_LDADD = ../common/libgpgrl.a $(common_libs) \ - $(LIBASSUAN_LIBS) $(LIBGCRYPT_LIBS) \ - $(GPG_ERROR_LIBS) \ - $(LIBREADLINE) $(LIBINTL) $(NETLIBS) $(LIBICONV) \ - $(gpg_card_tool_rc_objs) + card-keys.c \ + card-yubikey.c \ + card-misc.c + +gpg_card_LDADD = \ + ../common/libgpgrl.a $(common_libs) \ + $(LIBASSUAN_LIBS) $(LIBGCRYPT_LIBS) \ + $(GPG_ERROR_LIBS) \ + $(LIBREADLINE) $(LIBINTL) $(NETLIBS) $(LIBICONV) \ + $(gpg_card_tool_rc_objs) if !DISABLE_REGEX |