mirror of
git://git.gnupg.org/gnupg.git
synced 2024-11-11 21:48:50 +01:00
1adf719b2d
* gl/: Remove entire tree. * configure.ac: Remove gnulib tests and the gl/ Makefile. (setenv): Add to AC_CHECK_FUNCS. * autogen.rc (extra_aclocal_flags): Set to empty. * Makefile.am (ACLOCAL_AMFLAGS): Remove -I gl/m4 (SUBDIRS): Remove gl/. * agent/Makefile.am (common_libs): Remove ../gl/gnulib.a * common/Makefile.am (t_common_ldadd): Ditto. * dirmngr/Makefile.am (dirmngr_LDADD): Ditto. (dirmngr_ldap_LDADD, dirmngr_client_LDADD): Ditto. * g10/Makefile.am (needed_libs): Ditto. * g13/Makefile.am (g13_LDADD): Ditto. * kbx/Makefile.am (kbxutil_LDADD): Ditto. ($(PROGRAMS)): Ditto. * scd/Makefile.am (scdaemon_LDADD): Ditto. * sm/Makefile.am (common_libs): Ditto. * tools/Makefile.am (common_libs, commonpth_libs): Ditto. * agent/gpg-agent.c: Remove "mkdtemp.h" * g10/exec.c: Ditto. * scd/scdaemon.c: Ditto. * tools/symcryptrun.c: Ditto. * common/sysutils.c: Remove "setenv.h" * common/t-timestuff.c: Use putenv if setenv is not available. -- gnulib has always been a cause of trouble in GnuPG because we used only a very few functions and the complex include machinery of gnulib is quite complex and the cause for many build problems for example on OS X. This is not gnulib's fault but due to our limited use of gnulib and that we only rarely update the gnulib code to avoid regressions. In part two we will address the functions mkdtemp setenv unsetenv strpbrk which may bot be implemented on all platforms. They are not required on a libc based system. Signed-off-by: Werner Koch <wk@gnupg.org>
155 lines
4.6 KiB
Makefile
155 lines
4.6 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 gpgsm-gencert.sh \
|
|
lspgpot mail-signed-keys convert-from-106 sockprox.c \
|
|
ccidmon.c ChangeLog-2011 gpg-connect-agent-w32info.rc
|
|
|
|
|
|
AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl -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
|
|
|
|
bin_SCRIPTS = gpgsm-gencert.sh
|
|
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
|