← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/gnupg2/gutsy

« back to all changes in this revision

Viewing changes to agent/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Michael Bienia
  • Date: 2007-02-02 14:29:54 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20070202142954-f5h55skq432ona6m
Tags: 2.0.2-0ubuntu1
* New upstream release
  - includes the patch for CVE-2006-6235
  - a PIN pad can now also be used for signing keys
* Remaining changes:
  - Remove libpcsclite-dev, libopensc2-dev build dependencies (they are in
    universe).
  - Build-depend on libcurl3-gnutls-dev
  - Include /doc files as done with gnupg
* g10/call-agent.c: set DBG_ASSUAN to 0 to suppress a debug message
* debian/rules: add doc/com-certs.pem to the docs for gpgsm
* debian/README.Debian: remove note the gnupg2 isn't released yet.
* Modified Maintainer values to match Debian-Maintainer-Field spec.

Show diffs side-by-side

added added

removed removed

Lines of Context:
agent/Makefile.in
150
150
gpg_agent_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
151
151
        $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) \
152
152
        $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) \
153
 
        $(am__DEPENDENCIES_2)
 
153
        $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2)
154
154
am_gpg_preset_passphrase_OBJECTS = preset-passphrase.$(OBJEXT)
155
155
gpg_preset_passphrase_OBJECTS = $(am_gpg_preset_passphrase_OBJECTS)
156
156
am__DEPENDENCIES_3 = ../common/libsimple-pwquery.a
159
159
gpg_preset_passphrase_DEPENDENCIES = $(am__DEPENDENCIES_3) \
160
160
        $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_2) \
161
161
        $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) \
162
 
        $(am__DEPENDENCIES_2)
 
162
        $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2)
163
163
am_gpg_protect_tool_OBJECTS = protect-tool.$(OBJEXT) protect.$(OBJEXT) \
164
164
        minip12.$(OBJEXT)
165
165
gpg_protect_tool_OBJECTS = $(am_gpg_protect_tool_OBJECTS)
166
166
gpg_protect_tool_DEPENDENCIES = $(am__DEPENDENCIES_3) \
167
167
        $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_2) \
168
168
        $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) \
169
 
        $(am__DEPENDENCIES_2)
 
169
        $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2)
170
170
am_t_protect_OBJECTS = t-protect.$(OBJEXT) protect.$(OBJEXT)
171
171
t_protect_OBJECTS = $(am_t_protect_OBJECTS)
172
172
am__DEPENDENCIES_5 = $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_2) \
173
 
        $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2)
 
173
        $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) \
 
174
        $(am__DEPENDENCIES_2)
174
175
t_protect_DEPENDENCIES = $(am__DEPENDENCIES_5)
175
176
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
176
177
depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
444
445
gpg_agent_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_PTH_CFLAGS) $(PTH_CFLAGS)
445
446
gpg_agent_LDADD = $(commonpth_libs) \
446
447
                $(LIBGCRYPT_LIBS) $(LIBASSUAN_PTH_LIBS) $(PTH_LIBS) \
447
 
                $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS)
 
448
                $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV)
448
449
 
449
450
gpg_protect_tool_SOURCES = \
450
451
        protect-tool.c \
454
455
 
455
456
# Needs $(NETLIBS) for libsimple-pwquery.la.
456
457
gpg_protect_tool_LDADD = $(pwquery_libs) $(common_libs) \
457
 
         $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS)
 
458
         $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV)
458
459
 
459
460
gpg_preset_passphrase_SOURCES = \
460
461
        preset-passphrase.c
462
463
 
463
464
# Needs $(NETLIBS) for libsimple-pwquery.la.
464
465
gpg_preset_passphrase_LDADD = $(pwquery_libs) $(common_libs) \
465
 
         $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS)
 
466
         $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV)
466
467
 
467
468
 
468
469
#
470
471
#
471
472
TESTS = t-protect
472
473
t_common_ldadd = $(common_libs) \
473
 
                 $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL)
 
474
                 $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV)
474
475
 
475
476
t_protect_SOURCES = t-protect.c protect.c 
476
477
t_protect_LDADD = $(t_common_ldadd)