mirror of
git://git.gnupg.org/gnupg.git
synced 2024-05-28 21:50:02 +02:00
d13c5bc244
* common/comopt.c, common/comopt.h: New. * common/Makefile.am: Add them. * g10/gpg.c: Include comopt.h. (main): Also parse common.conf. * sm/gpgsm.c: Include comopt.h. (main): Set a flag for the --no-logfile option. Parse common.conf. * tools/gpgconf-comp.c (known_options_gpg): Remove "use-keyboxd", add pseudo option "use_keyboxd". (known_pseudo_options_gpg): Add pseudo option "use_keyboxd". (known_options_gpgsm): Remove "use-keyboxd". * tests/openpgp/defs.scm (create-gpghome): Create common.conf. * doc/examples/common.conf: New. -- Note that --use-keybox still works but prints a warning. We will eventually remove this option becuase it was marked as an experimental feature anyway. It would be too confusing if gpg and gpgsm use different key storages. Further, other components (e.g. dirmngr or gpg-wks-client) which call gpg or gpgsm need to be aware that the keyboxd is used and pass that option on the command line. Now that common.conf is always read (even if --no-options is used) those tools will work instantly.
238 lines
6.7 KiB
Makefile
238 lines
6.7 KiB
Makefile
# Makefile for common gnupg modules
|
|
# Copyright (C) 2001, 2003, 2007, 2010 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 <https://www.gnu.org/licenses/>.
|
|
|
|
## Process this file with automake to produce Makefile.in
|
|
|
|
EXTRA_DIST = mkstrtable.awk exaudit.awk exstatus.awk ChangeLog-2011 \
|
|
audit-events.h status-codes.h ChangeLog.jnlib \
|
|
ChangeLog-2011.include w32info-rc.h.in gnupg.ico \
|
|
all-tests.scm
|
|
|
|
noinst_LIBRARIES = libcommon.a libcommonpth.a libgpgrl.a
|
|
if !HAVE_W32CE_SYSTEM
|
|
noinst_LIBRARIES += libsimple-pwquery.a
|
|
endif
|
|
noinst_PROGRAMS = $(module_tests) $(module_maint_tests)
|
|
if DISABLE_TESTS
|
|
TESTS =
|
|
else
|
|
TESTS = $(module_tests)
|
|
endif
|
|
|
|
BUILT_SOURCES = audit-events.h status-codes.h
|
|
|
|
MAINTAINERCLEANFILES = audit-events.h status-codes.h
|
|
|
|
AM_CPPFLAGS =
|
|
|
|
AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_CFLAGS) $(KSBA_CFLAGS)
|
|
|
|
include $(top_srcdir)/am/cmacros.am
|
|
|
|
|
|
common_sources = \
|
|
common-defs.h \
|
|
util.h utilproto.h fwddecl.h i18n.c i18n.h \
|
|
types.h host2net.h dynload.h w32help.h \
|
|
mapstrings.c stringhelp.c stringhelp.h \
|
|
strlist.c strlist.h \
|
|
utf8conv.c utf8conv.h \
|
|
logging.h \
|
|
dotlock.c dotlock.h \
|
|
mischelp.c mischelp.h \
|
|
status.c status.h\
|
|
shareddefs.h \
|
|
openpgpdefs.h \
|
|
gc-opt-flags.h \
|
|
keyserver.h \
|
|
sexp-parse.h \
|
|
tlv.c tlv.h tlv-builder.c \
|
|
init.c init.h \
|
|
sexputil.c \
|
|
sysutils.c sysutils.h \
|
|
homedir.c \
|
|
gettime.c gettime.h \
|
|
yesno.c \
|
|
b64enc.c b64dec.c zb32.c zb32.h \
|
|
convert.c \
|
|
percent.c \
|
|
mbox-util.c mbox-util.h \
|
|
miscellaneous.c \
|
|
xasprintf.c \
|
|
xreadline.c \
|
|
membuf.c membuf.h \
|
|
ccparray.c ccparray.h \
|
|
iobuf.c iobuf.h \
|
|
ttyio.c ttyio.h \
|
|
asshelp.c asshelp2.c asshelp.h \
|
|
exechelp.h \
|
|
signal.c \
|
|
audit.c audit.h \
|
|
localename.c \
|
|
session-env.c session-env.h \
|
|
userids.c userids.h \
|
|
openpgp-oid.c openpgp-s2k.c \
|
|
ssh-utils.c ssh-utils.h \
|
|
agent-opt.c \
|
|
helpfile.c \
|
|
mkdir_p.c mkdir_p.h \
|
|
strlist.c strlist.h \
|
|
exectool.c exectool.h \
|
|
server-help.c server-help.h \
|
|
name-value.c name-value.h \
|
|
recsel.c recsel.h \
|
|
ksba-io-support.c ksba-io-support.h \
|
|
openpgp-fpr.c \
|
|
comopt.c comopt.h \
|
|
compliance.c compliance.h \
|
|
pkscreening.c pkscreening.h
|
|
|
|
|
|
if HAVE_W32_SYSTEM
|
|
common_sources += w32-reg.c w32-cmdline.c
|
|
endif
|
|
|
|
# To make the code easier to read we have split home some code into
|
|
# separate source files.
|
|
if HAVE_W32_SYSTEM
|
|
if HAVE_W32CE_SYSTEM
|
|
common_sources += exechelp-w32ce.c
|
|
else
|
|
common_sources += exechelp-w32.c
|
|
endif
|
|
else
|
|
common_sources += exechelp-posix.c
|
|
endif
|
|
|
|
# Sources only useful without NPTH.
|
|
without_npth_sources = \
|
|
get-passphrase.c get-passphrase.h
|
|
|
|
# Sources only useful with NPTH.
|
|
with_npth_sources = \
|
|
call-gpg.c call-gpg.h
|
|
|
|
libcommon_a_SOURCES = $(common_sources) $(without_npth_sources)
|
|
libcommon_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) -DWITHOUT_NPTH=1
|
|
|
|
libcommonpth_a_SOURCES = $(common_sources) $(with_npth_sources)
|
|
libcommonpth_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) $(NPTH_CFLAGS)
|
|
|
|
if !HAVE_W32CE_SYSTEM
|
|
libsimple_pwquery_a_SOURCES = \
|
|
simple-pwquery.c simple-pwquery.h asshelp.c asshelp.h
|
|
libsimple_pwquery_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS)
|
|
endif
|
|
|
|
libgpgrl_a_SOURCES = \
|
|
gpgrlhelp.c
|
|
|
|
if MAINTAINER_MODE
|
|
# Note: Due to the dependency on Makefile, the file will always be
|
|
# rebuilt, so we allow this only in maintainer mode.
|
|
|
|
# Create the audit-events.h include file from audit.h
|
|
# Note: We create the target file in the source directory because it
|
|
# is a distributed built source. If we would not do that we may end
|
|
# up with two files and then it is not clear which version of the
|
|
# files will be picked up.
|
|
audit-events.h: Makefile.am mkstrtable.awk exaudit.awk audit.h
|
|
$(AWK) -f $(srcdir)/exaudit.awk $(srcdir)/audit.h \
|
|
| $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=3 -v nogettext=1 \
|
|
-v pkg_namespace=eventstr_ > $(srcdir)/audit-events.h
|
|
|
|
# Create the status-codes.h include file from status.h
|
|
status-codes.h: Makefile.am mkstrtable.awk exstatus.awk status.h
|
|
$(AWK) -f $(srcdir)/exstatus.awk $(srcdir)/status.h \
|
|
| $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=3 -v nogettext=1 \
|
|
-v pkg_namespace=statusstr_ > $(srcdir)/status-codes.h
|
|
endif
|
|
|
|
#
|
|
# Module tests
|
|
#
|
|
module_tests = t-stringhelp t-timestuff \
|
|
t-convert t-percent t-gettime t-sysutils t-sexputil \
|
|
t-session-env t-openpgp-oid t-ssh-utils \
|
|
t-mapstrings t-zb32 t-mbox-util t-iobuf t-strlist \
|
|
t-name-value t-ccparray t-recsel t-w32-cmdline
|
|
if !HAVE_W32CE_SYSTEM
|
|
module_tests += t-exechelp t-exectool
|
|
endif
|
|
if HAVE_W32_SYSTEM
|
|
module_tests += t-w32-reg
|
|
endif
|
|
|
|
if MAINTAINER_MODE
|
|
module_maint_tests = t-helpfile t-b64
|
|
else
|
|
module_maint_tests =
|
|
endif
|
|
|
|
t_extra_src = t-support.h
|
|
|
|
t_common_cflags = $(KSBA_CFLAGS) $(LIBGCRYPT_CFLAGS) \
|
|
$(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) $(INCICONV)
|
|
t_common_ldadd = libcommon.a \
|
|
$(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \
|
|
$(LIBINTL) $(LIBICONV) $(NETLIBS)
|
|
|
|
|
|
# Common tests
|
|
t_stringhelp_SOURCES = t-stringhelp.c $(t_extra_src)
|
|
t_stringhelp_LDADD = $(t_common_ldadd)
|
|
|
|
t_timestuff_SOURCES = t-timestuff.c $(t_extra_src)
|
|
t_timestuff_LDADD = $(t_common_ldadd)
|
|
|
|
t_convert_LDADD = $(t_common_ldadd)
|
|
t_percent_LDADD = $(t_common_ldadd)
|
|
t_gettime_LDADD = $(t_common_ldadd)
|
|
t_sysutils_LDADD = $(t_common_ldadd)
|
|
t_helpfile_LDADD = $(t_common_ldadd)
|
|
t_sexputil_LDADD = $(t_common_ldadd)
|
|
t_b64_LDADD = $(t_common_ldadd)
|
|
t_exechelp_LDADD = $(t_common_ldadd)
|
|
t_exectool_LDADD = $(t_common_ldadd)
|
|
t_session_env_LDADD = $(t_common_ldadd)
|
|
t_openpgp_oid_LDADD = $(t_common_ldadd)
|
|
t_ssh_utils_LDADD = $(t_common_ldadd)
|
|
t_mapstrings_LDADD = $(t_common_ldadd)
|
|
|
|
t_zb32_SOURCES = t-zb32.c $(t_extra_src)
|
|
t_zb32_LDADD = $(t_common_ldadd)
|
|
|
|
t_mbox_util_LDADD = $(t_common_ldadd)
|
|
t_iobuf_LDADD = $(t_common_ldadd)
|
|
t_strlist_LDADD = $(t_common_ldadd)
|
|
t_name_value_LDADD = $(t_common_ldadd)
|
|
t_ccparray_LDADD = $(t_common_ldadd)
|
|
t_recsel_LDADD = $(t_common_ldadd)
|
|
|
|
t_w32_cmdline_SOURCES = t-w32-cmdline.c w32-cmdline.c $(t_extra_src)
|
|
t_w32_cmdline_LDADD = $(t_common_ldadd)
|
|
|
|
# System specific test
|
|
if HAVE_W32_SYSTEM
|
|
t_w32_reg_SOURCES = t-w32-reg.c $(t_extra_src)
|
|
t_w32_reg_LDADD = $(t_common_ldadd)
|
|
endif
|
|
|
|
# All programs should depend on the created libs.
|
|
$(PROGRAMS) : libcommon.a libcommonpth.a
|