← Back to branch summary

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

« back to all changes in this revision

Viewing changes to g10/Makefile.am

  • 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:
g10/Makefile.am
72
72
              pkglue.c pkglue.h 
73
73
 
74
74
gpg2_SOURCES  = gpg.c           \
 
75
              server.c          \
75
76
              $(common_source)  \
76
77
              pkclist.c         \
77
78
              skclist.c         \
118
119
LDADD =  $(needed_libs) ../common/libgpgrl.a \
119
120
         $(ZLIBS) $(DNSLIBS) $(LIBREADLINE) \
120
121
         $(LIBINTL) $(CAPLIBS) $(NETLIBS)
121
 
gpg2_LDADD = $(LIBGCRYPT_LIBS) $(LDADD) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS)
122
 
gpgv2_LDADD = $(LIBGCRYPT_LIBS) $(LDADD) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS)
 
122
gpg2_LDADD = $(LIBGCRYPT_LIBS) $(LDADD) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \
 
123
             $(LIBICONV)
 
124
gpgv2_LDADD = $(LIBGCRYPT_LIBS) $(LDADD) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \
 
125
              $(LIBICONV)
123
126
 
124
127
$(PROGRAMS): $(needed_libs) ../common/libgpgrl.a
125
128