]> git.pld-linux.org Git - packages/cyrus-imapd.git/blame - cyrus-imapd-shared.patch
projects / packages / cyrus-imapd.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- updated to 2.3.16
[packages/cyrus-imapd.git] / cyrus-imapd-shared.patch
CommitLineData
3beb582f
AF		 1--- cyrus-imapd-2.3.16/master/Makefile.in.wiget 2008-03-24 18:47:41.000000000 +0100
2+++ cyrus-imapd-2.3.16/master/Makefile.in 2010-04-11 22:34:54.330511878 +0200
3@@ -48,6 +48,8 @@ VPATH = @srcdir@
4 CC = @CC@
5 INSTALL = @INSTALL@
6 RANLIB = @RANLIB@
7+LIBTOOL = @LIBTOOL@
8+top_builddir = @top_builddir@
cad185d7 9
3beb582f
AF		 10 CYRUS_USER=@cyrus_user@
11 CYRUS_GROUP=@cyrus_group@
12@@ -58,7 +60,7 @@ DEPLIBS = @DEPLIBS@
cad185d7 13
3beb582f
AF		 14 CFLAGS = @CFLAGS@
15 LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
16-LIBS = ../lib/libcyrus_min.a @LIB_UCDSNMP@ @LIBS@ @COM_ERR_LIBS@
17+LIBS = ../lib/libcyrus_min.la @LIB_UCDSNMP@ @LIBS@ @COM_ERR_LIBS@
cad185d7 18
3beb582f
AF		 19 SHELL = /bin/sh
20 MAKEDEPEND = @MAKEDEPEND@
21@@ -68,7 +70,7 @@ exec_prefix = @exec_prefix@
22 cyrus_prefix = @cyrus_prefix@
23 service_path = @service_path@
cad185d7 24
3beb582f
AF		 25-LOBJS=service.o service-thread.o
26+LOBJS=service.lo service-thread.lo
cad185d7 27
3beb582f 28 PROGS=master
cad185d7 29
3beb582f
AF		 30@@ -78,18 +80,18 @@ install:
31 $(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
32 for file in $(PROGS); \
33 do \
34- $(INSTALL) -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
35+ $(LIBTOOL) --mode=install $(INSTALL) $$file $(DESTDIR)$(service_path) || exit 1; \
36 done
cad185d7 37
3beb582f
AF		 38-.c.o:
39- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
40+%.lo: %.c
41+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
42 $<
cad185d7 43
3beb582f
AF		 44-master: master.o masterconf.o cyrusMasterMIB.o ../lib/lock_@WITH_LOCK@.o
45- $(CC) $(LDFLAGS) -o master master.o masterconf.o cyrusMasterMIB.o ../lib/lock_@WITH_LOCK@.o $(LIBS) $(DEPLIBS)
46+master: master.lo masterconf.lo cyrusMasterMIB.lo ../lib/lock_@WITH_LOCK@.lo
47+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o master master.lo masterconf.lo cyrusMasterMIB.lo ../lib/lock_@WITH_LOCK@.lo $(LIBS) $(DEPLIBS)
cad185d7 48
3beb582f
AF		 49 clean:
50- rm -f *.o *.a Makefile.bak $(PROGS)
51+ rm -rf .libs *.lo *.a *.la Makefile.bak $(PROGS)
cad185d7 52
3beb582f
AF		 53 distclean: clean
54 rm -f Makefile
55--- cyrus-imapd-2.3.16/notifyd/Makefile.in.wiget 2008-03-24 20:59:32.000000000 +0100
56+++ cyrus-imapd-2.3.16/notifyd/Makefile.in 2010-04-11 22:34:54.330511878 +0200
57@@ -49,6 +49,8 @@ VPATH = @srcdir@
0010a797 58
3beb582f
AF		 59 CC = @CC@
60 RANLIB = @RANLIB@
61+LIBTOOL = @LIBTOOL@
62+top_builddir = @top_builddir@
cad185d7 63
3beb582f
AF		 64 INSTALL = @INSTALL@
65 CYRUS_USER=@cyrus_user@
66@@ -68,13 +70,13 @@ MAKEDEPEND = @MAKEDEPEND@
67
68 NOTIFYD_LIBS = @NOTIFYD_LIBS@
69
70-SERVICE=../master/service.o
71+SERVICE=../master/service.lo
72
73 IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
74 IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
75 LIB_WRAP = @LIB_WRAP@
76 LIBS = @ZEPHYR_LIBS@ @LIBS@ $(IMAP_COM_ERR_LIBS)
77-DEPLIBS=../imap/mutex_fake.o ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
78+DEPLIBS=../imap/mutex_fake.lo ../imap/libimap.la ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
79
80 PURIFY=/usr/local/bin/purify
81 PUREOPT=-best-effort
82@@ -82,25 +84,25 @@ PUREOPT=-best-effort
83 all: notifyd
84
85 install:
86- $(INSTALL) -m 755 notifyd $(DESTDIR)$(service_path)
87+ $(LIBTOOL) --mode=install $(INSTALL) -m 755 notifyd $(DESTDIR)$(service_path)
88
89-OBJS= notifyd.o notify_null.o notify_log.o notify_mailto.o notify_zephyr.o
90+OBJS= notifyd.lo notify_null.lo notify_log.lo notify_mailto.lo notify_zephyr.lo
91
92-notifytest: notifytest.o
93- $(CC) $(LDFLAGS) -o notifytest \
94- notifytest.o $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
95+notifytest: notifytest.lo
96+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o notifytest \
97+ notifytest.lo $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
98
99 notifyd: $(OBJS) $(SERVICE)
100- $(CC) $(LDFLAGS) -o notifyd \
101+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o notifyd \
102 $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
103
104 notifyd.pure: $(OBJS) $(SERVICE)
105 $(PURIFY) $(PUREOPT) \
106- $(CC) $(LDFLAGS) -o notifyd.pure \
107+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o notifyd.pure \
108 $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
109
110 clean:
111- rm -f notifyd notifytest *.o *.a *~ Makefile.bak makedepend.log
112+ rm -rf notifyd notifytest .libs *.o *.lo *.a *.la *~ Makefile.bak makedepend.log
113
114 distclean: clean
115 rm -f Makefile
116@@ -108,8 +110,8 @@ distclean: clean
117 depend:
118 ${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) *.c $(srcdir)/*.c 1>makedepend.log 2>&1
119
120-.c.o:
121- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
122+%.lo: %.c
123+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
124 $<
125
126 # DO NOT DELETE THIS LINE -- make depend depends on it.
127--- cyrus-imapd-2.3.16/installsieve/Makefile.in.wiget 2008-03-24 21:33:11.000000000 +0100
128+++ cyrus-imapd-2.3.16/installsieve/Makefile.in 2010-04-11 22:34:54.330511878 +0200
129@@ -47,6 +47,8 @@ VPATH = @srcdir@
130
131 CC = @CC@
132 RANLIB = @RANLIB@
133+LIBTOOL = @LIBTOOL@
134+top_builddir = @top_builddir@
135
136 DEFS = @DEFS@
137 CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @SASLFLAGS@
138@@ -59,7 +61,7 @@ MAKEDEPEND = @MAKEDEPEND@
139
140 IMAP_LIBS = @IMAP_LIBS@
141 LIBS =
142-DEPLIBS= ../lib/libcyrus.a @DEPLIBS@
143+DEPLIBS= ../lib/libcyrus.la @DEPLIBS@
144
145 prefix = @prefix@
146 exec_prefix = @exec_prefix@
147@@ -68,20 +70,18 @@ cyrus_prefix = @cyrus_prefix@
148 all: installsieve
149
150 install:
151- $(INSTALL) -s -m 755 installsieve $(DESTDIR)$(exec_prefix)/bin
152+ $(LIBTOOL) --mode=install $(INSTALL) installsieve $(DESTDIR)$(exec_prefix)/bin
153
154-OBJS=lex.o mystring.o request.o isieve.o
155+OBJS=lex.lo mystring.lo request.lo isieve.lo
156
157-libinstallsieve.a: $(OBJS)
158- rm -f libinstallsieve.a
159- ar cr libinstallsieve.a $(OBJS)
160- $(RANLIB) libinstallsieve.a
161+libinstallsieve.la: $(OBJS)
162+ $(LIBTOOL) --mode=link --tag=CC $(CC) -o libinstallsieve.la $(OBJS)
163
164-installsieve: libinstallsieve.a installscript.o $(DEPLIBS)
165- $(CC) $(LDFLAGS) -o installsieve libinstallsieve.a installscript.o $(DEPLIBS) $(IMAP_LIBS)
166+installsieve: libinstallsieve.la installscript.lo $(DEPLIBS)
167+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o installsieve libinstallsieve.la installscript.lo $(DEPLIBS) $(IMAP_LIBS)
168
169 clean:
170- rm -f *.o *.a Makefile.bak makedepend.log
171+ rm -rf .libs *.o *.lo *.a *.la Makefile.bak makedepend.log
172
173 distclean: clean
174 rm -f Makefile installsieve
175@@ -89,9 +89,8 @@ distclean: clean
176 depend:
177 ${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) *.c $(srcdir)/*.c 1>makedepend.log 2>&1
178
179-.c.o:
180- $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I. $(CFLAGS) \
181+%.lo: %.c
182+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I. $(CFLAGS) \
183 $<
184
185-
186 # DO NOT DELETE THIS LINE -- make depend depends on it.
187--- cyrus-imapd-2.3.16/syslog/Makefile.in.wiget 2008-03-24 21:15:59.000000000 +0100
188+++ cyrus-imapd-2.3.16/syslog/Makefile.in 2010-04-11 22:34:54.330511878 +0200
189@@ -44,12 +44,14 @@
0010a797
ER		 190 # $Id$
191
192 srcdir = @srcdir@
193+top_builddir = @top_builddir@
194 VPATH = @srcdir@
195
196 CC = @CC@
3beb582f 197
0010a797
ER		 198 INSTALL = @INSTALL@
199 RANLIB = @RANLIB@
200+LIBTOOL = @LIBTOOL@
201
d18be73f 202 DEFS = @DEFS@
3beb582f
AF		 203 CPPFLAGS = @CPPFLAGS@
204@@ -61,23 +63,22 @@ LDFLAGS = @LDFLAGS@
205 SHELL = /bin/sh
206 MAKEDEPEND = @MAKEDEPEND@
d18be73f 207
3beb582f
AF		 208-all: libsyslog.a syslogd
209+all: libsyslog.la syslogd
210
211 install:
212 @echo "Install syslogd and syslog.conf as appropriate"
0010a797
ER		 213
214-.c.o:
3beb582f 215- $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) $<
0010a797 216+%.lo: %.c
3beb582f
AF		 217+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) $<
218
219-libsyslog.a: syslog.o
220- ar cr libsyslog.a syslog.o
221- $(RANLIB) libsyslog.a
222+libsyslog.la: syslog.lo
223+ $(LIBTOOL) --mode=link --tag=CC $(CC) -o libsyslog.la syslog.lo
224
225-syslogd: syslogd.o
226- $(CC) $(LDFLAGS) -o syslogd syslogd.o $(LIBS)
227+syslogd: syslogd.lo
228+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o syslogd syslogd.lo $(LIBS)
0010a797
ER		 229
230 clean:
3beb582f
AF		 231- rm -f *.o *.a Makefile.bak
232+ rm -rf .libs *.o *.lo *.a *.la Makefile.bak
0010a797
ER		 233
234 distclean: clean
235 rm -f Makefile
3beb582f
AF		 236--- cyrus-imapd-2.3.16/imap/Makefile.in.wiget 2009-03-30 18:04:56.000000000 +0200
237+++ cyrus-imapd-2.3.16/imap/Makefile.in 2010-04-11 22:34:54.330511878 +0200
238@@ -45,16 +45,18 @@ DEFINES=-DSETPROCTITLE
be79fb78
ER		 239
240 # \Seen state database. Either 'db' (berkeley db) or
241 # 'local' (legacy flat file).
242-SEEN=seen_db.o
243+SEEN=seen_db.lo
244
245 srcdir = @srcdir@
246 top_srcdir = @top_srcdir@
247+top_builddir = @top_builddir@
248 VPATH = @srcdir@
249
250 CC = @CC@
251 INSTALL = @INSTALL@
252 RANLIB = @RANLIB@
253 AWK = @AWK@
254+LIBTOOL = @LIBTOOL@
255
256 CYRUS_USER=@cyrus_user@
257 CYRUS_GROUP=@cyrus_group@
3beb582f 258@@ -67,7 +69,7 @@ SIEVE_LIBS = @SIEVE_LIBS@
be79fb78
ER		 259 IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
260 LIB_WRAP = @LIB_WRAP@
261 LIBS = $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS)
262-DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
263+DEPLIBS = ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
264
265 CFLAGS = @CFLAGS@
266 LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
3beb582f 267@@ -96,23 +98,23 @@ exec_prefix = @exec_prefix@
be79fb78
ER		 268 cyrus_prefix = @cyrus_prefix@
269 service_path = @service_path@
270
271-LOBJS= append.o mailbox.o mboxlist.o mupdate-client.o mboxname.o message.o \
272- global.o imap_err.o mupdate_err.o proc.o setproctitle.o \
273- convert_code.o duplicate.o saslclient.o saslserver.o signals.o \
274- annotate.o search_engines.o squat.o squat_internal.o mbdump.o \
275- imapparse.o telemetry.o user.o notify.o idle.o quota_db.o \
276- sync_log.o $(SEEN) mboxkey.o backend.o tls.o message_guid.o \
277- statuscache_db.o
278+LOBJS= append.lo mailbox.lo mboxlist.lo mupdate-client.lo mboxname.lo message.lo \
279+ global.lo imap_err.lo mupdate_err.lo proc.lo setproctitle.lo \
280+ convert_code.lo duplicate.lo saslclient.lo saslserver.lo signals.lo \
281+ annotate.lo search_engines.lo squat.lo squat_internal.lo mbdump.lo \
282+ imapparse.lo telemetry.lo user.lo notify.lo idle.lo quota_db.lo \
283+ sync_log.lo $(SEEN) mboxkey.lo backend.lo tls.lo message_guid.lo \
284+ statuscache_db.lo
285
286-IMAPDOBJS=pushstats.o imapd.o proxy.o imap_proxy.o index.o version.o
287+IMAPDOBJS=pushstats.lo imapd.lo proxy.lo imap_proxy.lo index.lo version.lo
288
289-LMTPOBJS=lmtpstats.o lmtpengine.o spool.o
290+LMTPOBJS=lmtpstats.lo lmtpengine.lo spool.lo
291
292 # Your typical objects for the command line utilities
293-CLIOBJS=cli_fatal.o mutex_fake.o
294+CLIOBJS=cli_fatal.lo mutex_fake.lo
295
296-SERVICE=../master/service.o
297-SERVICETHREAD=../master/service-thread.o
298+SERVICE=../master/service.lo
299+SERVICETHREAD=../master/service-thread.lo
300
301 PROGS = imapd lmtpd pop3d \
302 fud smmapd reconstruct quota mbpath ipurge cyr_dbtool cyr_synclog \
3beb582f 303@@ -131,31 +133,28 @@ pure: imapd.pure lmtpd.pure mupdate.pure
e299ecfc
ER		 304
305 install:
306 $(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
307- for file in $(PROGS); \
308- do \
309- $(INSTALL) -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
310+ for file in $(PROGS); do \
311+ $(LIBTOOL) --mode=install $(INSTALL) -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
312 done
313 ln -f $(DESTDIR)$(service_path)/pop3d $(DESTDIR)$(service_path)/pop3proxyd
be79fb78
ER		 314 ln -f $(DESTDIR)$(service_path)/imapd $(DESTDIR)$(service_path)/proxyd
315 ln -f $(DESTDIR)$(service_path)/lmtpd $(DESTDIR)$(service_path)/lmtpproxyd
316
317-.c.o:
318- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
319+%.lo: %.c
0010a797 320+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
be79fb78
ER		 321 $<
322
323 ### libimap
324
325-libimap.a: $(LOBJS)
326- rm -f libimap.a
327- ar cr libimap.a $(LOBJS)
328- $(RANLIB) libimap.a
329+libimap.la: $(LOBJS)
330+ $(LIBTOOL) --mode=link --tag=CC $(CC) -o libimap.la $(LOBJS)
331
332 ### Built Source Files
333
334 xversion xversion.h:
335 AWK=$(AWK) $(srcdir)/xversion.sh
336
337-version.o: xversion.h
338+version.lo: xversion.h
339
340 pushstats.c: pushstats.snmp $(srcdir)/../snmp/snmpgen
341 $(srcdir)/../snmp/snmpgen $(srcdir)/pushstats.snmp
3beb582f 342@@ -183,182 +182,182 @@ mupdate_err.c: mupdate_err.et
be79fb78 343 mupdate_err.h: mupdate_err.c
32bec8aa
JB		 344
345 ### Services
be79fb78 346-idled: idled.o mutex_fake.o libimap.a $(DEPLIBS)
32bec8aa 347- $(CC) $(LDFLAGS) -o idled \
be79fb78
ER		 348- idled.o mutex_fake.o libimap.a $(DEPLIBS) $(LIBS)
349-
350-lmtpd: lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.o \
351- libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
32bec8aa 352- $(CC) $(LDFLAGS) -o lmtpd \
be79fb78
ER		 353- $(SERVICE) lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \
354- mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
355-
356-lmtpd.pure: lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \
357- mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
32bec8aa 358- $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o lmtpd.pure \
be79fb78
ER		 359- $(SERVICE) lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \
360- mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
361-
362-imapd: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
32bec8aa 363- $(CC) $(LDFLAGS) -o imapd \
be79fb78
ER		 364- $(SERVICE) $(IMAPDOBJS) mutex_fake.o \
365- libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
366-
367-imapd.pure: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
32bec8aa 368- $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o imapd.pure \
be79fb78
ER		 369- $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \
370+idled: idled.lo mutex_fake.lo libimap.la $(DEPLIBS)
371+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o idled \
372+ idled.lo mutex_fake.lo libimap.la $(DEPLIBS) $(LIBS)
373+
374+lmtpd: lmtpd.lo proxy.lo $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.lo \
375+ libimap.la $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
3beb582f 376+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o lmtpd \
be79fb78
ER		 377+ $(SERVICE) lmtpd.lo proxy.lo $(LMTPOBJS) $(SIEVE_OBJS) \
378+ mutex_fake.lo libimap.la $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
379+
380+lmtpd.pure: lmtpd.lo proxy.lo $(LMTPOBJS) $(SIEVE_OBJS) \
381+ mutex_fake.lo libimap.la $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
382+ $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o lmtpd.pure \
383+ $(SERVICE) lmtpd.lo proxy.lo $(LMTPOBJS) $(SIEVE_OBJS) \
384+ mutex_fake.lo libimap.la $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
385+
386+imapd: $(IMAPDOBJS) mutex_fake.lo libimap.la $(DEPLIBS) $(SERVICE)
387+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o imapd \
388+ $(SERVICE) $(IMAPDOBJS) mutex_fake.lo \
389+ libimap.la $(DEPLIBS) $(LIBS) $(LIB_WRAP)
390+
391+imapd.pure: $(IMAPDOBJS) mutex_fake.lo libimap.la $(DEPLIBS) $(SERVICE)
5f54d32e 392+ $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o imapd.pure \
be79fb78 393+ $(SERVICE) $(IMAPDOBJS) mutex_fake.lo libimap.la \
32bec8aa
JB		 394 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
395
be79fb78 396-imapd.quant: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
32bec8aa 397- $(QUANTIFY) $(QUANTOPT) $(CC) $(LDFLAGS) -o imapd.quant \
be79fb78
ER		 398- $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \
399+imapd.quant: $(IMAPDOBJS) mutex_fake.lo libimap.la $(DEPLIBS) $(SERVICE)
5f54d32e 400+ $(QUANTIFY) $(QUANTOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o imapd.quant \
be79fb78 401+ $(SERVICE) $(IMAPDOBJS) mutex_fake.lo libimap.la \
32bec8aa
JB		 402 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
403
be79fb78
ER		 404-mupdate: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o tls.o \
405- libimap.a $(DEPLIBS)
32bec8aa 406- $(CC) $(LDFLAGS) -o mupdate \
be79fb78
ER		 407- $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
408- mutex_pthread.o tls.o libimap.a \
409+mupdate: mupdate.lo mupdate-slave.lo mupdate-client.lo mutex_pthread.lo tls.lo \
410+ libimap.la $(DEPLIBS)
5f54d32e 411+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o mupdate \
be79fb78
ER		 412+ $(SERVICETHREAD) mupdate.lo mupdate-slave.lo mupdate-client.lo \
413+ mutex_pthread.lo tls.lo libimap.la \
32bec8aa
JB		 414 $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
415
be79fb78
ER		 416-mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o \
417- libimap.a $(DEPLIBS)
32bec8aa 418- $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o mupdate.pure \
be79fb78
ER		 419- $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
420- mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
421+mupdate.pure: mupdate.lo mupdate-slave.lo mupdate-client.lo mutex_pthread.lo \
422+ libimap.la $(DEPLIBS)
5f54d32e 423+ $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o mupdate.pure \
be79fb78
ER		 424+ $(SERVICETHREAD) mupdate.lo mupdate-slave.lo mupdate-client.lo \
425+ mutex_pthread.lo libimap.la $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
32bec8aa 426
be79fb78
ER		 427-pop3d: pop3d.o proxy.o backend.o tls.o mutex_fake.o libimap.a \
428+pop3d: pop3d.lo proxy.lo backend.lo tls.lo mutex_fake.lo libimap.la \
cad185d7
AF		 429 $(DEPLIBS) $(SERVICE)
430- $(CC) $(LDFLAGS) -o pop3d pop3d.o proxy.o backend.o tls.o $(SERVICE) \
be79fb78
ER		 431- mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
432+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o pop3d pop3d.lo proxy.lo backend.lo tls.lo $(SERVICE) \
433+ mutex_fake.lo libimap.la $(DEPLIBS) $(LIBS) $(LIB_WRAP)
32bec8aa 434
be79fb78
ER		 435-nntpd: nntpd.o proxy.o backend.o index.o smtpclient.o spool.o tls.o \
436- mutex_fake.o nntp_err.o libimap.a $(DEPLIBS) $(SERVICE)
cad185d7 437- $(CC) $(LDFLAGS) -o nntpd nntpd.o proxy.o backend.o index.o spool.o \
be79fb78
ER		 438- smtpclient.o tls.o $(SERVICE) mutex_fake.o nntp_err.o \
439- libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
440+nntpd: nntpd.lo proxy.lo backend.lo index.lo smtpclient.lo spool.lo tls.lo \
441+ mutex_fake.lo nntp_err.lo libimap.la $(DEPLIBS) $(SERVICE)
442+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o nntpd nntpd.lo proxy.lo backend.lo index.lo spool.lo \
443+ smtpclient.lo tls.lo $(SERVICE) mutex_fake.lo nntp_err.lo \
444+ libimap.la $(DEPLIBS) $(LIBS) $(LIB_WRAP)
445
446-fud: fud.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE)
32bec8aa 447- $(CC) $(LDFLAGS) -o fud $(SERVICE) fud.o mutex_fake.o libimap.a \
be79fb78
ER		 448+fud: fud.lo libimap.la mutex_fake.lo $(DEPLIBS) $(SERVICE)
449+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o fud $(SERVICE) fud.lo mutex_fake.lo libimap.la \
32bec8aa
JB		 450 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
451
be79fb78 452-smmapd: smmapd.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE)
32bec8aa 453- $(CC) $(LDFLAGS) -o smmapd $(SERVICE) smmapd.o mutex_fake.o libimap.a \
be79fb78
ER		 454+smmapd: smmapd.lo libimap.la mutex_fake.lo $(DEPLIBS) $(SERVICE)
455+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o smmapd $(SERVICE) smmapd.lo mutex_fake.lo libimap.la \
32bec8aa
JB		 456 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
457
be79fb78
ER		 458-sync_server: sync_server.o sync_support.o sync_commit.o \
459- imapparse.o tls.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE)
cad185d7 460- $(CC) $(LDFLAGS) -o \
be79fb78
ER		 461- sync_server sync_server.o sync_support.o sync_commit.o \
462- imapparse.o tls.o $(SERVICE) libimap.a mutex_fake.o \
463+sync_server: sync_server.lo sync_support.lo sync_commit.lo \
464+ imapparse.lo tls.lo libimap.la mutex_fake.lo $(DEPLIBS) $(SERVICE)
5f54d32e 465+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
be79fb78
ER		 466+ sync_server sync_server.lo sync_support.lo sync_commit.lo \
467+ imapparse.lo tls.lo $(SERVICE) libimap.la mutex_fake.lo \
cad185d7
AF		 468 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
469
32bec8aa 470 ### Command Line Utilities
be79fb78 471-arbitron: arbitron.o $(CLIOBJS) libimap.a $(DEPLIBS)
32bec8aa 472- $(CC) $(LDFLAGS) -o arbitron arbitron.o $(CLIOBJS) \
be79fb78
ER		 473- libimap.a $(DEPLIBS) $(LIBS)
474-
475-cyr_dbtool: cyr_dbtool.o mutex_fake.o libimap.a $(DEPLIBS)
cad185d7 476- $(CC) $(LDFLAGS) -o cyr_dbtool cyr_dbtool.o $(CLIOBJS) \
be79fb78
ER		 477- libimap.a $(DEPLIBS) $(LIBS)
478-
479-cyr_synclog: cyr_synclog.o mutex_fake.o libimap.a $(DEPLIBS)
5f54d32e 480- $(CC) $(LDFLAGS) -o cyr_synclog cyr_synclog.o $(CLIOBJS) \
be79fb78
ER		 481- libimap.a $(DEPLIBS) $(LIBS)
482-
483-cvt_cyrusdb: cvt_cyrusdb.o mutex_fake.o libimap.a $(DEPLIBS)
32bec8aa 484- $(CC) $(LDFLAGS) -o cvt_cyrusdb cvt_cyrusdb.o $(CLIOBJS) \
be79fb78
ER		 485- libimap.a $(DEPLIBS) $(LIBS)
486-
487-chk_cyrus: chk_cyrus.o mutex_fake.o libimap.a $(DEPLIBS)
32bec8aa 488- $(CC) $(LDFLAGS) -o chk_cyrus chk_cyrus.o $(CLIOBJS) \
be79fb78
ER		 489- libimap.a $(DEPLIBS) $(LIBS)
490-
491-deliver: deliver.o $(LMTPOBJS) proxy.o mutex_fake.o libimap.a $(DEPLIBS)
cad185d7 492- $(CC) $(LDFLAGS) -o deliver deliver.o $(LMTPOBJS) proxy.o \
be79fb78
ER		 493- mutex_fake.o libimap.a $(DEPLIBS) $(LIBS)
494-
495-ctl_deliver: ctl_deliver.o $(CLIOBJS) libimap.a $(DEPLIBS)
32bec8aa 496- $(CC) $(LDFLAGS) -o \
be79fb78
ER		 497- $@ ctl_deliver.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
498-
499-ctl_mboxlist: ctl_mboxlist.o mupdate-client.o $(CLIOBJS) libimap.a $(DEPLIBS)
32bec8aa 500- $(CC) $(LDFLAGS) -o $@ ctl_mboxlist.o mupdate-client.o $(CLIOBJS) \
be79fb78
ER		 501- libimap.a $(DEPLIBS) $(LIBS)
502-
503-ctl_cyrusdb: ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS)
32bec8aa 504- $(CC) $(LDFLAGS) -o \
be79fb78
ER		 505- $@ ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
506-
507-cyr_expire: cyr_expire.o $(CLIOBJS) libimap.a $(DEPLIBS)
32bec8aa 508- $(CC) $(LDFLAGS) -o $@ cyr_expire.o $(CLIOBJS) \
be79fb78
ER		 509- libimap.a $(DEPLIBS) $(LIBS)
510-
511-fetchnews: fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS)
32bec8aa 512- $(CC) $(LDFLAGS) -o \
be79fb78
ER		 513- $@ fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
514-
515-squatter: squatter.o index.o squat_build.o $(CLIOBJS) libimap.a $(DEPLIBS)
32bec8aa 516- $(CC) $(LDFLAGS) -o squatter squatter.o index.o squat_build.o \
be79fb78
ER		 517- $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
518+arbitron: arbitron.lo $(CLIOBJS) libimap.la $(DEPLIBS)
519+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o arbitron arbitron.lo $(CLIOBJS) \
520+ libimap.la $(DEPLIBS) $(LIBS)
521+
522+cyr_dbtool: cyr_dbtool.lo mutex_fake.lo libimap.la $(DEPLIBS)
523+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o cyr_dbtool cyr_dbtool.lo $(CLIOBJS) \
524+ libimap.la $(DEPLIBS) $(LIBS)
525+
526+cyr_synclog: cyr_synclog.lo mutex_fake.lo libimap.la $(DEPLIBS)
527+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o cyr_synclog cyr_synclog.lo $(CLIOBJS) \
528+ libimap.la $(DEPLIBS) $(LIBS)
529+
530+cvt_cyrusdb: cvt_cyrusdb.lo mutex_fake.lo libimap.la $(DEPLIBS)
531+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o cvt_cyrusdb cvt_cyrusdb.lo $(CLIOBJS) \
532+ libimap.la $(DEPLIBS) $(LIBS)
533+
534+chk_cyrus: chk_cyrus.lo mutex_fake.lo libimap.la $(DEPLIBS)
535+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o chk_cyrus chk_cyrus.lo $(CLIOBJS) \
536+ libimap.la $(DEPLIBS) $(LIBS)
537+
538+deliver: deliver.lo $(LMTPOBJS) proxy.lo mutex_fake.lo libimap.la $(DEPLIBS)
539+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o deliver deliver.lo $(LMTPOBJS) proxy.lo \
540+ mutex_fake.lo libimap.la $(DEPLIBS) $(LIBS)
541+
542+ctl_deliver: ctl_deliver.lo $(CLIOBJS) libimap.la $(DEPLIBS)
543+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
544+ $@ ctl_deliver.lo $(CLIOBJS) libimap.la $(DEPLIBS) $(LIBS)
545+
546+ctl_mboxlist: ctl_mboxlist.lo mupdate-client.lo $(CLIOBJS) libimap.la $(DEPLIBS)
547+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ctl_mboxlist.lo mupdate-client.lo $(CLIOBJS) \
548+ libimap.la $(DEPLIBS) $(LIBS)
549+
550+ctl_cyrusdb: ctl_cyrusdb.lo $(CLIOBJS) libimap.la $(DEPLIBS)
551+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
552+ $@ ctl_cyrusdb.lo $(CLIOBJS) libimap.la $(DEPLIBS) $(LIBS)
553+
554+cyr_expire: cyr_expire.lo $(CLIOBJS) libimap.la $(DEPLIBS)
555+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ cyr_expire.lo $(CLIOBJS) \
556+ libimap.la $(DEPLIBS) $(LIBS)
557+
558+fetchnews: fetchnews.lo $(CLIOBJS) libimap.la $(DEPLIBS)
559+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
560+ $@ fetchnews.lo $(CLIOBJS) libimap.la $(DEPLIBS) $(LIBS)
561+
562+squatter: squatter.lo index.lo squat_build.lo $(CLIOBJS) libimap.la $(DEPLIBS)
563+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o squatter squatter.lo index.lo squat_build.lo \
564+ $(CLIOBJS) libimap.la $(DEPLIBS) $(LIBS)
32bec8aa 565
be79fb78 566-mbpath: mbpath.o $(CLIOBJS) libimap.a $(DEPLIBS)
32bec8aa 567- $(CC) $(LDFLAGS) -o mbpath mbpath.o $(CLIOBJS) libimap.a \
be79fb78
ER		 568+mbpath: mbpath.lo $(CLIOBJS) libimap.la $(DEPLIBS)
569+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o mbpath mbpath.lo $(CLIOBJS) libimap.la \
32bec8aa
JB		 570 $(DEPLIBS) $(LIBS)
571
be79fb78 572-ipurge: ipurge.o $(CLIOBJS) libimap.a $(DEPLIBS)
32bec8aa 573- $(CC) $(LDFLAGS) -o ipurge ipurge.o $(CLIOBJS) \
be79fb78
ER		 574- libimap.a $(DEPLIBS) $(LIBS)
575-
3beb582f
AF		 576-cyr_virusscan: cyr_virusscan.o index.o $(CLIOBJS) libimap.a $(DEPLIBS)
577- $(CC) $(LDFLAGS) -o cyr_virusscan cyr_virusscan.o index.o $(CLIOBJS) \
578- libimap.a $(DEPLIBS) $(LIBS) -lclamav
579-
be79fb78 580-cyrdump: cyrdump.o index.o $(CLIOBJS) libimap.a $(DEPLIBS)
32bec8aa 581- $(CC) $(LDFLAGS) -o cyrdump cyrdump.o index.o $(CLIOBJS) \
be79fb78
ER		 582- libimap.a $(DEPLIBS) $(LIBS)
583-
3beb582f
AF		 584-cyr_df: cyr_df.o $(CLIOBJS) libimap.a $(DEPLIBS)
585- $(CC) $(LDFLAGS) -o \
586- cyr_df cyr_df.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
587-
be79fb78 588-mbexamine: mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS)
32bec8aa 589- $(CC) $(LDFLAGS) -o \
be79fb78
ER		 590- mbexamine mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
591-
592-reconstruct: reconstruct.o $(CLIOBJS) libimap.a $(DEPLIBS)
32bec8aa 593- $(CC) $(LDFLAGS) -o \
be79fb78
ER		 594- reconstruct reconstruct.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
595-
596-quota: quota.o $(CLIOBJS) libimap.a $(DEPLIBS)
32bec8aa 597- $(CC) $(LDFLAGS) -o quota quota.o $(CLIOBJS) \
be79fb78
ER		 598- libimap.a $(DEPLIBS) $(LIBS)
599-
600-tls_prune: tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS)
32bec8aa 601- $(CC) $(LDFLAGS) -o \
be79fb78
ER		 602- $@ tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
603-
604-unexpunge: unexpunge.o $(CLIOBJS) libimap.a $(DEPLIBS)
cad185d7 605- $(CC) $(LDFLAGS) -o $@ unexpunge.o $(CLIOBJS) \
be79fb78
ER		 606- libimap.a $(DEPLIBS) $(LIBS)
607-
608-make_md5: make_md5.o libimap.a mutex_fake.o $(DEPLIBS)
cad185d7 609- $(CC) $(LDFLAGS) -o make_md5 make_md5.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS)
be79fb78
ER		 610-
611-make_sha1: make_sha1.o libimap.a mutex_fake.o $(DEPLIBS)
5f54d32e 612- $(CC) $(LDFLAGS) -o make_sha1 make_sha1.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS)
be79fb78
ER		 613-
614-sync_client: sync_client.o sync_support.o \
615- backend.o tls.o imapparse.o libimap.a mutex_fake.o $(DEPLIBS)
cad185d7 616- $(CC) $(LDFLAGS) -o \
be79fb78
ER		 617- sync_client sync_client.o sync_support.o \
618- backend.o tls.o imapparse.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS)
619-
620-sync_reset: sync_reset.o sync_support.o sync_commit.o \
621- libimap.a mutex_fake.o $(DEPLIBS)
cad185d7 622- $(CC) $(LDFLAGS) -o \
be79fb78
ER		 623- sync_reset sync_reset.o sync_support.o sync_commit.o \
624- libimap.a mutex_fake.o $(DEPLIBS) $(LIBS)
625+ipurge: ipurge.lo $(CLIOBJS) libimap.la $(DEPLIBS)
626+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o ipurge ipurge.lo $(CLIOBJS) \
627+ libimap.la $(DEPLIBS) $(LIBS)
628+
3beb582f
AF		 629+cyr_virusscan: cyr_virusscan.lo index.lo $(CLIOBJS) libimap.la $(DEPLIBS)
630+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o cyr_virusscan cyr_virusscan.lo index.lo $(CLIOBJS) \
631+ libimap.la $(DEPLIBS) $(LIBS) -lclamav
632+
be79fb78
ER		 633+cyrdump: cyrdump.lo index.lo $(CLIOBJS) libimap.la $(DEPLIBS)
634+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o cyrdump cyrdump.lo index.lo $(CLIOBJS) \
635+ libimap.la $(DEPLIBS) $(LIBS)
636+
3beb582f
AF		 637+cyr_df: cyr_df.lo $(CLIOBJS) libimap.la $(DEPLIBS)
638+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
639+ cyr_df cyr_df.lo $(CLIOBJS) libimap.la $(DEPLIBS) $(LIBS)
640+
be79fb78
ER		 641+mbexamine: mbexamine.lo $(CLIOBJS) libimap.la $(DEPLIBS)
642+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
643+ mbexamine mbexamine.lo $(CLIOBJS) libimap.la $(DEPLIBS) $(LIBS)
644+
645+reconstruct: reconstruct.lo $(CLIOBJS) libimap.la $(DEPLIBS)
646+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
647+ reconstruct reconstruct.lo $(CLIOBJS) libimap.la $(DEPLIBS) $(LIBS)
648+
649+quota: quota.lo $(CLIOBJS) libimap.la $(DEPLIBS)
650+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o quota quota.lo $(CLIOBJS) \
651+ libimap.la $(DEPLIBS) $(LIBS)
652+
653+tls_prune: tls_prune.lo tls.lo $(CLIOBJS) libimap.la $(DEPLIBS)
5f54d32e 654+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
be79fb78
ER		 655+ $@ tls_prune.lo tls.lo $(CLIOBJS) libimap.la $(DEPLIBS) $(LIBS)
656+
657+unexpunge: unexpunge.lo $(CLIOBJS) libimap.la $(DEPLIBS)
658+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ unexpunge.lo $(CLIOBJS) \
659+ libimap.la $(DEPLIBS) $(LIBS)
660+
661+make_md5: make_md5.lo libimap.la mutex_fake.lo $(DEPLIBS)
662+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o make_md5 make_md5.lo libimap.la mutex_fake.lo $(DEPLIBS) $(LIBS)
663+
664+make_sha1: make_sha1.lo libimap.la mutex_fake.lo $(DEPLIBS)
665+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o make_sha1 make_sha1.lo libimap.la mutex_fake.lo $(DEPLIBS) $(LIBS)
666+
667+sync_client: sync_client.lo sync_support.lo \
668+ backend.lo tls.lo imapparse.lo libimap.la mutex_fake.lo $(DEPLIBS)
669+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
670+ sync_client sync_client.lo sync_support.lo \
671+ backend.lo tls.lo imapparse.lo libimap.la mutex_fake.lo $(DEPLIBS) $(LIBS)
672+
673+sync_reset: sync_reset.lo sync_support.lo sync_commit.lo \
674+ libimap.la mutex_fake.lo $(DEPLIBS)
675+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
676+ sync_reset sync_reset.lo sync_support.lo sync_commit.lo \
677+ libimap.la mutex_fake.lo $(DEPLIBS) $(LIBS)
678
679 ### Other Misc Targets
32bec8aa 680
3beb582f
AF		 681--- cyrus-imapd-2.3.16/configure.in.wiget 2010-04-11 22:34:54.327178680 +0200
682+++ cyrus-imapd-2.3.16/configure.in 2010-04-11 22:34:54.330511878 +0200
683@@ -87,7 +87,7 @@ fi
684 AC_DEFINE_UNQUOTED(SYSCONFDIR,"$sysconfdir",[Config File Location])
be79fb78 685
3beb582f
AF		 686 AC_PROG_CC
687-AC_PROG_RANLIB
688+AC_PROG_LIBTOOL
689 AC_PROG_MAKE_SET
690 AC_PROG_INSTALL
691 AC_AIX
692@@ -137,7 +137,7 @@ IPv6_CHECK_FUNC(getaddrinfo, [IPv6_CHECK
693 cyrus_cv_getaddrinfo=no)], cyrus_cv_getaddrinfo=no)
694
695 if test $cyrus_cv_getaddrinfo = no; then
696- IPV6_OBJS="getaddrinfo.o"
697+ IPV6_OBJS="getaddrinfo.lo"
698 fi
699
700 cyrus_cv_getnameinfo=yes
701@@ -146,7 +146,7 @@ IPv6_CHECK_FUNC(getnameinfo,
702 cyrus_cv_getnameinfo=no)
703
704 if test $cyrus_cv_getnameinfo = no; then
705- IPV6_OBJS="$IPV6_OBJS getnameinfo.o"
706+ IPV6_OBJS="$IPV6_OBJS getnameinfo.lo"
707 fi
708
709 IPv6_CHECK_SS_FAMILY()
710@@ -170,7 +170,7 @@ AC_FUNC_VPRINTF
711 dnl function for doing each of the database backends
712 dnl parameters: backend name, variable to set, withval
713
714-CYRUSDB_OBJS="cyrusdb_flat.o cyrusdb_skiplist.o cyrusdb_quotalegacy.o"
715+CYRUSDB_OBJS="cyrusdb_flat.lo cyrusdb_skiplist.lo cyrusdb_quotalegacy.lo"
716
717 dnl Berkeley DB Detection
718
719@@ -217,7 +217,7 @@ if test "$use_berkeley" != "no"; then
720 LIBS="${LIBS} ${BDB_LIBADD}"
721 CPPFLAGS="${BDB_INCADD} ${CPPFLAGS}"
722
723- CYRUSDB_OBJS="$CYRUSDB_OBJS cyrusdb_berkeley.o"
724+ CYRUSDB_OBJS="$CYRUSDB_OBJS cyrusdb_berkeley.lo"
725 AC_DEFINE(HAVE_BDB,[],[Build in Berkeley DB support?])
726 fi
727
728@@ -377,9 +377,9 @@ AC_ARG_ENABLE(sieve,
729 fi)
730
731 if test "$sievedir" != "no"; then
732- SIEVE_OBJS="lmtp_sieve.o smtpclient.o"
733+ SIEVE_OBJS="lmtp_sieve.lo smtpclient.lo"
734 AC_SUBST(SIEVE_OBJS)
735- SIEVE_LIBS="../${sievedir}/libsieve.a"
736+ SIEVE_LIBS="../${sievedir}/libsieve.la"
737 AC_SUBST(SIEVE_LIBS)
738 SIEVE_CPPFLAGS="-I\$(srcdir)/../$sievedir"
739 AC_SUBST(SIEVE_CPPFLAGS)
740@@ -1069,7 +1069,7 @@ AC_CACHE_VAL(cyrus_cv_lib_syslog, AC_TRY
741 if test $cyrus_cv_lib_syslog = no; then
742 PRE_SUBDIRS="${PRE_SUBDIRS} syslog"
743 EXTRA_OUTPUT="${EXTRA_OUTPUT} syslog/Makefile"
744- DEPLIBS="${DEPLIBS} ../syslog/libsyslog.a"
745+ DEPLIBS="${DEPLIBS} ../syslog/libsyslog.la"
746 CPPFLAGS="$CPPFLAGS -I\$(srcdir)/../syslog"
747 fi
748 AC_MSG_RESULT($cyrus_cv_lib_syslog)
749@@ -1173,7 +1173,7 @@ fi
750 dnl Check for MD5 functions
751 AC_FUNC_CHECK(MD5Init,,
752 AC_CHECK_LIB(md, MD5Init, LIBS="${LIBS} -lmd",
753- MD5OBJ="md5.o"))
754+ MD5OBJ="md5.lo"))
755 AC_SUBST(MD5OBJ)
756
757 dnl snmp
758--- cyrus-imapd-2.3.16/netnews/Makefile.in.wiget 2008-03-24 20:06:32.000000000 +0100
759+++ cyrus-imapd-2.3.16/netnews/Makefile.in 2010-04-11 22:34:54.333846752 +0200
760@@ -49,11 +49,13 @@ VPATH = @srcdir@
d18be73f
ER		 761 CC = @CC@
762 INSTALL = @INSTALL@
763 RANLIB = @RANLIB@
764+LIBTOOL = @LIBTOOL@
765+top_builddir = @top_builddir@
766
3beb582f
AF		 767 DEFS = @DEFS@
768 CPPFLAGS = -I.. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../com_err/et @CPPFLAGS@
769 LIBS = @IMAP_LIBS@ @LIB_RT@
770-DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
771+DEPLIBS = ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
d18be73f
ER		 772
773 CFLAGS = @CFLAGS@
3beb582f
AF		 774 LDFLAGS = @LDFLAGS@
775@@ -66,23 +68,23 @@ exec_prefix = @exec_prefix@
776 cyrus_prefix = @cyrus_prefix@
777 service_path = @service_path@
778
779-OBJS = remotepurge.o readconfig.o
780+OBJS = remotepurge.lo readconfig.lo
781
782 all: remotepurge
d18be73f
ER		 783
784 install:
3beb582f
AF		 785- $(INSTALL) -s -m 755 remotepurge $(DESTDIR)$(service_path)
786+ $(LIBTOOL) --mode=install $(INSTALL) remotepurge $(DESTDIR)$(service_path)
0010a797
ER		 787
788-.c.o:
789- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
790+%.lo: %.c
791+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
d18be73f 792
3beb582f
AF		 793 remotepurge: $(OBJS) $(DEPLIBS)
794- $(CC) $(LDFLAGS) -o remotepurge $(OBJS) \
795+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o remotepurge $(OBJS) \
796 $(DEPLIBS) $(LIBS)
d18be73f 797
d18be73f
ER		 798
799 clean:
3beb582f
AF		 800- rm -f *.o Makefile.bak remotepurge makedepend.log
801+ rm -rf .libs *.o *.lo Makefile.bak remotepurge makedepend.log
0010a797
ER		 802
803 distclean: clean
804 rm -f Makefile
3beb582f
AF		 805--- cyrus-imapd-2.3.16/timsieved/Makefile.in.wiget 2008-03-24 21:20:57.000000000 +0100
806+++ cyrus-imapd-2.3.16/timsieved/Makefile.in 2010-04-11 22:34:54.333846752 +0200
807@@ -49,6 +49,8 @@ VPATH = @srcdir@
32bec8aa
JB		 808
809 CC = @CC@
810 RANLIB = @RANLIB@
811+LIBTOOL = @LIBTOOL@
812+top_builddir = @top_builddir@
813
3beb582f
AF		 814 INSTALL = @INSTALL@
815 CYRUS_USER=@cyrus_user@
816@@ -68,13 +70,13 @@ MAKEDEPEND = @MAKEDEPEND@
32bec8aa 817
3beb582f 818 TIMSIEVED_LIBS = @TIMSIEVED_LIBS@
32bec8aa 819
3beb582f
AF		 820-SERVICE=../master/service.o
821+SERVICE=../master/service.lo
822
823 IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
824 IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
825 LIB_WRAP = @LIB_WRAP@
826 LIBS = $(IMAP_COM_ERR_LIBS)
827-DEPLIBS=../sieve/libsieve.a ../imap/mutex_fake.o ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
828+DEPLIBS=../sieve/libsieve.la ../imap/mutex_fake.lo ../imap/libimap.la ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
829
830 PURIFY=/usr/local/bin/purify
831 PUREOPT=-best-effort
832@@ -82,22 +84,22 @@ PUREOPT=-best-effort
833 all: timsieved
d18be73f 834
32bec8aa 835 install:
3beb582f
AF		 836- $(INSTALL) -m 755 timsieved $(DESTDIR)$(service_path)
837+ $(LIBTOOL) --mode=install $(INSTALL) -m 755 timsieved $(DESTDIR)$(service_path)
32bec8aa 838
3beb582f
AF		 839-OBJS= actions.o lex.o mystring.o scripttest.o timsieved.o parser.o \
840- ../imap/proxy.o
841+OBJS= actions.lo lex.lo mystring.lo scripttest.lo timsieved.lo parser.lo \
842+ ../imap/proxy.lo
32bec8aa 843
3beb582f
AF		 844 timsieved: $(OBJS) $(SERVICE)
845- $(CC) $(LDFLAGS) -o timsieved \
846+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o timsieved \
847 $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
32bec8aa 848
3beb582f
AF		 849 timsieved.pure: $(OBJS) $(SERVICE)
850 $(PURIFY) $(PUREOPT) \
851- $(CC) $(LDFLAGS) -o timsieved.pure \
852+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o timsieved.pure \
853 $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
32bec8aa
JB		 854
855 clean:
3beb582f
AF		 856- rm -f timsieved *~ *.o *.a Makefile.bak makedepend.log
857+ rm -rf timsieved *~ .libs *.o *.lo *.a *.la Makefile.bak makedepend.log
be79fb78
ER		 858
859 distclean: clean
3beb582f
AF		 860 rm -f Makefile
861@@ -105,8 +107,8 @@ distclean: clean
d18be73f
ER		 862 depend:
863 ${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) *.c $(srcdir)/*.c 1>makedepend.log 2>&1
be79fb78
ER		 864
865-.c.o:
3beb582f 866- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
be79fb78 867+%.lo: %.c
3beb582f 868+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
be79fb78
ER		 869 $<
870
be79fb78 871 # DO NOT DELETE THIS LINE -- make depend depends on it.
3beb582f
AF		 872--- cyrus-imapd-2.3.16/perl/imap/Makefile.PL.wiget 2009-05-06 15:48:04.000000000 +0200
873+++ cyrus-imapd-2.3.16/perl/imap/Makefile.PL 2010-04-11 22:34:54.333846752 +0200
874@@ -64,8 +64,7 @@ WriteMakefile(
875 'macro' => {'IMCLIENT_LIBS' => ''}, # hack
876 'clean' => {'FILES' => 'libcyrperl.a cyradm'},
877 'OBJECT' => 'IMAP.o',
878- 'MYEXTLIB' => '../../lib/libcyrus.a ../../lib/libcyrus_min.a',
879- 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT $ZLIB -lssl -lcrypto"],
880+ 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT $ZLIB -lssl -lcrypto -L../../lib/.libs -lcyrus -lcyrus_min"],
881 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING'
882 'INC' => "-I../../lib -I../.. -I../../com_err/et $SASL_INC $OPENSSL_INC",
883 'EXE_FILES' => [cyradm],
884--- cyrus-imapd-2.3.16/perl/imap/IMAP.xs.wiget 2008-04-04 14:47:09.000000000 +0200
885+++ cyrus-imapd-2.3.16/perl/imap/IMAP.xs 2010-04-11 22:34:54.333846752 +0200
886@@ -76,6 +76,7 @@ void fatal(const char *s, int exit)
887 {
888 croak(s);
889 }
890+const int config_need_data = 0;
32bec8aa 891
3beb582f
AF		 892 /*
893 * Decrement the refcounts of the Perl SV's in the passed rock, then free the
894--- cyrus-imapd-2.3.16/perl/sieve/lib/Makefile.in.wiget 2008-04-04 14:47:17.000000000 +0200
895+++ cyrus-imapd-2.3.16/perl/sieve/lib/Makefile.in 2010-04-11 22:34:54.333846752 +0200
896@@ -50,12 +50,14 @@ VPATH = @srcdir@
897 CC = @CC@
cad185d7
AF		 898 INSTALL = @INSTALL@
899 RANLIB = @RANLIB@
900+LIBTOOL = @LIBTOOL@
901+top_builddir = @top_builddir@
32bec8aa 902
3beb582f
AF		 903 DEFS = @DEFS@ @LOCALDEFS@ -Dbool=char -DHAS_BOOL
904 CPPFLAGS = -I. -I../../.. -I$(srcdir) -I$(srcdir)/../../../lib @CPPFLAGS@ @DYNSASLFLAGS@ @COM_ERR_CPPFLAGS@
905-LIBS = ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a @LIB_DYN_SASL@ @LIBS@
906+LIBS = ../../../lib/libcyrus.la ../../../lib/libcyrus_min.la @LIB_DYN_SASL@ @LIBS@
907 IMAP_LIBS = @IMAP_LIBS@
908-DEPLIBS = ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a @DEPLIBS@
909+DEPLIBS = ../../../lib/libcyrus.la ../../../lib/libcyrus_min.la @DEPLIBS@
910
911 MAKEDEPEND_CFLAGS = @CFLAGS@
912 CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
913@@ -68,22 +70,20 @@ prefix = @prefix@
cad185d7
AF		 914 exec_prefix = @exec_prefix@
915 cyrus_prefix = @cyrus_prefix@
32bec8aa 916
3beb582f
AF		 917-OBJS=isieve.o lex.o mystring.o request.o
918+OBJS=isieve.lo lex.lo mystring.lo request.lo
32bec8aa 919
3beb582f
AF		 920-all: libisieve.a
921+all: libisieve.la
32bec8aa 922
3beb582f 923 install:
cad185d7 924
3beb582f
AF		 925-.c.o:
926- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
927+%.lo: %.c
928+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
929
930-libisieve.a: $(OBJS)
931- rm -f libisieve.a
932- ar cr libisieve.a $(OBJS)
933- $(RANLIB) libisieve.a
934+libisieve.la: $(OBJS)
935+ $(LIBTOOL) --mode=link --tag=CC $(CC) -o libisievie.la $(OBJS)
936
937 clean:
938- rm -f *.o Makefile.bak makedepend.log libisieve.a
939+ rm -rf .libs *.o *.lo Makefile.bak makedepend.log libisieve.la
940
941 distclean: clean
942 rm -f Makefile
943--- cyrus-imapd-2.3.16/perl/sieve/managesieve/managesieve.xs.wiget 2009-01-14 16:50:47.000000000 +0100
944+++ cyrus-imapd-2.3.16/perl/sieve/managesieve/managesieve.xs 2010-04-11 22:34:54.333846752 +0200
945@@ -72,6 +72,7 @@ void fatal(const char *s, int t)
946 croak("failure: %s", s);
947 exit(-1);
948 }
949+const int config_need_data = 0;
950
951 static int
952 perlsieve_getpass(conn, context, id, psecret)
953--- cyrus-imapd-2.3.16/perl/sieve/managesieve/Makefile.PL.wiget 2009-05-06 15:48:04.000000000 +0200
954+++ cyrus-imapd-2.3.16/perl/sieve/managesieve/Makefile.PL 2010-04-11 22:34:54.333846752 +0200
955@@ -61,8 +61,8 @@ WriteMakefile(
956 'NAME' => 'Cyrus::SIEVE::managesieve',
957 'ABSTRACT' => 'Cyurs Sieve management interface',
958 'VERSION_FROM' => 'managesieve.pm', # finds $VERSION
959- 'MYEXTLIB' => '../lib/isieve.o ../lib/lex.o ../lib/mystring.o ../lib/request.o ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a',
960- 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT $ZLIB -lssl -lcrypto"],
961+ 'MYEXTLIB' => '../lib/isieve.o ../lib/lex.o ../lib/mystring.o ../lib/request.o',
962+ 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT $ZLIB -lssl -lcrypto -L../../../lib/.libs -lcyrus -lcyrus_min"],
963 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING'
964 'INC' => "-I../lib/ -I../../../lib/ $SASL_INC $OPENSSL_INC",
965 );
966--- cyrus-imapd-2.3.16/lib/Makefile.in.wiget 2009-11-19 22:52:55.000000000 +0100
967+++ cyrus-imapd-2.3.16/lib/Makefile.in 2010-04-11 22:34:54.333846752 +0200
968@@ -44,10 +44,10 @@
969 # $Id$
970
971 # Authorization namespace.
972-AUTH=auth.o auth_krb.o auth_unix.o auth_krb5.o auth_pts.o
973+AUTH=auth.lo auth_krb.lo auth_unix.lo auth_krb5.lo auth_pts.lo
974
975 # ACL interpretation. Only one choice for now:
976-ACL=acl_afs.o
977+ACL=acl_afs.lo
978
979 srcdir = @srcdir@
980 top_srcdir = @top_srcdir@
981@@ -57,6 +57,8 @@ CC = @CC@
982
983 INSTALL = @INSTALL@
984 RANLIB = @RANLIB@
985+LIBTOOL = @LIBTOOL@
986+top_builddir = @top_builddir@
987
988 DEFS = @DEFS@ @LOCALDEFS@
989 CPPFLAGS = -I.. @CPPFLAGS@ @COM_ERR_CPPFLAGS@ @SASLFLAGS@
990@@ -72,6 +74,7 @@ MAKEDEPEND = @MAKEDEPEND@
991 prefix = @prefix@
992 exec_prefix = @exec_prefix@
993 cyrus_prefix = @cyrus_prefix@
994+libdir = @libdir@
995
996 libdir = @libdir@
997
998@@ -90,29 +93,28 @@ LIBCYR_HDRS = $(srcdir)/acl.h $(srcdir)/
999 $(srcdir)/libcyr_cfg.h $(srcdir)/byteorder64.h \
1000 $(srcdir)/md5.h $(srcdir)/hmac-md5.h
1001
1002-LIBCYR_OBJS = acl.o bsearch.o charset.o glob.o retry.o util.o \
1003- libcyr_cfg.o mkgmtime.o prot.o parseaddr.o imclient.o imparse.o \
1004- lsort.o stristr.o rfc822date.o cyrusdb.o strhash.o \
1005- chartable.o imapurl.o nonblock_@WITH_NONBLOCK@.o lock_@WITH_LOCK@.o \
1006- gmtoff_@WITH_GMTOFF@.o map_@WITH_MAP@.o $(ACL) $(AUTH) \
1007+LIBCYR_OBJS = acl.lo bsearch.lo charset.lo glob.lo retry.lo util.lo \
1008+ libcyr_cfg.lo mkgmtime.lo prot.lo parseaddr.lo imclient.lo imparse.lo \
1009+ lsort.lo stristr.lo rfc822date.lo cyrusdb.lo strhash.lo \
1010+ chartable.lo imapurl.lo nonblock_@WITH_NONBLOCK@.lo lock_@WITH_LOCK@.lo \
1011+ gmtoff_@WITH_GMTOFF@.lo map_@WITH_MAP@.lo $(ACL) $(AUTH) \
1012 @LIBOBJS@ @CYRUSDB_OBJS@ @MD5OBJ@ \
1013- iptostring.o xmalloc.o wildmat.o byteorder64.o \
1014- xstrlcat.o xstrlcpy.o
1015+ iptostring.lo xmalloc.lo wildmat.lo byteorder64.lo \
1016+ xstrlcat.lo xstrlcpy.lo
1017
1018 LIBCYRM_HDRS = $(srcdir)/hash.h $(srcdir)/mpool.h $(srcdir)/xmalloc.h \
1019 $(srcdir)/xstrlcat.h $(srcdir)/xstrlcpy.h $(srcdir)/util.h \
1020 $(srcdir)/strhash.h $(srcdir)/libconfig.h $(srcdir)/assert.h \
1021 imapopts.h
1022-LIBCYRM_OBJS = libconfig.o imapopts.o hash.o mpool.o xmalloc.o strhash.o \
a3bbdeb1 1023- xstrlcat.o xstrlcpy.o assert.o util.o @IPV6_OBJS@
cad185d7 1024+LIBCYRM_OBJS = libconfig.lo imapopts.lo hash.lo mpool.lo xmalloc.lo strhash.lo \
a3bbdeb1 1025+ xstrlcat.lo xstrlcpy.lo assert.lo util.lo @IPV6_OBJS@
cad185d7
AF		 1026
1027-all: $(BUILTSOURCES) libcyrus_min.a libcyrus.a
1028+all: $(BUILTSOURCES) libcyrus_min.la libcyrus.la
1029
1030 install:
1031 $(srcdir)/../install-sh -d $(DESTDIR)$(libdir)
1032- $(INSTALL) -m 644 libcyrus.a $(DESTDIR)$(libdir)
1033- $(INSTALL) -m 644 libcyrus_min.a $(DESTDIR)$(libdir)
0010a797 1034- $(RANLIB) $(DESTDIR)$(libdir)/libcyrus.a
5f54d32e 1035+ $(LIBTOOL) --mode=install $(INSTALL) -m 644 libcyrus_min.la $(DESTDIR)$(libdir)
0b88d0d8 1036+ $(LIBTOOL) --mode=install $(INSTALL) -m 644 libcyrus.la $(DESTDIR)$(libdir)
cad185d7
AF		 1037 for file in $(LIBCYR_HDRS); \
1038 do \
0010a797 1039 $(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/include/cyrus || exit 1; \
3beb582f 1040@@ -122,19 +124,15 @@ install:
cad185d7
AF		 1041 $(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/include/cyrus || exit 1; \
1042 done
1043
1044-.c.o:
1045- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
1046+%.lo: %.c
0010a797 1047+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
cad185d7
AF		 1048 $<
1049
1050-libcyrus.a: $(LIBCYR_OBJS)
1051- rm -f libcyrus.a
1052- ar cr libcyrus.a $(LIBCYR_OBJS)
1053- $(RANLIB) libcyrus.a
1054-
1055-libcyrus_min.a: $(LIBCYRM_OBJS)
1056- rm -f libcyrus_min.a
1057- ar cr libcyrus_min.a $(LIBCYRM_OBJS)
1058- $(RANLIB) libcyrus_min.a
1059+libcyrus.la: $(LIBCYR_OBJS) libcyrus_min.la
3beb582f 1060+ $(LIBTOOL) --mode=link --tag=CC $(CC) -o libcyrus.la $(LIBCYR_OBJS) libcyrus_min.la @LIBS@ @LIB_SASL@ -rpath $(libdir) -release $(VERSION)
32bec8aa 1061+
cad185d7 1062+libcyrus_min.la: $(LIBCYRM_OBJS)
3beb582f 1063+ $(LIBTOOL) --mode=link --tag=CC $(CC) -o libcyrus_min.la $(LIBCYRM_OBJS) @IMAP_COM_ERR_LIBS@ -rpath $(libdir) -release $(VERSION)
32bec8aa 1064
cad185d7 1065 imapopts.c: imapoptions $(srcdir)/../tools/config2header
a3bbdeb1 1066 $(srcdir)/../tools/config2header CC="$(CC)" $(srcdir)/imapopts.c $(srcdir)/imapopts.h < $(srcdir)/imapoptions
3beb582f 1067@@ -154,11 +152,11 @@ chartable.c: mkchartable
0010a797
ER		 1068 # ./mkchartable -m $(srcdir)/charset/unicode.map $(srcdir)/charset/*.t >x-chartables.h
1069 # mv x-chartables.h chartables.h
1070
1071-mkchartable: mkchartable.o xstrlcpy.o xstrlcat.o xmalloc.o assert.o
1072- $(CC) $(LDFLAGS) -o mkchartable mkchartable.o xstrlcpy.o xstrlcat.o xmalloc.o assert.o
1073+mkchartable: mkchartable.lo xstrlcpy.lo xstrlcat.lo xmalloc.lo assert.lo
1074+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o mkchartable mkchartable.lo xstrlcpy.lo xstrlcat.lo xmalloc.lo assert.lo
1075
1076 clean:
1077- rm -f *.o *.a chartable.c Makefile.bak mkchartable makedepend.log \
0e463fcc 1078+ rm -rf .libs *.o *.lo *.a *.la chartable.c Makefile.bak mkchartable makedepend.log \
0010a797
ER		 1079 $(BUILTSOURCES)
1080
1081 distclean: clean
3beb582f
AF		 1082--- cyrus-imapd-2.3.16/makedepend/configure.in.wiget 1995-07-05 21:27:31.000000000 +0200
1083+++ cyrus-imapd-2.3.16/makedepend/configure.in 2010-04-11 22:34:54.333846752 +0200
1084@@ -2,7 +2,7 @@ dnl Process this file with autoconf to p
1085 AC_INIT(cppsetup.c)
1086 AC_PROG_CC
1087 AC_PROG_INSTALL
1088-AC_PROG_RANLIB
1089+AC_PROG_LIBTOOL
1090 AC_PROG_MAKE_SET
1091 AC_CHECK_HEADERS(stdarg.h)
1092 AC_SUBST(CPPFLAGS)
1093--- cyrus-imapd-2.3.16/makedepend/Makefile.in.wiget 2008-04-04 14:46:46.000000000 +0200
1094+++ cyrus-imapd-2.3.16/makedepend/Makefile.in 2010-04-11 22:34:54.333846752 +0200
1095@@ -44,11 +44,13 @@
1096 # $Id$
1097 #
1098 srcdir = @srcdir@
d18be73f 1099+top_builddir = @top_builddir@
3beb582f 1100 VPATH = @srcdir@
d18be73f 1101
d18be73f
ER		 1102 CC = @CC@
1103 INSTALL = @INSTALL@
1104 RANLIB = @RANLIB@
1105+LIBTOOL = @LIBTOOL@
d18be73f 1106
cad185d7 1107 DEFS = @DEFS@
3beb582f
AF		 1108 CPPFLAGS = -I. -I$(srcdir) @CPPFLAGS@
1109@@ -62,15 +64,15 @@ SHELL = /bin/sh
d18be73f 1110
3beb582f 1111 all: makedepend
d18be73f 1112
0010a797
ER		 1113-.c.o:
1114- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
1115+%.lo: %.c
1116+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
d18be73f 1117
3beb582f
AF		 1118-makedepend: cppsetup.o ifparser.o include.o main.o parse.o pr.o
1119- $(CC) $(LDFLAGS) -o makedepend cppsetup.o ifparser.o include.o \
1120- main.o parse.o pr.o $(DEPLIBS) $(LIBS)
1121+makedepend: cppsetup.lo ifparser.lo include.lo main.lo parse.lo pr.lo
1122+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o makedepend cppsetup.lo ifparser.lo include.lo \
1123+ main.lo parse.lo pr.lo $(DEPLIBS) $(LIBS)
d18be73f 1124
0010a797 1125 clean:
3beb582f
AF		 1126- rm -f *.o Makefile.bak makedepend
1127+ rm -rf .libs *.o *.lo Makefile.bak makedepend
0010a797
ER		 1128
1129 distclean: clean
1130 rm -f Makefile
3beb582f
AF		 1131--- cyrus-imapd-2.3.16/imtest/Makefile.in.wiget 2008-03-24 19:55:59.000000000 +0100
1132+++ cyrus-imapd-2.3.16/imtest/Makefile.in 2010-04-11 22:34:54.337177995 +0200
1133@@ -50,12 +50,14 @@ VPATH = @srcdir@
d18be73f 1134 CC = @CC@
3beb582f 1135 INSTALL = @INSTALL@
d18be73f
ER		 1136 RANLIB = @RANLIB@
1137+LIBTOOL = @LIBTOOL@
1138+top_builddir = @top_builddir@
1139
3beb582f
AF		 1140 DEFS = @DEFS@ @LOCALDEFS@
1141 CPPFLAGS = -I.. -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
1142 LIBS = @LIBS@
0010a797 1143 IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
3beb582f
AF		 1144-DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
1145+DEPLIBS = ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
0010a797 1146
3beb582f
AF		 1147 CFLAGS = @CFLAGS@
1148 LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
1149@@ -73,7 +75,7 @@ cyrus_prefix = @cyrus_prefix@
1150 all: imtest
e299ecfc 1151
0010a797 1152 install:
3beb582f
AF		 1153- $(INSTALL) -s -m 755 imtest $(DESTDIR)$(exec_prefix)/bin
1154+ $(LIBTOOL) --mode=install $(INSTALL) imtest $(DESTDIR)$(exec_prefix)/bin
1155 ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/pop3test
1156 ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/nntptest
1157 ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/lmtptest
1158@@ -82,17 +84,17 @@ install:
1159 ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/sivtest
1160 ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/synctest
d18be73f
ER		 1161
1162-.c.o:
3beb582f 1163- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
d18be73f 1164+%.lo: %.c
3beb582f 1165+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
d18be73f 1166
3beb582f
AF		 1167-imtest: imtest.o $(DEPLIBS)
1168- $(CC) $(LDFLAGS) -o imtest imtest.o $(DEPLIBS) $(IMAP_LIBS)
1169+imtest: imtest.lo $(DEPLIBS)
1170+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o imtest imtest.lo $(DEPLIBS) $(IMAP_LIBS)
1171
1172-imtest.pure: imtest.o $(DEPLIBS)
1173- $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o imtest $(OBJS) $(DEPLIBS) $(LIBS) $(IMAP_LIBS)
1174+imtest.pure: imtest.lo $(DEPLIBS)
1175+ $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o imtest $(OBJS) $(DEPLIBS) $(LIBS) $(IMAP_LIBS)
0010a797
ER		 1176
1177 clean:
3beb582f
AF		 1178- rm -f *.o Makefile.bak makedepend.log imtest
1179+ rm -rf .libs *.o *.lo Makefile.bak makedepend.log imtest
0010a797
ER		 1180
1181 distclean: clean
1182 rm -f Makefile
3beb582f
AF		 1183--- cyrus-imapd-2.3.16/imtest/imtest.c.wiget 2009-09-24 15:35:05.000000000 +0200
1184+++ cyrus-imapd-2.3.16/imtest/imtest.c 2010-04-11 22:34:54.337177995 +0200
1185@@ -283,6 +283,9 @@ void fatal(const char *msg, int code __a
1186 imtest_fatal(msg);
1187 }
0010a797 1188
3beb582f
AF		 1189+/* config.c stuff */
1190+const int config_need_data = 0;
1191+
1192 int mysasl_config(void *context __attribute__((unused)),
1193 const char *plugin_name,
1194 const char *option,
1195--- cyrus-imapd-2.3.16/ptclient/Makefile.in.wiget 2008-03-24 19:34:22.000000000 +0100
1196+++ cyrus-imapd-2.3.16/ptclient/Makefile.in 2010-04-11 22:34:54.337177995 +0200
1197@@ -51,6 +51,8 @@ PURIFY = /usr/local/bin/purify
0010a797
ER		 1198 CC = @CC@
1199 INSTALL = @INSTALL@
1200 RANLIB = @RANLIB@
1201+LIBTOOL = @LIBTOOL@
3beb582f 1202+top_builddir = @top_builddir@
0010a797
ER		 1203
1204 DEFS = @DEFS@
3beb582f
AF		 1205 CPPFLAGS = -I.. -I$(srcdir)/../imap -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
1206@@ -60,8 +62,8 @@ IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
1207 LIBS = $(IMAP_LIBS) @COM_ERR_LIBS@
1208 LIB_SASL = @LIB_SASL@
1209 LIB_WRAP = @LIB_WRAP@
1210-DEPLIBS = ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
1211-UTIL_LIBS = ../imap/mutex_fake.o ../imap/cli_fatal.o
1212+DEPLIBS = ../imap/libimap.la ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
1213+UTIL_LIBS = ../imap/mutex_fake.lo ../imap/cli_fatal.lo
0010a797 1214
3beb582f
AF		 1215 LDAP_LIBS=@LDAP_LIBS@
1216 LDAP_CPPFLAGS=@LDAP_CPPFLAGS@
1217@@ -83,42 +85,42 @@ PROGS = ptexpire ptloader ptdump $(EXTRA
1218
1219 LIB_RT = @LIB_RT@
1220
1221-SERVICE=../master/service.o
1222-SERVICETHREAD=../master/service-thread.o
1223+SERVICE=../master/service.lo
1224+SERVICETHREAD=../master/service-thread.lo
1225
1226 all: $(PROGS)
1227
1228 install:
1229- $(INSTALL) -m 755 ptloader $(DESTDIR)$(service_path)
1230- $(INSTALL) -m 755 ptexpire $(DESTDIR)$(service_path)
1231- $(INSTALL) -m 755 ptdump $(DESTDIR)$(service_path)
1232+ $(LIBTOOL) --mode=install $(INSTALL) ptloader $(DESTDIR)$(service_path)
1233+ $(LIBTOOL) --mode=install $(INSTALL) ptexpire $(DESTDIR)$(service_path)
1234+ $(LIBTOOL) --mode=install $(INSTALL) ptdump $(DESTDIR)$(service_path)
0010a797
ER		 1235
1236-.c.o:
3beb582f 1237- $(CC) -c $(CPPFLAGS) $(LDAP_CPPFLAGS) $(DEFS) $(CFLAGS) $<
0010a797 1238+%.lo: %.c
3beb582f 1239+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(LDAP_CPPFLAGS) $(DEFS) $(CFLAGS) $<
0010a797 1240
3beb582f
AF		 1241-ptloader: ptloader.o afskrb.o ldap.o ../imap/mutex_fake.o $(DEPLIBS)
1242- $(CC) $(LDFLAGS) -o $@ ptloader.o afskrb.o ldap.o ../imap/mutex_fake.o $(SERVICETHREAD) ${AFS_LDFLAGS} ${LDAP_LDFLAGS} $(AFS_LIBS) ${LDAP_LIBS} $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
1243+ptloader: ptloader.lo afskrb.lo ldap.lo ../imap/mutex_fake.lo $(DEPLIBS)
1244+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ptloader.lo afskrb.lo ldap.lo ../imap/mutex_fake.lo $(SERVICETHREAD) ${AFS_LDFLAGS} ${LDAP_LDFLAGS} $(AFS_LIBS) ${LDAP_LIBS} $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
1245
1246-ptloader.pure: ptloader.o afskrb.o ldap.o ../imap/mutex_fake.o $(DEPLIBS)
1247- $(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ ptloader.o afskrb.o ldap.o ../imap/mutex_fake.o $(SERVICETHREAD) ${AFS_LDFLAGS} ${LDAP_LDFLAGS} $(AFS_LIBS) ${LDAP_LIBS} $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
1248+ptloader.pure: ptloader.lo afskrb.lo ldap.lo ../imap/mutex_fake.lo $(DEPLIBS)
1249+ $(PURIFY) $(PUREARGS) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ptloader.lo afskrb.lo ldap.lo ../imap/mutex_fake.lo $(SERVICETHREAD) ${AFS_LDFLAGS} ${LDAP_LDFLAGS} $(AFS_LIBS) ${LDAP_LIBS} $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
1250
1251-ptexpire: ptexpire.o $(DEPLIBS) $(UTIL_LIBS)
1252- $(CC) $(LDFLAGS) -o $@ ptexpire.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_RT)
1253+ptexpire: ptexpire.lo $(DEPLIBS) $(UTIL_LIBS)
1254+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ptexpire.lo $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_RT)
1255
1256-ptexpire.pure: ptexpire.o $(DEPLIBS) $(UTIL_LIBS)
1257- $(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ ptexpire.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
1258+ptexpire.pure: ptexpire.lo $(DEPLIBS) $(UTIL_LIBS)
1259+ $(PURIFY) $(PUREARGS) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ptexpire.lo $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
1260
1261-ptdump: ptdump.o $(DEPLIBS) $(UTIL_LIBS)
1262- $(CC) $(LDFLAGS) -o $@ ptdump.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_RT)
1263+ptdump: ptdump.lo $(DEPLIBS) $(UTIL_LIBS)
1264+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ptdump.lo $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_RT)
1265
1266-ptdump.pure: ptexpire.o $(DEPLIBS) $(UTIL_LIBS)
1267- $(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ ptdump.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
1268+ptdump.pure: ptexpire.lo $(DEPLIBS) $(UTIL_LIBS)
1269+ $(PURIFY) $(PUREARGS) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ptdump.lo $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
1270
1271-ptextract: ptextract.o $(DEPLIBS) $(UTIL_LIBS)
1272- $(CC) $(LDFLAGS) -o $@ ptextract.o $(UTIL_LIBS) $(DEPLIBS) $(LIBS)
1273+ptextract: ptextract.lo $(DEPLIBS) $(UTIL_LIBS)
1274+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ptextract.lo $(UTIL_LIBS) $(DEPLIBS) $(LIBS)
0010a797
ER		 1275
1276 clean:
3beb582f
AF		 1277- rm -f *.o Makefile.bak $(PROGS) makedepend.log
1278+ rm -rf .libs *.o *.lo Makefile.bak $(PROGS) makedepend.log
0010a797
ER		 1279
1280 distclean: clean
1281 rm -f Makefile
3beb582f
AF		 1282--- cyrus-imapd-2.3.16/com_err/et/Makefile.in.wiget 2008-03-24 19:53:40.000000000 +0100
1283+++ cyrus-imapd-2.3.16/com_err/et/Makefile.in 2010-04-11 22:34:54.337177995 +0200
0010a797
ER		 1284@@ -44,11 +44,13 @@
1285 # $Id$
1286
1287 srcdir = @srcdir@
1288+top_builddir = @top_builddir@
1289 VPATH = @srcdir@
1290
1291 CC = @CC@
1292 INSTALL = @INSTALL@
1293 RANLIB = @RANLIB@
1294+LIBTOOL = @LIBTOOL@
1295 ARCHIVE = ar cr
1296
1297 AWK = @AWK@
3beb582f 1298@@ -63,19 +65,19 @@ LDFLAGS = @LDFLAGS@
0010a797
ER		 1299
1300 SHELL = /bin/sh
1301
1302-LIBOBJS= error_message.o et_name.o init_et.o com_err.o
1303+LIBOBJS= error_message.lo et_name.lo init_et.lo com_err.lo
1304 # for et_lex.lex.c include in error_table.y
1305 LOCALINCLUDE=-I. -I.. -I$(srcdir)
1306
1307-all: compile_et libcom_err.a
1308+all: compile_et libcom_err.la
1309
1310 install:
1311
1312-.c.o:
1313- $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I$(srcdir)/../../lib -I. -I../.. $(CFLAGS) $<
1314+%.lo: %.c
1315+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I$(srcdir)/../../lib -I. -I../.. $(CFLAGS) $<
1316
1317 # solaris make loses on com_err.c but not on init_et.c, but this helps
1318-com_err.o: com_err.c
1319+com_err.lo: com_err.c
1320
1321 #
1322 # real entries...
3beb582f 1323@@ -92,13 +94,13 @@ et_h.awk: $(srcdir)/et_h.awk
0010a797
ER		 1324 $(CP) $(srcdir)/et_h.awk et_h.awk
1325
1326 clean:
1327- rm -f compile_et compile_et.o error_table.o
1328- rm -f libcom_err.a
0e463fcc
ER		 1329+ rm -f compile_et compile_et.o compile_et.lo error_table.o error_table.lo
1330+ rm -rf .libs libcom_err.a libcom_err.la
0010a797
ER		 1331 rm -f $(LIBOBJS)
1332
1333 distclean: clean
1334- rm -f compile_et compile_et.o error_table.o
1335- rm -f libcom_err.a
0e463fcc
ER		 1336+ rm -f compile_et compile_et.o compile_et.lo error_table.o error_table.lo
1337+ rm -rf .libs libcom_err.a libcom_err.la
0010a797
ER		 1338 rm -f $(LIBOBJS)
1339 rm Makefile
1340
3beb582f 1341@@ -119,21 +121,15 @@ depend: compile_et
0010a797
ER		 1342
1343 ## install_library_target(com_err,$(LIBOBJS),$(LINTFILES),)
1344
1345-libcom_err.a: $(LIBOBJS)
1346- rm -f libcom_err.a
1347- $(ARCHIVE) $@ $(LIBOBJS)
1348- $(RANLIB) $@
1349+libcom_err.la: $(LIBOBJS)
1350+ $(LIBTOOL) --mode=link --tag=CC $(CC) -o libcom_err.la $(LIBOBJS)
1351
1352 #install::
1353-# $(INSTALLLIB) libcom_err.a $(DESTDIR)$(LIBDIR)/libcom_err.a
1354-# $(CHMOD) 644 $(DESTDIR)$(LIBDIR)/libcom_err.a
1355-# $(RANLIB) $(DESTDIR)$(LIBDIR)/libcom_err.a
1356-# $(CHMOD) 444 $(DESTDIR)$(LIBDIR)/libcom_err.a
1357+# $(LIBTOOL) --mode=install $(INSTALL) -m 644 libcom_err.la $(DESTDIR)$(LIBDIR)
1358 ##
1359
1360-libcom_err.o: $(LIBOBJS)
1361- ld -r -s -o libcom_err.o $(LIBOBJS)
1362- chmod -x libcom_err.o
1363+libcom_err.lo: $(LIBOBJS)
1364+ $(LIBTOOL) --mode=link --tag=CC ld -r -o libcom_err.lo $(LIBOBJS)
1365
1366 TAGS: et_name.c error_message.c compile_et.c error_table.c \
1367 lex.yy.c init_et.c
3beb582f
AF		 1368--- cyrus-imapd-2.3.16/depot/Makefile.in.wiget 2008-03-24 21:26:12.000000000 +0100
1369+++ cyrus-imapd-2.3.16/depot/Makefile.in 2010-04-11 22:34:54.337177995 +0200
1370@@ -44,16 +44,18 @@
0010a797
ER		 1371 # $Id$
1372
1373 srcdir = @srcdir@
1374+top_builddir = @top_builddir@
1375 VPATH = @srcdir@
1376
1377 CC = @CC@
0010a797
ER		 1378 INSTALL = @INSTALL@
1379 RANLIB = @RANLIB@
1380+LIBTOOL = @LIBTOOL@
1381
1382 DEFS = @DEFS@
3beb582f
AF		 1383 CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@
1384 LIBS = @LIBS@
1385-DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
1386+DEPLIBS = ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
0010a797 1387
3beb582f
AF		 1388 CFLAGS = @CFLAGS@
1389 LDFLAGS = @LDFLAGS@
1390@@ -73,11 +75,11 @@ install:
1391 $(INSTALL) -m 644 $(srcdir)/rc.local.imap $(DESTDIR)etc
1392 $(INSTALL) -m 644 $(srcdir)/rc.local.ptclient $(DESTDIR)etc
0010a797
ER		 1393
1394-.c.o:
3beb582f 1395- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
0010a797 1396+%.lo: %.c
3beb582f 1397+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
0010a797 1398
3beb582f
AF		 1399 clean:
1400- rm -f *.o Makefile.bak makedepend.log
1401+ rm -rf .libs *.o *.lo Makefile.bak makedepend.log
0010a797 1402
3beb582f
AF		 1403 distclean: clean
1404 rm -f Makefile
1405--- cyrus-imapd-2.3.16/sieve/Makefile.in.wiget 2008-07-10 18:37:20.000000000 +0200
1406+++ cyrus-imapd-2.3.16/sieve/Makefile.in 2010-04-11 22:35:42.023844906 +0200
1407@@ -51,10 +51,13 @@ cyrus_prefix = @cyrus_prefix@
1408 service_path = @service_path@
1409
1410 CC = @CC@
1411+INSTALL = @INSTALL@
1412 YACC = @YACC@
1413 YFLAGS = -d
1414 LEX = @LEX@
1415 RANLIB = @RANLIB@
1416+LIBTOOL = @LIBTOOL@
1417+top_builddir = @top_builddir@
1418 COMPILE_ET = @COMPILE_ET@
1419
1420 DEFS = @DEFS@ @LOCALDEFS@
1421@@ -68,30 +71,30 @@ MAKEDEPEND = @MAKEDEPEND@
1422 IMAP_LIBS = @IMAP_LIBS@
1423 IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
1424 IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
1425-LIBS = libsieve.a $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS)
1426-DEPLIBS=../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
1427+LIBS = libsieve.la $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS)
1428+DEPLIBS=../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
1429
1430 BUILT_SOURCES = addr.c addr.h addr-lex.c \
1431 sieve.c sieve.h sieve-lex.c \
1432 sieve_err.h sieve_err.c
1433
1434-all: libsieve.a sievec sieved
1435+all: libsieve.la sievec sieved
1436
1437 dist: $(BUILT_SOURCES)
1438
1439 install: sievec sieved
1440 $(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
1441- $(srcdir)/../install-sh -c -m 755 sievec $(DESTDIR)$(service_path) || exit
1442- $(srcdir)/../install-sh -c -m 755 sieved $(DESTDIR)$(service_path) || exit
1443-
1444-test: $(DEPLIBS) libsieve.a test.o ../imap/message.o
1445- $(CC) $(LDFLAGS) -o test test.o ../imap/message.o \
1446- libsieve.a $(DEPLIBS) $(LIBS)
1447-
1448-OBJS = sieve_err.o \
1449- sieve.o sieve-lex.o comparator.o interp.o message.o \
1450- bc_generate.o bc_dump.o bc_emit.o bc_eval.o \
1451- script.o tree.o addr.o addr-lex.o
1452+ $(LIBTOOL) --mode=install $(srcdir)/../install-sh -c -m 755 sievec $(DESTDIR)$(service_path) || exit
1453+ $(LIBTOOL) --mode=install $(srcdir)/../install-sh -c -m 755 sieved $(DESTDIR)$(service_path) || exit
1454+
1455+test: $(DEPLIBS) libsieve.la test.lo ../imap/message.lo
1456+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o test test.lo ../imap/message.lo \
1457+ libsieve.la $(DEPLIBS) $(LIBS)
1458+
1459+OBJS = sieve_err.lo \
1460+ sieve.lo sieve-lex.lo comparator.lo interp.lo message.lo \
1461+ bc_generate.lo bc_dump.lo bc_emit.lo bc_eval.lo \
1462+ script.lo tree.lo addr.lo addr-lex.lo
1463
1464 sieve-lex.c: sieve-lex.l sieve.h
1465
1466@@ -113,21 +118,19 @@ addr.c addr.h: addr.y
1467
1468 # This is needed because 'makedepend' leaves it out
1469 #(this is not in newer version, is it still needed?)
1470-#addr.o: addr.h
1471+#addr.lo: addr.h
1472
1473
1474-#libsieve.a: sieve.c sieve.h sieve_err.h sieve_err.c $(OBJS)
1475+#libsieve.la: sieve.c sieve.h sieve_err.h sieve_err.c $(OBJS)
1476 #changed to...
1477-libsieve.a: $(OBJS)
1478- rm -f libsieve.a
1479- ar cr libsieve.a $(OBJS)
1480- $(RANLIB) libsieve.a
1481+libsieve.la: $(OBJS)
1482+ $(LIBTOOL) --mode=link --tag=CC $(CC) -o libsieve.la $(OBJS)
1483
1484-sievec: sievec.o libsieve.a
1485- $(CC) $(LDFLAGS) -o sievec sievec.o libsieve.a $(DEPLIBS) $(LIBS)
1486+sievec: sievec.lo libsieve.la
1487+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o sievec sievec.lo libsieve.la $(DEPLIBS) $(LIBS)
1488
1489-sieved: sieved.o libsieve.a
1490- $(CC) $(LDFLAGS) -o sieved sieved.o libsieve.a $(DEPLIBS) $(LIBS)
1491+sieved: sieved.lo libsieve.la
1492+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o sieved sieved.lo libsieve.la $(DEPLIBS) $(LIBS)
1493
1494
1495 sieve_interface.h: sieve_err.h
1496@@ -136,7 +139,7 @@ sieve_err.h sieve_err.c: sieve_err.et
1497 $(COMPILE_ET) $(srcdir)/sieve_err.et
0010a797
ER		 1498
1499 clean:
3beb582f
AF		 1500- rm -f sievec sieved test *~ *.o *.a Makefile.bak makedepend.log
1501+ rm -rf sievec sieved test *~ .libs *.o *.lo *.a *.la Makefile.bak makedepend.log
0010a797
ER		 1502
1503 distclean: clean
3beb582f
AF		 1504 rm -f sieve_err.c sieve_err.h
1505@@ -148,8 +151,8 @@ clobber:
1506 depend:
1507 ${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(MAKEDEPEND_CFLAGS) *.c *.y $(srcdir)/*.y $(srcdir)/*.c 1>makedepend.log 2>&1
1508
1509-.c.o:
1510- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
1511+%.lo: %.c
1512+ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
1513 $<
1514
1515 # DO NOT DELETE THIS LINE -- make depend depends on it.
High-performance mail store with IMAP and POP3
This page took 0.664963 seconds and 4 git commands to generate.