~ubuntu-branches/ubuntu/trusty/dovecot/trusty-updates

« back to all changes in this revision

Viewing changes to src/doveadm/Makefile.am

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-01-08 09:35:49 UTC
  • mfrom: (1.15.3) (96.1.1 trusty-proposed)
  • Revision ID: package-import@ubuntu.com-20140108093549-814nkqdcxfbvgktg
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:
10
10
        -I$(top_srcdir)/src/lib \
11
11
        -I$(top_srcdir)/src/lib-settings \
12
12
        -I$(top_srcdir)/src/lib-auth \
 
13
        -I$(top_srcdir)/src/lib-compression \
13
14
        -I$(top_srcdir)/src/lib-dict \
14
15
        -I$(top_srcdir)/src/lib-fs \
 
16
        -I$(top_srcdir)/src/lib-ssl-iostream \
15
17
        -I$(top_srcdir)/src/lib-master \
16
18
        -I$(top_srcdir)/src/lib-mail \
17
19
        -I$(top_srcdir)/src/lib-imap \
22
24
        -DDOVEADM_MODULEDIR=\""$(doveadm_moduledir)"\" \
23
25
        -DPKG_RUNDIR=\""$(rundir)"\" \
24
26
        -DPKG_STATEDIR=\""$(statedir)"\" \
 
27
        -DPKG_LIBEXECDIR=\""$(pkglibexecdir)"\" \
25
28
        -DBINDIR=\""$(bindir)"\" \
26
29
        -DMANDIR=\""$(mandir)"\"
27
30
 
28
 
if !BUILD_SHARED_LIBS
29
 
unused_objects = \
30
 
        ../lib/mountpoint.o \
31
 
        ../lib-imap/imap-util.o \
32
 
        ../lib-storage/mail-search-parser-imap.o
33
 
endif
34
 
 
35
31
cmd_pw_libs = \
36
32
        ../auth/libpassword.a \
37
33
        ../lib-ntlm/libntlm.a \
38
34
        ../lib-otp/libotp.a
39
35
 
40
36
libs = \
41
 
        dsync/libdsync.a \
42
 
        $(unused_objects)
 
37
        dsync/libdsync.la \
 
38
        ../lib-compression/libcompression.la
43
39
 
44
40
doveadm_LDADD = \
45
41
        $(libs) \
46
42
        $(cmd_pw_libs) \
47
43
        $(CRYPT_LIBS) \
48
44
        $(LIBDOVECOT_STORAGE) \
49
 
        $(LIBDOVECOT) \
50
 
        $(MODULE_LIBS)
 
45
        $(LIBDOVECOT)
51
46
doveadm_DEPENDENCIES = \
52
47
        $(libs) \
53
48
        $(cmd_pw_libs) \
57
52
doveadm_server_LDADD = \
58
53
        $(libs) \
59
54
        $(LIBDOVECOT_STORAGE) \
60
 
        $(LIBDOVECOT) \
61
 
        $(MODULE_LIBS)
 
55
        $(LIBDOVECOT)
62
56
doveadm_server_DEPENDENCIES = \
63
57
        $(libs) \
64
58
        $(LIBDOVECOT_STORAGE_DEPS) \
67
61
common = \
68
62
        doveadm-mail.c \
69
63
        doveadm-mail-altmove.c \
 
64
        doveadm-mail-batch.c \
 
65
        doveadm-mail-deduplicate.c \
70
66
        doveadm-mail-expunge.c \
71
67
        doveadm-mail-fetch.c \
 
68
        doveadm-mail-flags.c \
72
69
        doveadm-mail-import.c \
73
70
        doveadm-mail-index.c \
74
71
        doveadm-mail-iter.c \
75
72
        doveadm-mail-mailbox.c \
76
73
        doveadm-mail-mailbox-status.c \
77
 
        doveadm-mail-move.c \
 
74
        doveadm-mail-copymove.c \
78
75
        doveadm-mailbox-list-iter.c \
79
76
        doveadm-mail-search.c \
80
77
        doveadm-mail-server.c \
94
91
        doveadm-dump-log.c \
95
92
        doveadm-dump-mailboxlog.c \
96
93
        doveadm-dump-thread.c \
 
94
        doveadm-fs.c \
97
95
        doveadm-instance.c \
98
96
        doveadm-kick.c \
99
97
        doveadm-log.c \
107
105
        doveadm-print-table.c \
108
106
        doveadm-proxy.c \
109
107
        doveadm-pw.c \
 
108
        doveadm-replicator.c \
110
109
        doveadm-sis.c \
111
110
        doveadm-stats.c \
112
 
        doveadm-who.c
 
111
        doveadm-who.c \
 
112
        doveadm-zlib.c
113
113
 
114
114
doveadm_server_SOURCES = \
115
115
        $(common) \
117
117
        doveadm-print-server.c \
118
118
        main.c
119
119
 
120
 
noinst_HEADERS = \
121
 
        client-connection.h \
122
 
        server-connection.h \
 
120
pkginc_libdir = $(pkgincludedir)
 
121
pkginc_lib_HEADERS = \
123
122
        doveadm.h \
124
123
        doveadm-dump.h \
125
124
        doveadm-mail.h \
127
126
        doveadm-mailbox-list-iter.h \
128
127
        doveadm-print.h \
129
128
        doveadm-print-private.h \
 
129
        doveadm-settings.h \
 
130
        doveadm-util.h
 
131
 
 
132
noinst_HEADERS = \
 
133
        client-connection.h \
 
134
        server-connection.h \
130
135
        doveadm-server.h \
131
 
        doveadm-settings.h \
132
 
        doveadm-util.h \
133
136
        doveadm-who.h
134
137
 
135
138
install-exec-local: