~ubuntu-branches/ubuntu/hardy/gnupg2/hardy

« back to all changes in this revision

Viewing changes to tools/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Michael Bienia, Michael Bienia, Kees Cook
  • Date: 2006-12-07 00:28:23 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20061207002823-0i7ittrpmsm1nv0i
Tags: 2.0.1-0ubuntu1
[ Michael Bienia ]
* New upstream version.
* Remaining changes:
  - Remove libpcsclite-dev, libopensc2-dev build dependencies (they are in
    universe).
* g10/encr-data.c: remotely controllable function pointer (CVE-2006-6235)
* debian/control: add libcurl3-gnutls-dev to build-depends 
  (Closes Ubuntu: #62864)

[ Kees Cook ]
* debian/rules: include doc/ files as done with gnupg

Show diffs side-by-side

added added

removed removed

Lines of Context:
73
73
watchgnupg_LDADD = $(NETLIBS)
74
74
 
75
75
gpg_connect_agent_SOURCES = gpg-connect-agent.c no-libgcrypt.c
76
 
gpg_connect_agent_LDADD = $(common_libs) \
77
 
                          $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL)
 
76
gpg_connect_agent_LDADD = $(common_libs) $(LIBASSUAN_LIBS) \
 
77
                          $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS)
78
78
 
79
79
gpgkey2ssh_SOURCES = gpgkey2ssh.c
80
80
gpgkey2ssh_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS)