← Back to branch summary

~ubuntu-branches/ubuntu/natty/gnome-keyring/natty

« back to all changes in this revision

Viewing changes to gcr/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2010-12-06 17:58:28 UTC
  • mfrom: (1.1.65 upstream)
  • Revision ID: james.westby@ubuntu.com-20101206175828-8xjojyxw89qacpq7
Tags: 2.92.92.is.2.32.1-0ubuntu1
* New upstream version
* debian/control.in:
  - updated the libglib requirement
* debian/libgcr0.symbols:
  - new version update
* debian/patches/02_uidir_relocate.patch:
  - updated for the new version
* debian/patches/10_git_fix_cka_trusted_collections.patch:
  - dropped, the patch is the new version
* debian/patches/90_git_pam_headers.patch:
  - dropped, the patch is the new version

Show diffs side-by-side

added added

removed removed

Lines of Context:
gcr/Makefile.am
2
2
# UI BUILDER
3
3
# 
4
4
 
5
 
uidir = $(datadir)/gcr/ui/
 
5
uidir = $(datadir)/gcr@GCR_VERSION_SUFFIX@/ui/
6
6
 
7
7
ui_DATA = \
8
8
        gcr-certificate-basics-widget.ui \
12
12
# ------------------------------------------------------------------
13
13
# HEADERS
14
14
 
15
 
incdir = $(includedir)/gcr
 
15
incdir = $(includedir)/gcr@GCR_VERSION_SUFFIX@/gcr
16
16
 
17
17
inc_HEADERS = \
18
18
        gcr.h \
23
23
        gcr-parser.h \
24
24
        gcr-simple-certificate.h \
25
25
        gcr-types.h \
 
26
        gcr-unlock-options.h \
26
27
        gcr-unlock-options-widget.h
27
28
 
28
29
# ------------------------------------------------------------------
40
41
BUILT_SOURCES = \
41
42
        gcr-marshal.c gcr-marshal.h
42
43
 
43
 
lib_LTLIBRARIES = libgcr.la
 
44
lib_LTLIBRARIES = libgcr@GCR_VERSION_SUFFIX@.la
44
45
 
45
 
libgcr_la_SOURCES = \
 
46
libgcr@GCR_VERSION_SUFFIX@_la_SOURCES = \
46
47
        gcr-certificate.c gcr-certificate.h \
47
48
        gcr-certificate-basics-widget.c gcr-certificate-basics-widget.h \
48
49
        gcr-certificate-details-widget.c gcr-certificate-details-widget.h \
53
54
        gcr-parser.c gcr-parser.h \
54
55
        gcr-simple-certificate.c gcr-simple-certificate.h \
55
56
        gcr-types.h \
 
57
        gcr-unlock-options.h \
56
58
        gcr-unlock-options-widget.c gcr-unlock-options-widget.h \
57
59
        $(BUILT_SOURCES)
58
60
 
59
 
libgcr_la_CFLAGS = \
 
61
libgcr@GCR_VERSION_SUFFIX@_la_CFLAGS = \
60
62
        -DPKCS11_MODULE_PATH=\""$(libdir)/gnome-keyring/gnome-keyring-pkcs11.so"\" \
61
63
        -DGCR_API_SUBJECT_TO_CHANGE \
62
64
        -DUIDIR=\""$(uidir)"\"
63
65
    
64
 
libgcr_la_LDFLAGS = \
 
66
libgcr@GCR_VERSION_SUFFIX@_la_LDFLAGS = \
65
67
        -version-info $(GCR_LT_RELEASE) \
66
68
        -no-undefined -export-symbols-regex 'gcr_*'
67
69
    
68
 
libgcr_la_LIBADD = \
 
70
libgcr@GCR_VERSION_SUFFIX@_la_LIBADD = \
69
71
        $(top_builddir)/egg/libegg.la \
70
72
        $(top_builddir)/egg/libegg-entry-buffer.la \
71
73
        $(top_builddir)/gp11/libgp11.la \