No OneTemporary
Actions

Size

32 KB

Subscribers

None

View Options

	diff --git a/agent/Makefile.am b/agent/Makefile.am
	index bcf178810..b33593d68 100644
	--- a/agent/Makefile.am
	+++ b/agent/Makefile.am
	@@ -1,107 +1,107 @@
	# Copyright (C) 2001, 2003, 2004, 2005 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/>.

	## Process this file with automake to produce Makefile.in

	bin_PROGRAMS = gpg-agent
	libexec_PROGRAMS = gpg-protect-tool
	if !HAVE_W32CE_SYSTEM
	# fixme: Do no use simple-pwquery for preset-passphrase.
	libexec_PROGRAMS += gpg-preset-passphrase
	endif
	noinst_PROGRAMS = $(TESTS)

	EXTRA_DIST = ChangeLog-2011 gpg-agent-w32info.rc


	-AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common -I$(top_srcdir)/intl
	+AM_CPPFLAGS = -I$(top_srcdir)/common

	include $(top_srcdir)/am/cmacros.am

	if HAVE_W32_SYSTEM
	resource_objs += gpg-agent-w32info.o
	endif

	AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS)

	gpg_agent_SOURCES = \
	gpg-agent.c agent.h \
	command.c command-ssh.c \
	call-pinentry.c \
	cache.c \
	trans.c \
	findkey.c \
	pksign.c \
	pkdecrypt.c \
	genkey.c \
	protect.c \
	trustlist.c \
	divert-scd.c \
	cvt-openpgp.c cvt-openpgp.h \
	call-scd.c \
	learncard.c

	common_libs = $(libcommon)
	commonpth_libs = $(libcommonpth)
	if HAVE_W32CE_SYSTEM
	pwquery_libs =
	else
	pwquery_libs = ../common/libsimple-pwquery.a
	endif


	gpg_agent_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) $(NPTH_CFLAGS)
	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_DEPENDENCIES = $(resource_objs)

	gpg_protect_tool_SOURCES = \
	protect-tool.c \
	protect.c

	gpg_protect_tool_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS)
	gpg_protect_tool_LDADD = $(common_libs) $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) \
	$(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV)

	gpg_preset_passphrase_SOURCES = \
	preset-passphrase.c

	# Needs $(NETLIBS) for libsimple-pwquery.la.
	gpg_preset_passphrase_LDADD = \
	$(pwquery_libs) $(common_libs) \
	$(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV)


	# Make sure that all libs are build before we use them. This is
	# important for things like make -j2.
	$(PROGRAMS): $(common_libs) $(commonpth_libs) $(pwquery_libs)



	#
	# Module tests
	#
	TESTS = t-protect

	t_common_ldadd = $(common_libs) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
	$(LIBINTL) $(LIBICONV) $(NETLIBS)

	t_protect_SOURCES = t-protect.c protect.c
	t_protect_LDADD = $(t_common_ldadd)
	diff --git a/common/Makefile.am b/common/Makefile.am
	index 2ba6dc007..51923e841 100644
	--- a/common/Makefile.am
	+++ b/common/Makefile.am
	@@ -1,237 +1,237 @@
	# 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 <http://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 README.jnlib ChangeLog.jnlib \
	ChangeLog-2011.include w32info-rc.h.in gnupg.ico tls-ca.pem

	noinst_LIBRARIES = libcommon.a libcommonpth.a libgpgrl.a \
	libcommontls.a libcommontlsnpth.a
	if !HAVE_W32CE_SYSTEM
	noinst_LIBRARIES += libsimple-pwquery.a
	endif
	noinst_PROGRAMS = $(jnlib_tests) $(module_tests) $(module_maint_tests)
	TESTS = $(jnlib_tests) $(module_tests)

	BUILT_SOURCES = audit-events.h status-codes.h

	MAINTAINERCLEANFILES = audit-events.h status-codes.h

	-AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl
	+AM_CPPFLAGS =

	AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_CFLAGS) $(KSBA_CFLAGS)

	include $(top_srcdir)/am/cmacros.am

	jnlib_sources = \
	libjnlib-config.h \
	types.h host2net.h dynload.h w32help.h \
	mapstrings.c stringhelp.c stringhelp.h \
	strlist.c strlist.h \
	utf8conv.c utf8conv.h \
	argparse.c argparse.h \
	logging.c logging.h \
	dotlock.c dotlock.h \
	mischelp.c mischelp.h

	if HAVE_W32_SYSTEM
	jnlib_sources += w32-reg.c w32-afunix.c w32-afunix.h
	endif


	common_sources = \
	common-defs.h \
	util.h i18n.c i18n.h \
	status.c status.h\
	shareddefs.h \
	openpgpdefs.h \
	gc-opt-flags.h \
	keyserver.h \
	sexp-parse.h \
	tlv.c tlv.h \
	init.c init.h \
	sexputil.c \
	sysutils.c sysutils.h \
	homedir.c \
	gettime.c gettime.h \
	yesno.c \
	b64enc.c b64dec.c zb32.c \
	convert.c \
	percent.c \
	mbox-util.c mbox-util.h \
	miscellaneous.c \
	xasprintf.c \
	xreadline.c \
	membuf.c membuf.h \
	iobuf.c iobuf.h \
	ttyio.c ttyio.h \
	asshelp.c asshelp2.c asshelp.h \
	exechelp.h \
	signal.c \
	audit.c audit.h \
	srv.h \
	dns-cert.c dns-cert.h \
	pka.c pka.h \
	localename.c \
	session-env.c session-env.h \
	userids.c userids.h \
	openpgp-oid.c \
	ssh-utils.c ssh-utils.h \
	agent-opt.c \
	helpfile.c

	# Sources possible requiring a TLS library are put into a separate
	# conveince library.
	tls_sources = \
	http.c http.h


	# 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


	libcommon_a_SOURCES = $(jnlib_sources) $(common_sources) $(without_npth_sources)
	if USE_DNS_SRV
	libcommon_a_SOURCES += srv.c
	endif
	libcommon_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) -DWITHOUT_NPTH=1

	libcommonpth_a_SOURCES = $(jnlib_sources) $(common_sources)
	if USE_DNS_SRV
	libcommonpth_a_SOURCES += srv.c
	endif
	libcommonpth_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) $(NPTH_CFLAGS)

	libcommontls_a_SOURCES = $(tls_sources)
	libcommontls_a_CFLAGS = $(AM_CFLAGS) $(LIBGNUTLS_CFLAGS) -DWITHOUT_NPTH=1

	libcommontlsnpth_a_SOURCES = $(tls_sources)
	libcommontlsnpth_a_CFLAGS = $(AM_CFLAGS) $(LIBGNUTLS_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 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 namespace=statusstr_ > $(srcdir)/status-codes.h
	endif

	#
	# Module tests
	#
	t_jnlib_src = t-support.c t-support.h
	jnlib_tests = t-stringhelp t-timestuff
	if HAVE_W32_SYSTEM
	jnlib_tests += t-w32-reg
	endif
	module_tests = t-convert t-percent t-gettime t-sysutils t-sexputil \
	t-session-env t-openpgp-oid t-ssh-utils t-dns-cert \
	t-pka t-mapstrings t-zb32 t-mbox-util
	if !HAVE_W32CE_SYSTEM
	module_tests += t-exechelp
	endif

	if MAINTAINER_MODE
	module_maint_tests = t-helpfile t-b64 t-http
	else
	module_maint_tests =
	endif


	t_common_cflags = $(KSBA_CFLAGS) $(LIBGCRYPT_CFLAGS) \
	$(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS)
	t_common_ldadd = libcommon.a \
	$(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \
	$(LIBINTL) $(LIBICONV)


	# jnlib tests
	t_stringhelp_SOURCES = t-stringhelp.c $(t_jnlib_src)
	t_stringhelp_LDADD = $(t_common_ldadd)

	t_timestuff_SOURCES = t-timestuff.c $(t_jnlib_src)
	t_timestuff_LDADD = $(t_common_ldadd)

	if HAVE_W32_SYSTEM
	t_w32_reg_SOURCES = t-w32-reg.c $(t_jnlib_src)
	t_w32_reg_LDADD = $(t_common_ldadd)
	endif

	# common tests
	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_session_env_LDADD = $(t_common_ldadd)
	t_openpgp_oid_LDADD = $(t_common_ldadd)
	t_ssh_utils_LDADD = $(t_common_ldadd)
	t_dns_cert_LDADD = $(t_common_ldadd) $(DNSLIBS)
	t_pka_LDADD = $(t_common_ldadd) $(DNSLIBS)
	t_mapstrings_LDADD = $(t_common_ldadd)
	t_zb32_LDADD = $(t_common_ldadd)
	t_mbox_util_LDADD = $(t_common_ldadd)

	# http tests
	t_http_SOURCES = t-http.c
	t_http_CFLAGS = $(t_common_cflags) $(NTBTLS_CFLAGS) $(LIBGNUTLS_CFLAGS)
	t_http_LDADD = libcommontls.a $(t_common_ldadd) \
	$(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(DNSLIBS)

	# All programs should depend on the created libs.
	$(PROGRAMS) : libcommon.a libcommonpth.a libcommontls.a libcommontlsnpth.a
	diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am
	index c8613bba9..d80dd6d6d 100644
	--- a/dirmngr/Makefile.am
	+++ b/dirmngr/Makefile.am
	@@ -1,121 +1,121 @@
	# Makefile.am - dirmngr
	# Copyright (C) 2002 Klarälvdalens Datakonsult AB
	# Copyright (C) 2004, 2007, 2010 g10 Code GmbH
	#
	# 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/>.

	## Process this file with automake to produce Makefile.in

	EXTRA_DIST = OAUTHORS ONEWS ChangeLog.1 ChangeLog-2011

	bin_PROGRAMS = dirmngr dirmngr-client

	if USE_LDAPWRAPPER
	libexec_PROGRAMS = dirmngr_ldap
	endif

	noinst_PROGRAMS = $(module_tests)
	TESTS = $(module_tests)

	-AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/common
	+AM_CPPFLAGS = -I$(top_srcdir)/common

	include $(top_srcdir)/am/cmacros.am

	AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) $(LIBASSUAN_CFLAGS) \
	$(GPG_ERROR_CFLAGS) $(NPTH_CFLAGS) $(NTBTLS_CFLAGS) \
	$(LIBGNUTLS_CFLAGS)


	BUILT_SOURCES = no-libgcrypt.c

	CLEANFILES = no-libgcrypt.c

	if HAVE_W32_SYSTEM
	ldap_url = ldap-url.h ldap-url.c
	else
	ldap_url =
	endif

	if USE_LDAPWRAPPER
	extraldap_src = ldap-wrapper.c
	else
	extraldap_src = ldap-wrapper-ce.c dirmngr_ldap.c
	endif

	noinst_HEADERS = dirmngr.h crlcache.h crlfetch.h misc.h

	dirmngr_SOURCES = dirmngr.c dirmngr.h server.c crlcache.c crlfetch.c \
	certcache.c certcache.h \
	cdb.h cdblib.c misc.c dirmngr-err.h \
	ocsp.c ocsp.h validate.c validate.h \
	ks-action.c ks-action.h ks-engine.h \
	ks-engine-hkp.c ks-engine-http.c ks-engine-finger.c ks-engine-kdns.c \
	ks-engine-ldap.c \
	ldap-parse-uri.c ldap-parse-uri.h

	if USE_LDAP
	dirmngr_SOURCES += ldapserver.h ldapserver.c ldap.c w32-ldap-help.h \
	ldap-wrapper.h $(ldap_url) $(extraldap_src)
	ldaplibs = $(LDAPLIBS)
	else
	ldaplibs =
	endif


	dirmngr_LDADD = $(libcommontlsnpth) $(libcommonpth) \
	$(DNSLIBS) $(LIBASSUAN_LIBS) \
	$(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(NPTH_LIBS) \
	$(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV)
	if USE_LDAP
	dirmngr_LDADD += $(ldaplibs)
	endif
	if !USE_LDAPWRAPPER
	dirmngr_LDADD += $(ldaplibs)
	endif
	dirmngr_LDFLAGS = $(extra_bin_ldflags)

	if USE_LDAPWRAPPER
	dirmngr_ldap_SOURCES = dirmngr_ldap.c $(ldap_url)
	dirmngr_ldap_CFLAGS = $(GPG_ERROR_CFLAGS) $(LIBGCRYPT_CFLAGS)
	dirmngr_ldap_LDFLAGS =
	dirmngr_ldap_LDADD = $(libcommon) no-libgcrypt.o \
	$(GPG_ERROR_LIBS) $(LDAPLIBS) $(LBER_LIBS) $(LIBINTL) \
	$(LIBICONV)
	endif

	dirmngr_client_SOURCES = dirmngr-client.c
	dirmngr_client_LDADD = $(libcommon) no-libgcrypt.o \
	$(LIBASSUAN_LIBS) \
	$(GPG_ERROR_LIBS) $(NETLIBS) $(LIBINTL) $(LIBICONV)
	dirmngr_client_LDFLAGS = $(extra_bin_ldflags)


	no-libgcrypt.c : $(top_srcdir)/tools/no-libgcrypt.c
	cat $(top_srcdir)/tools/no-libgcrypt.c > no-libgcrypt.c


	t_common_src = t-support.h
	# We need libcommontls, because we use the http functions.
	t_common_ldadd = $(libcommontls) $(libcommon) no-libgcrypt.o \
	$(GPG_ERROR_LIBS) $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(DNSLIBS)

	module_tests = t-ldap-parse-uri
	t_ldap_parse_uri_SOURCES = \
	t-ldap-parse-uri.c ldap-parse-uri.c ldap-parse-uri.h \
	$(t_common_src)
	t_ldap_parse_uri_LDADD = $(ldaplibs) $(t_common_ldadd)

	$(PROGRAMS) : $(libcommon) $(libcommonpth) $(libcommontls) $(libcommontlsnpth)
	diff --git a/g10/Makefile.am b/g10/Makefile.am
	index 0a021195a..b66abb84c 100644
	--- a/g10/Makefile.am
	+++ b/g10/Makefile.am
	@@ -1,181 +1,180 @@
	# Copyright (C) 1998, 1999, 2000, 2001, 2002,
	# 2003, 2006, 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 <http://www.gnu.org/licenses/>.

	## Process this file with automake to produce Makefile.in

	EXTRA_DIST = options.skel distsigkey.gpg ChangeLog-2011 gpg-w32info.rc \
	gpg.w32-manifest.in

	-AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common \
	- -I$(top_srcdir)/include -I$(top_srcdir)/intl
	+AM_CPPFLAGS = -I$(top_srcdir)/common

	include $(top_srcdir)/am/cmacros.am

	AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS)

	needed_libs = ../kbx/libkeybox.a $(libcommon)

	bin_PROGRAMS = gpg2
	if !HAVE_W32CE_SYSTEM
	bin_PROGRAMS += gpgv2
	endif
	noinst_PROGRAMS = $(module_tests)
	TESTS = $(module_tests)

	if ENABLE_BZIP2_SUPPORT
	bzip2_source = compress-bz2.c
	else
	bzip2_source =
	endif

	if ENABLE_CARD_SUPPORT
	card_source = card-util.c
	else
	card_source =
	endif

	if NO_TRUST_MODELS
	trust_source =
	else
	trust_source = trustdb.c trustdb.h tdbdump.c tdbio.c tdbio.h
	endif


	if HAVE_W32_SYSTEM
	resource_objs += gpg-w32info.o

	gpg-w32info.o : gpg.w32-manifest

	endif

	common_source = \
	gpg.h \
	dek.h \
	build-packet.c \
	compress.c \
	$(bzip2_source) \
	filter.h \
	free-packet.c \
	getkey.c \
	keydb.c keydb.h \
	keyring.c keyring.h \
	seskey.c \
	kbnode.c \
	main.h \
	mainproc.c \
	armor.c \
	mdfilter.c \
	textfilter.c \
	progress.c \
	misc.c \
	rmd160.c rmd160.h \
	options.h \
	openfile.c \
	keyid.c \
	packet.h \
	parse-packet.c \
	cpr.c \
	plaintext.c \
	sig-check.c \
	keylist.c \
	pkglue.c pkglue.h \
	ecdh.c

	gpg2_SOURCES = gpg.c \
	server.c \
	$(common_source) \
	pkclist.c \
	skclist.c \
	pubkey-enc.c \
	passphrase.c \
	decrypt.c \
	decrypt-data.c \
	cipher.c \
	encrypt.c \
	sign.c \
	verify.c \
	revoke.c \
	keyedit.c \
	dearmor.c \
	import.c \
	export.c \
	migrate.c \
	delkey.c \
	keygen.c \
	helptext.c \
	keyserver.c \
	keyserver-internal.h \
	call-dirmngr.c call-dirmngr.h \
	photoid.c photoid.h \
	call-agent.c call-agent.h \
	trust.c $(trust_source) \
	$(card_source) \
	exec.c exec.h

	gpgv2_SOURCES = gpgv.c \
	$(common_source) \
	verify.c

	#gpgd_SOURCES = gpgd.c \
	# ks-proto.h \
	# ks-proto.c \
	# ks-db.c \
	# ks-db.h \
	# $(common_source)

	# FIXME: Libkeybox.a links to libksba thus we need to add libksba
	# here, even that it is not used by gpg. A proper solution would
	# either to split up libkeybox.a or to use a separate keybox daemon.
	LDADD = $(needed_libs) ../common/libgpgrl.a \
	$(ZLIBS) $(DNSLIBS) \
	$(LIBINTL) $(CAPLIBS) $(NETLIBS)
	gpg2_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) $(LIBREADLINE) \
	$(KSBA_LIBS) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \
	$(LIBICONV) $(resource_objs) $(extra_sys_libs)
	gpg2_LDFLAGS = $(extra_bin_ldflags)
	gpgv2_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) \
	$(KSBA_LIBS) $(GPG_ERROR_LIBS) \
	$(LIBICONV) $(resource_objs) $(extra_sys_libs)
	gpgv2_LDFLAGS = $(extra_bin_ldflags)

	t_common_ldadd =
	module_tests = t-rmd160
	t_rmd160_SOURCES = t-rmd160.c rmd160.c
	t_rmd160_LDADD = $(t_common_ldadd)


	$(PROGRAMS): $(needed_libs) ../common/libgpgrl.a

	install-data-local:
	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
	$(INSTALL_DATA) $(srcdir)/options.skel \
	$(DESTDIR)$(pkgdatadir)/gpg-conf.skel
	$(INSTALL_DATA) $(srcdir)/distsigkey.gpg \
	$(DESTDIR)$(pkgdatadir)/distsigkey.gpg

	uninstall-local:
	-@rm $(DESTDIR)$(pkgdatadir)/gpg-conf.skel
	-@rm $(DESTDIR)$(pkgdatadir)/distsigkey.gpg


	# There has never been a gpg for WindowsCE, thus we don't need a gpg2 here
	if HAVE_W32CE_SYSTEM
	install-exec-hook:
	mv -f $(DESTDIR)$(bindir)/gpg2$(EXEEXT) \
	$(DESTDIR)$(bindir)/gpg$(EXEEXT)
	endif
	diff --git a/g13/Makefile.am b/g13/Makefile.am
	index bbffe0246..7d627cb1d 100644
	--- a/g13/Makefile.am
	+++ b/g13/Makefile.am
	@@ -1,47 +1,47 @@
	# g13/Makefile.am
	# Copyright (C) 2009 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/>.

	## Process this file with automake to produce Makefile.in

	EXTRA_DIST = ChangeLog-2011

	bin_PROGRAMS = g13

	-AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/common
	+AM_CPPFLAGS = -I$(top_srcdir)/common

	include $(top_srcdir)/am/cmacros.am

	AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_CFLAGS) $(NPTH_CFLAGS)

	g13_SOURCES = \
	g13.c g13.h \
	keyblob.h \
	utils.c utils.h \
	server.c server.h \
	create.c create.h \
	mount.c mount.h \
	mountinfo.c mountinfo.h \
	call-gpg.c call-gpg.h \
	runner.c runner.h \
	backend.c backend.h \
	be-encfs.c be-encfs.h \
	be-truecrypt.c be-truecrypt.h

	g13_LDADD = $(libcommonpth) \
	$(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(NPTH_LIBS) \
	$(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV)
	diff --git a/kbx/Makefile.am b/kbx/Makefile.am
	index eb434b6c8..5df2bbaef 100644
	--- a/kbx/Makefile.am
	+++ b/kbx/Makefile.am
	@@ -1,61 +1,60 @@
	# Keybox Makefile
	# Copyright (C) 2001, 2002, 2003 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/>.

	## Process this file with automake to produce Makefile.in

	EXTRA_DIST = mkerrors

	-AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common \
	- -I$(top_srcdir)/intl
	+AM_CPPFLAGS = -I$(top_srcdir)/common

	include $(top_srcdir)/am/cmacros.am

	AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS)

	noinst_LIBRARIES = libkeybox.a
	bin_PROGRAMS = kbxutil

	if HAVE_W32CE_SYSTEM
	extra_libs = $(LIBASSUAN_LIBS)
	else
	extra_libs =
	endif

	common_sources = \
	keybox.h keybox-defs.h keybox-search-desc.h \
	keybox-util.c \
	keybox-init.c \
	keybox-blob.c \
	keybox-file.c \
	keybox-search.c \
	keybox-update.c \
	keybox-openpgp.c \
	keybox-dump.c


	libkeybox_a_SOURCES = $(common_sources)

	# We need W32SOCKLIBS because the init subsystem code in libcommon
	# requires it - although we don't actually need it. It is easier
	# to do it this way.
	kbxutil_SOURCES = kbxutil.c $(common_sources)
	kbxutil_LDADD = ../common/libcommon.a \
	$(KSBA_LIBS) $(LIBGCRYPT_LIBS) $(extra_libs) \
	$(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV) $(W32SOCKLIBS)

	$(PROGRAMS) : ../common/libcommon.a
	diff --git a/scd/Makefile.am b/scd/Makefile.am
	index f7217e3ad..6212e6150 100644
	--- a/scd/Makefile.am
	+++ b/scd/Makefile.am
	@@ -1,70 +1,70 @@
	# Copyright (C) 2002, 2003, 2005 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/>.

	## Process this file with automake to produce Makefile.in

	EXTRA_DIST = ChangeLog-2011 scdaemon-w32info.rc

	libexec_PROGRAMS = scdaemon

	-AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/common
	+AM_CPPFLAGS = -I$(top_srcdir)/common

	include $(top_srcdir)/am/cmacros.am

	if HAVE_W32_SYSTEM
	resource_objs += scdaemon-w32info.o
	endif

	AM_CFLAGS = $(LIBGCRYPT_CFLAGS) \
	$(KSBA_CFLAGS) $(LIBASSUAN_CFLAGS) $(NPTH_CFLAGS)


	card_apps = app-openpgp.c app-nks.c app-dinsig.c app-p15.c app-geldkarte.c app-sc-hsm.c

	scdaemon_SOURCES = \
	scdaemon.c scdaemon.h \
	command.c \
	atr.c atr.h \
	apdu.c apdu.h \
	ccid-driver.c ccid-driver.h \
	iso7816.c iso7816.h \
	app.c app-common.h app-help.c $(card_apps)


	scdaemon_LDADD = $(libcommonpth) \
	$(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) $(NPTH_LIBS) \
	$(LIBUSB_LIBS) $(GPG_ERROR_LIBS) \
	$(LIBINTL) $(DL_LIBS) $(NETLIBS) $(LIBICONV) $(resource_objs)

	# Removed for now: We need to decide whether it makes sense to
	# continue it at all, given that gpg has now all required
	# functionality.
	#sc_copykeys_SOURCES = \
	# sc-copykeys.c scdaemon.h \
	# apdu.c apdu.h \
	# ccid-driver.c ccid-driver.h \
	# iso7816.c iso7816.h \
	# atr.c atr.h \
	# app.c app-common.h app-help.c $(card_apps)
	#
	#sc_copykeys_LDADD = \
	# ../common/libcommon.a \
	# ../common/libsimple-pwquery.a \
	# $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) $(NPTH_LIBS) \
	# $(LIBUSB_LIBS) \
	# -lgpg-error @LIBINTL@ @DL_LIBS@
	#
	diff --git a/sm/Makefile.am b/sm/Makefile.am
	index 7f6df3a3d..dda3eb8d1 100644
	--- a/sm/Makefile.am
	+++ b/sm/Makefile.am
	@@ -1,70 +1,70 @@
	# Copyright (C) 2001, 2002, 2003 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/>.

	## Process this file with automake to produce Makefile.in

	EXTRA_DIST = ChangeLog-2011 gpgsm-w32info.rc

	bin_PROGRAMS = gpgsm

	AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) $(LIBASSUAN_CFLAGS)

	-AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common -I$(top_srcdir)/intl
	+AM_CPPFLAGS = -I$(top_srcdir)/common
	include $(top_srcdir)/am/cmacros.am

	if HAVE_W32_SYSTEM
	resource_objs += gpgsm-w32info.o
	endif

	gpgsm_SOURCES = \
	gpgsm.c gpgsm.h \
	misc.c \
	keydb.c keydb.h \
	server.c \
	call-agent.c \
	call-dirmngr.c \
	fingerprint.c \
	base64.c \
	certlist.c \
	certdump.c \
	certcheck.c \
	certchain.c \
	keylist.c \
	verify.c \
	sign.c \
	encrypt.c \
	decrypt.c \
	import.c \
	export.c \
	delete.c \
	certreqgen.c \
	certreqgen-ui.c \
	minip12.c minip12.h \
	qualified.c


	common_libs = ../kbx/libkeybox.a $(libcommon)

	gpgsm_LDADD = $(common_libs) ../common/libgpgrl.a \
	$(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) \
	$(GPG_ERROR_LIBS) $(LIBREADLINE) $(LIBINTL) \
	$(LIBICONV) $(resource_objs) $(extra_sys_libs)
	gpgsm_LDFLAGS = $(extra_bin_ldflags)

	# Make sure that all libs are build before we use them. This is
	# important for things like make -j2.
	$(PROGRAMS): $(common_libs)
	diff --git a/tools/Makefile.am b/tools/Makefile.am
	index 1ba03772a..5c28954f3 100644
	--- a/tools/Makefile.am
	+++ b/tools/Makefile.am
	@@ -1,154 +1,154 @@
	# 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
	+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

	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

File Metadata

Mime Type: text/x-diff
Expires: Thu, Feb 26, 6:53 PM (1 d, 15 h)
Storage Engine: local-disk
Storage Format: Raw Data
Storage Handle: 39/6f/cbb8b5cb8d0c9f17c57cd6874541

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions