← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/gnupg2/jaunty-security

« back to all changes in this revision

Viewing changes to agent/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Thomas Viehmann
  • Date: 2008-10-04 10:25:53 UTC
  • mfrom: (5.1.15 intrepid)
  • Revision ID: james.westby@ubuntu.com-20081004102553-fv62pp8dsitxli47
Tags: 2.0.9-3.1
http://bugs.debian.org/499569
* Non-maintainer upload.
* agent/gpg-agent.c: Deinit the threading library before exec'ing
  the command to run in --daemon mode. And because that still doesn't
  restore the sigprocmask, do that manually. Closes: #499569

Show diffs side-by-side

added added

removed removed

Lines of Context:
agent/Makefile.am
4
4
#
5
5
# GnuPG is free software; you can redistribute it and/or modify
6
6
# it under the terms of the GNU General Public License as published by
7
 
# the Free Software Foundation; either version 2 of the License, or
 
7
# the Free Software Foundation; either version 3 of the License, or
8
8
# (at your option) any later version.
9
9
# 
10
10
# GnuPG is distributed in the hope that it will be useful,
13
13
# GNU General Public License for more details.
14
14
# 
15
15
# You should have received a copy of the GNU General Public License
16
 
# along with this program; if not, write to the Free Software
17
 
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 
16
# along with this program; if not, see <http://www.gnu.org/licenses/>.
18
17
 
19
18
## Process this file with automake to produce Makefile.in
20
19
 
22
21
libexec_PROGRAMS = gpg-protect-tool gpg-preset-passphrase
23
22
noinst_PROGRAMS = $(TESTS)
24
23
 
 
24
# EXTRA_DIST = gpg-agent.ico gpg-agent-resource.rc
 
25
 
25
26
AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common -I$(top_srcdir)/intl
26
27
 
27
28
include $(top_srcdir)/am/cmacros.am
28
29
 
29
 
INCLUDES = -I../include
30
 
 
31
 
AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_CFLAGS) $(PTH_CFLAGS)
 
30
AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS)
32
31
 
33
32
gpg_agent_SOURCES = \
34
33
        gpg-agent.c agent.h \
35
34
        command.c command-ssh.c \
36
 
        query.c \
 
35
        call-pinentry.c \
37
36
        cache.c \
38
37
        trans.c \
39
38
        findkey.c \
46
45
        call-scd.c \
47
46
        learncard.c
48
47
 
49
 
 
50
 
gpg_agent_LDADD = ../jnlib/libjnlib.a ../common/libcommon.a ../gl/libgnu.a \
51
 
                $(LIBGCRYPT_LIBS) $(PTH_LIBS) $(LIBASSUAN_LIBS) \
52
 
                 -lgpg-error @LIBINTL@
 
48
common_libs = $(libcommon) ../jnlib/libjnlib.a ../gl/libgnu.a
 
49
commonpth_libs = $(libcommonpth) ../jnlib/libjnlib.a ../gl/libgnu.a
 
50
pwquery_libs = ../common/libsimple-pwquery.a
 
51
 
 
52
#if HAVE_W32_SYSTEM
 
53
#.rc.o:
 
54
#       $(WINDRES) `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
 
55
#        sed -e 's/-I/--include-dir /g;s/-D/--define /g'` -i $< -o $@
 
56
#
 
57
#gpg_agent_res_ldflags = -Wl,gpg-agent-resource.o -Wl,--subsystem,windows
 
58
#gpg_agent_res_deps = gpg-agent-resource.o
 
59
#else
 
60
gpg_agent_res_ldflags =
 
61
gpg_agent_res_deps =
 
62
#endif
 
63
 
 
64
 
 
65
gpg_agent_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_PTH_CFLAGS) $(PTH_CFLAGS)
 
66
gpg_agent_LDADD = $(commonpth_libs) \
 
67
                $(LIBGCRYPT_LIBS) $(LIBASSUAN_PTH_LIBS) $(PTH_LIBS) \
 
68
                $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV)
 
69
gpg_agent_LDFLAGS = $(gpg_agent_res_ldflags)
 
70
gpg_agent_DEPENDENCIES = $(gpg_agent_res_deps)
53
71
 
54
72
gpg_protect_tool_SOURCES = \
55
73
        protect-tool.c \
56
74
        protect.c \
57
75
        minip12.c minip12.h 
58
76
 
59
 
gpg_protect_tool_LDADD = ../common/libsimple-pwquery.a \
60
 
        ../jnlib/libjnlib.a  ../common/libcommon.a ../gl/libgnu.a \
61
 
         $(LIBGCRYPT_LIBS) -lgpg-error @LIBINTL@
62
 
if HAVE_W32_SYSTEM
63
 
gpg_protect_tool_LDADD += -lwsock32
64
 
endif
 
77
# Needs $(NETLIBS) for libsimple-pwquery.la.
 
78
gpg_protect_tool_LDADD = $(pwquery_libs) $(common_libs) \
 
79
         $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV)
65
80
 
66
81
gpg_preset_passphrase_SOURCES = \
67
82
        preset-passphrase.c
68
83
 
69
 
gpg_preset_passphrase_LDADD = ../common/libsimple-pwquery.a \
70
 
        ../jnlib/libjnlib.a ../common/libcommon.a ../gl/libgnu.a \
71
 
         $(LIBGCRYPT_LIBS) -lgpg-error @LIBINTL@
72
 
if HAVE_W32_SYSTEM
73
 
gpg_preset_passphrase_LDADD += -lwsock32
74
 
endif
 
84
# Needs $(NETLIBS) for libsimple-pwquery.la.
 
85
gpg_preset_passphrase_LDADD = \
 
86
         $(pwquery_libs) $(common_libs) \
 
87
         $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV)
 
88
 
 
89
 
 
90
# Make sure that all libs are build before we use them.  This is
 
91
# important for things like make -j2.
 
92
$(PROGRAMS): $(common_libs) $(commonpth_libs) $(pwquery_libs)
 
93
 
 
94
 
75
95
 
76
96
#
77
97
# Module tests
78
98
#
79
99
TESTS = t-protect
80
100
 
81
 
t_common_ldadd = ../jnlib/libjnlib.a ../common/libcommon.a ../gl/libgnu.a \
82
 
                 $(LIBGCRYPT_LIBS) -lgpg-error @LIBINTL@
 
101
t_common_ldadd = $(common_libs) \
 
102
                 $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV)
83
103
 
84
104
t_protect_SOURCES = t-protect.c protect.c 
85
105
t_protect_LDADD = $(t_common_ldadd)