mirror of
git://git.gnupg.org/gnupg.git
synced 2024-11-10 21:38:50 +01:00
1be2cebf7f
* tools/gpgsm-gencert.sh: remove deprecated script entirely. It is
fully replaced by gpgsm --gen-key
* doc/tools.texi: remove gpgsm-gencert.sh documentation
* .gitignore: no longer ignore gpgsm-gencert.sh manpage
* doc/Makefile.am: quit making the manpage
* tools/Makefile.am: quit distributing the script
* doc/howto-create-a-server-cert.texi: overhaul documentation to use
gpgsm --gen-key and tweak explanations
--
The commit deprecating gpgsm-gencert.sh
(81972ca7d5) dates back exactly 6 years.
https://codesearch.debian.net/results/gpgsm-gencert.sh
suggests that in all of debian it is only referenced in documentation
(for poldi and scute) and example files (libept), and isn't actually
used directly anywhere.
Furthermore, trying to use gpgsm-gencert.sh to make a simple webserver
certificate-signing request failed for me, following the examples in
doc/howto-create-a-server-cert.texi exactly.
It's time we ripped off this band-aid :)
Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
154 lines
4.5 KiB
Makefile
154 lines
4.5 KiB
Makefile
# Makefile.am - Tools directory
|
|
# Copyright (C) 2003, 2007 Free Software Foundation, Inc.
|
|
#
|
|
# This file is part of GnuPG.
|
|
#
|
|
# GnuPG is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# GnuPG is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
|
|
EXTRA_DIST = \
|
|
Manifest watchgnupg.c \
|
|
addgnupghome applygnupgdefaults \
|
|
lspgpot mail-signed-keys convert-from-106 sockprox.c \
|
|
ccidmon.c ChangeLog-2011 gpg-connect-agent-w32info.rc
|
|
|
|
|
|
AM_CPPFLAGS = -I$(top_srcdir)/common
|
|
include $(top_srcdir)/am/cmacros.am
|
|
|
|
if HAVE_W32_SYSTEM
|
|
resource_objs += gpg-connect-agent-w32info.o
|
|
endif
|
|
|
|
AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) $(LIBASSUAN_CFLAGS)
|
|
|
|
sbin_SCRIPTS = addgnupghome applygnupgdefaults
|
|
|
|
if HAVE_USTAR
|
|
# bin_SCRIPTS += gpg-zip
|
|
noinst_SCRIPTS = gpg-zip
|
|
endif
|
|
|
|
if BUILD_SYMCRYPTRUN
|
|
symcryptrun = symcryptrun
|
|
else
|
|
symcryptrun =
|
|
endif
|
|
|
|
if BUILD_GPGTAR
|
|
gpgtar = gpgtar
|
|
else
|
|
gpgtar =
|
|
endif
|
|
|
|
# Fixme: We should remove the gpgkey2ssh tool.
|
|
bin_PROGRAMS = gpgconf gpg-connect-agent ${symcryptrun}
|
|
if !HAVE_W32_SYSTEM
|
|
bin_PROGRAMS += watchgnupg gpgparsemail
|
|
endif
|
|
if !HAVE_W32CE_SYSTEM
|
|
bin_PROGRAMS += gpgkey2ssh ${gpgtar}
|
|
endif
|
|
|
|
if !DISABLE_REGEX
|
|
libexec_PROGRAMS = gpg-check-pattern
|
|
endif
|
|
|
|
if !HAVE_W32CE_SYSTEM
|
|
noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert gpgsplit
|
|
endif
|
|
|
|
common_libs = $(libcommon)
|
|
commonpth_libs = $(libcommonpth)
|
|
|
|
# Some modules require PTH under W32CE.
|
|
if HAVE_W32CE_SYSTEM
|
|
maybe_commonpth_libs = $(commonpth_libs)
|
|
else
|
|
maybe_commonpth_libs = $(common_libs)
|
|
endif
|
|
|
|
if HAVE_W32CE_SYSTEM
|
|
pwquery_libs =
|
|
else
|
|
pwquery_libs = ../common/libsimple-pwquery.a
|
|
endif
|
|
|
|
if HAVE_W32CE_SYSTEM
|
|
opt_libassuan_libs = $(LIBASSUAN_LIBS)
|
|
endif
|
|
|
|
gpgsplit_LDADD = $(common_libs) \
|
|
$(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
|
|
$(ZLIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV)
|
|
|
|
gpgconf_SOURCES = gpgconf.c gpgconf.h gpgconf-comp.c no-libgcrypt.c
|
|
|
|
# common sucks in gpg-error, will they, nil they (some compilers
|
|
# do not eliminate the supposed-to-be-unused-inline-functions).
|
|
gpgconf_LDADD = $(maybe_commonpth_libs) $(opt_libassuan_libs) \
|
|
$(LIBINTL) $(GPG_ERROR_LIBS) $(NETLIBS) \
|
|
$(LIBICONV) $(W32SOCKLIBS)
|
|
gpgconf_LDFLAGS = $(extra_bin_ldflags)
|
|
|
|
gpgparsemail_SOURCES = gpgparsemail.c rfc822parse.c rfc822parse.h
|
|
gpgparsemail_LDADD =
|
|
|
|
symcryptrun_SOURCES = symcryptrun.c
|
|
symcryptrun_LDADD = $(LIBUTIL_LIBS) $(common_libs) $(pwquery_libs) \
|
|
$(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) \
|
|
$(LIBICONV) $(NETLIBS) $(W32SOCKLIBS)
|
|
|
|
watchgnupg_SOURCES = watchgnupg.c
|
|
watchgnupg_LDADD = $(NETLIBS)
|
|
|
|
gpg_connect_agent_SOURCES = gpg-connect-agent.c no-libgcrypt.c
|
|
# FIXME: remove PTH_LIBS (why do we need them at all?)
|
|
gpg_connect_agent_LDADD = ../common/libgpgrl.a $(common_libs) \
|
|
$(LIBASSUAN_LIBS) $(NPTH_LIBS) $(GPG_ERROR_LIBS) \
|
|
$(LIBREADLINE) $(LIBINTL) $(NETLIBS) $(LIBICONV) \
|
|
$(resource_objs)
|
|
|
|
if !HAVE_W32CE_SYSTEM
|
|
gpgkey2ssh_SOURCES = gpgkey2ssh.c
|
|
gpgkey2ssh_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS)
|
|
# common via use of BUG() in an inline function, which
|
|
# some compilers do not eliminate.
|
|
gpgkey2ssh_LDADD = $(common_libs) \
|
|
$(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV) \
|
|
$(NETLIBS)
|
|
endif
|
|
|
|
if !DISABLE_REGEX
|
|
gpg_check_pattern_SOURCES = gpg-check-pattern.c
|
|
gpg_check_pattern_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS)
|
|
gpg_check_pattern_LDADD = $(common_libs) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
|
|
$(LIBINTL) $(NETLIBS) $(LIBICONV) $(W32SOCKLIBS)
|
|
endif
|
|
|
|
gpgtar_SOURCES = \
|
|
gpgtar.c gpgtar.h \
|
|
gpgtar-create.c \
|
|
gpgtar-extract.c \
|
|
gpgtar-list.c \
|
|
no-libgcrypt.c
|
|
gpgtar_CFLAGS = $(GPG_ERROR_CFLAGS) $(PTH_CFLAGS)
|
|
#gpgtar_LDADD = $(commonpth_libs) $(PTH_LIBS) $(GPG_ERROR_LIBS)
|
|
gpgtar_LDADD = $(common_libs) $(GPG_ERROR_LIBS) \
|
|
$(LIBINTL) $(NETLIBS) $(LIBICONV) $(W32SOCKLIBS)
|
|
|
|
|
|
# Make sure that all libs are build before we use them. This is
|
|
# important for things like make -j2.
|
|
$(PROGRAMS): $(common_libs) $(pwquery_libs) ../common/libgpgrl.a
|