← Back to branch summary

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

« back to all changes in this revision

Viewing changes to common/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:
common/Makefile.in
344
344
LIBASSUAN_CFLAGS = @LIBASSUAN_CFLAGS@
345
345
LIBASSUAN_CONFIG = @LIBASSUAN_CONFIG@
346
346
LIBASSUAN_LIBS = @LIBASSUAN_LIBS@
347
 
LIBASSUAN_PTH_CFLAGS = @LIBASSUAN_PTH_CFLAGS@
348
 
LIBASSUAN_PTH_LIBS = @LIBASSUAN_PTH_LIBS@
349
347
LIBCURL = @LIBCURL@
350
348
LIBCURL_CPPFLAGS = @LIBCURL_CPPFLAGS@
351
349
LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
522
520
        $(am__append_7)
523
521
libcommon_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) -DWITHOUT_GNU_PTH=1
524
522
libcommonpth_a_SOURCES = $(common_sources) $(am__append_8)
525
 
libcommonpth_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_PTH_CFLAGS) $(PTH_CFLAGS)
 
523
libcommonpth_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) $(PTH_CFLAGS)
526
524
libsimple_pwquery_a_SOURCES = \
527
525
        simple-pwquery.c simple-pwquery.h asshelp.c asshelp.h
528
526