← Back to branch summary

~ubuntu-branches/ubuntu/quantal/gnupg2/quantal-security

« back to all changes in this revision

Viewing changes to agent/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Marc Deslauriers
  • Date: 2011-05-25 14:27:35 UTC
  • mfrom: (1.1.15 upstream) (7.1.7 sid)
  • Revision ID: james.westby@ubuntu.com-20110525142735-jccyw0fopnyv728q
Tags: 2.0.17-2ubuntu1
* Merge from debian unstable. Remaining changes:
  - Add udev rules to give gpg access to some smartcard readers;
    Debian #543217.
    . debian/gnupg2.dev: udev rules to set ACLs on SCM smartcard readers.
    . debian/rules: Call dh_installudev.
  - debian/control: Rename Vcs-* to XS-Debian-Vcs-*.

Show diffs side-by-side

added added

removed removed

Lines of Context:
agent/Makefile.in
250
250
LIBASSUAN_CFLAGS = @LIBASSUAN_CFLAGS@
251
251
LIBASSUAN_CONFIG = @LIBASSUAN_CONFIG@
252
252
LIBASSUAN_LIBS = @LIBASSUAN_LIBS@
253
 
LIBASSUAN_PTH_CFLAGS = @LIBASSUAN_PTH_CFLAGS@
254
 
LIBASSUAN_PTH_LIBS = @LIBASSUAN_PTH_LIBS@
255
253
LIBCURL = @LIBCURL@
256
254
LIBCURL_CPPFLAGS = @LIBCURL_CPPFLAGS@
257
255
LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
409
407
gpg_agent_res_ldflags = 
410
408
gpg_agent_res_deps = 
411
409
#endif
412
 
gpg_agent_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_PTH_CFLAGS) $(PTH_CFLAGS)
 
410
gpg_agent_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) $(PTH_CFLAGS)
413
411
gpg_agent_LDADD = $(commonpth_libs) \
414
 
                $(LIBGCRYPT_LIBS) $(LIBASSUAN_PTH_LIBS) $(PTH_LIBS) \
 
412
                $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(PTH_LIBS) \
415
413
                $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV)
416
414
 
417
415
gpg_agent_LDFLAGS = $(gpg_agent_res_ldflags)