← Back to branch summary

~ubuntu-branches/ubuntu/utopic/dovecot/utopic-proposed

« back to all changes in this revision

Viewing changes to src/lib-mail/Makefile.am

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-01-08 09:35:49 UTC
  • mfrom: (4.1.35 sid)
  • Revision ID: package-import@ubuntu.com-20140108093549-i72o93pux8p0dlaf
Tags: 1:2.2.9-1ubuntu1
* Merge from Debian unstable, remaining changes:
  + Add mail-stack-delivery package:
    - Update d/rules
    - d/control: convert existing dovecot-postfix package to a dummy
      package and add new mail-stack-delivery package.
    - Update maintainer scripts.
    - Rename d/dovecot-postfix.* to debian/mail-stack-delivery.*
    - d/mail-stack-delivery.preinst: Move previously installed backups and
      config files to a new package namespace.
    - d/mail-stack-delivery.prerm: Added to handle downgrades.
  + Use Snakeoil SSL certificates by default:
    - d/control: Depend on ssl-cert.
    - d/dovecot-core.postinst: Relax grep for SSL_* a bit.
  + Add autopkgtest to debian/tests/*.
  + Add ufw integration:
    - d/dovecot-core.ufw.profile: new ufw profile.
    - d/rules: install profile in dovecot-core.
    - d/control: dovecot-core - suggest ufw.
  + d/dovecot-core.dirs: Added usr/share/doc/dovecot-core
  + Add apport hook:
    - d/rules, d/source_dovecot.py
  + Add upstart job:
    - d/rules, d/dovecot-core.dovecot.upstart, d/control,
      d/dovecot-core.dirs, dovecot-imapd.{postrm, postinst, prerm},
      d/dovecot-pop3d.{postinst, postrm, prerm}.
      d/mail-stack-deliver.postinst: Convert init script to upstart.
  + Use the autotools-dev dh addon to update config.guess/config.sub for
    arm64.
* Dropped changes, included in Debian:
  - Update Dovecot name to reflect distribution in login greeting.
  - Update Drac plugin for >= 2.0.0 support.
* d/control: Drop dovecot-postfix package as its no longer required.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/lib-mail/Makefile.am
6
6
        -I$(top_srcdir)/src/lib-charset
7
7
 
8
8
libmail_la_SOURCES = \
 
9
        istream-attachment-connector.c \
 
10
        istream-attachment-extractor.c \
 
11
        istream-binary-converter.c \
9
12
        istream-dot.c \
10
13
        istream-header-filter.c \
 
14
        istream-nonuls.c \
 
15
        istream-qp-decoder.c \
11
16
        mail-user-hash.c \
12
17
        mbox-from.c \
13
18
        message-address.c \
 
19
        message-binary-part.c \
14
20
        message-date.c \
15
21
        message-decoder.c \
16
22
        message-header-decode.c \
20
26
        message-parser.c \
21
27
        message-part-serialize.c \
22
28
        message-search.c \
23
 
        message-send.c \
24
29
        message-size.c \
25
30
        quoted-printable.c \
26
31
        rfc2231-parser.c \
27
32
        rfc822-parser.c
28
33
 
29
34
headers = \
 
35
        istream-attachment-connector.h \
 
36
        istream-attachment-extractor.h \
 
37
        istream-binary-converter.h \
30
38
        istream-dot.h \
31
39
        istream-header-filter.h \
 
40
        istream-nonuls.h \
 
41
        istream-qp.h \
32
42
        mail-user-hash.h \
33
43
        mbox-from.h \
34
44
        mail-types.h \
35
45
        message-address.h \
 
46
        message-binary-part.h \
36
47
        message-date.h \
37
48
        message-decoder.h \
38
49
        message-header-decode.h \
42
53
        message-parser.h \
43
54
        message-part-serialize.h \
44
55
        message-search.h \
45
 
        message-send.h \
46
56
        message-size.h \
47
57
        quoted-printable.h \
48
58
        rfc2231-parser.h \
53
63
 
54
64
test_programs = \
55
65
        test-istream-dot \
 
66
        test-istream-attachment \
 
67
        test-istream-binary-converter \
56
68
        test-istream-header-filter \
 
69
        test-istream-qp-decoder \
57
70
        test-mbox-from \
58
71
        test-message-address \
59
72
        test-message-date \
72
85
        ../lib-test/libtest.la \
73
86
        ../lib/liblib.la
74
87
 
 
88
test_deps = $(noinst_LTLIBRARIES) $(test_libs)
 
89
 
75
90
test_istream_dot_SOURCES = test-istream-dot.c
76
91
test_istream_dot_LDADD = istream-dot.lo $(test_libs)
77
 
test_istream_dot_DEPENDENCIES = istream-dot.lo $(test_libs)
 
92
test_istream_dot_DEPENDENCIES = $(test_deps)
 
93
 
 
94
test_istream_qp_decoder_SOURCES = test-istream-qp-decoder.c
 
95
test_istream_qp_decoder_LDADD = istream-qp-decoder.lo quoted-printable.lo $(test_libs)
 
96
test_istream_qp_decoder_DEPENDENCIES = $(test_deps)
 
97
 
 
98
message_parser_objects = \
 
99
        message-parser.lo \
 
100
        message-header-parser.lo \
 
101
        message-size.lo \
 
102
        rfc822-parser.lo \
 
103
        rfc2231-parser.lo
 
104
 
 
105
test_istream_binary_converter_SOURCES = test-istream-binary-converter.c
 
106
test_istream_binary_converter_LDADD = istream-binary-converter.lo $(message_parser_objects)  $(test_libs)
 
107
test_istream_binary_converter_DEPENDENCIES = $(test_deps)
 
108
 
 
109
test_istream_attachment_SOURCES = test-istream-attachment.c
 
110
test_istream_attachment_LDADD = istream-attachment-extractor.lo istream-attachment-connector.lo $(message_parser_objects) $(test_libs)
 
111
test_istream_attachment_DEPENDENCIES = $(test_deps)
78
112
 
79
113
test_istream_header_filter_SOURCES = test-istream-header-filter.c
80
114
test_istream_header_filter_LDADD = istream-header-filter.lo message-header-parser.lo $(test_libs)
81
 
test_istream_header_filter_DEPENDENCIES = istream-header-filter.lo message-header-parser.lo $(test_libs)
 
115
test_istream_header_filter_DEPENDENCIES = $(test_deps)
82
116
 
83
117
test_mbox_from_SOURCES = test-mbox-from.c
84
118
test_mbox_from_LDADD = mbox-from.lo $(test_libs)
85
 
test_mbox_from_DEPENDENCIES = mbox-from.lo $(test_libs)
 
119
test_mbox_from_DEPENDENCIES = $(test_deps)
86
120
 
87
121
test_message_address_SOURCES = test-message-address.c
88
122
test_message_address_LDADD = message-address.lo rfc822-parser.lo $(test_libs)
89
 
test_message_address_DEPENDENCIES = message-address.lo rfc822-parser.lo $(test_libs)
 
123
test_message_address_DEPENDENCIES = $(test_deps)
90
124
 
91
125
test_message_date_SOURCES = test-message-date.c
92
126
test_message_date_LDADD = message-date.lo rfc822-parser.lo $(test_libs)
93
 
test_message_date_DEPENDENCIES = message-date.lo rfc822-parser.lo $(test_libs)
 
127
test_message_date_DEPENDENCIES = $(test_deps)
94
128
 
95
129
test_message_decoder_SOURCES = test-message-decoder.c
96
130
test_message_decoder_LDADD = message-decoder.lo rfc822-parser.lo rfc2231-parser.lo $(test_libs)
97
 
test_message_decoder_DEPENDENCIES = message-decoder.lo rfc822-parser.lo rfc2231-parser.lo $(test_libs)
 
131
test_message_decoder_DEPENDENCIES = $(test_deps)
98
132
 
99
133
test_message_header_decode_SOURCES = test-message-header-decode.c
100
134
test_message_header_decode_LDADD = message-header-decode.lo quoted-printable.lo $(test_libs)
101
 
test_message_header_decode_DEPENDENCIES = message-header-decode.lo quoted-printable.lo $(test_libs)
 
135
test_message_header_decode_DEPENDENCIES = $(test_deps)
102
136
 
103
137
test_message_header_encode_SOURCES = test-message-header-encode.c
104
138
test_message_header_encode_LDADD = message-header-encode.lo $(test_libs)
105
 
test_message_header_encode_DEPENDENCIES = message-header-encode.lo $(test_libs)
 
139
test_message_header_encode_DEPENDENCIES = $(test_deps)
106
140
 
107
141
test_message_header_parser_SOURCES = test-message-header-parser.c
108
142
test_message_header_parser_LDADD = message-header-parser.lo $(test_libs)
109
 
test_message_header_parser_DEPENDENCIES = message-header-parser.lo $(test_libs)
 
143
test_message_header_parser_DEPENDENCIES = $(test_deps)
110
144
 
111
145
test_message_id_SOURCES = test-message-id.c
112
146
test_message_id_LDADD = message-id.lo rfc822-parser.lo $(test_libs)
113
 
test_message_id_DEPENDENCIES = message-id.lo rfc822-parser.lo $(test_libs)
 
147
test_message_id_DEPENDENCIES = $(test_deps)
114
148
 
115
149
test_message_parser_SOURCES = test-message-parser.c
116
150
test_message_parser_LDADD = message-parser.lo message-header-parser.lo message-size.lo rfc822-parser.lo rfc2231-parser.lo $(test_libs)
117
 
test_message_parser_DEPENDENCIES = message-parser.lo message-header-parser.lo message-size.lo rfc822-parser.lo rfc2231-parser.lo $(test_libs)
 
151
test_message_parser_DEPENDENCIES = $(test_deps)
118
152
 
119
153
test_quoted_printable_SOURCES = test-quoted-printable.c
120
154
test_quoted_printable_LDADD = quoted-printable.lo $(test_libs)
121
 
test_quoted_printable_DEPENDENCIES = quoted-printable.lo $(test_libs)
 
155
test_quoted_printable_DEPENDENCIES = $(test_deps)
122
156
 
123
157
test_rfc2231_parser_SOURCES = test-rfc2231-parser.c
124
158
test_rfc2231_parser_LDADD = rfc2231-parser.lo rfc822-parser.lo $(test_libs)
125
 
test_rfc2231_parser_DEPENDENCIES = rfc2231-parser.lo rfc822-parser.lo $(test_libs)
 
159
test_rfc2231_parser_DEPENDENCIES = $(test_deps)
126
160
 
127
161
check: check-am check-test
128
162
check-test: all-am