1 --- cyrus-imapd-2.3.12p2.shared/configure.in 2008-09-23 21:44:50.591844716 +0300
2 +++ cyrus-imapd-2.3.12p2/configure.in 2008-09-23 22:25:22.672454302 +0300
4 AC_DEFINE_UNQUOTED(SYSCONFDIR,"$sysconfdir",[Config File Location])
13 cyrus_cv_getaddrinfo=no)], cyrus_cv_getaddrinfo=no)
15 if test $cyrus_cv_getaddrinfo = no; then
16 - IPV6_OBJS="getaddrinfo.o"
17 + IPV6_OBJS="getaddrinfo.lo"
20 cyrus_cv_getnameinfo=yes
22 cyrus_cv_getnameinfo=no)
24 if test $cyrus_cv_getnameinfo = no; then
25 - IPV6_OBJS="$IPV6_OBJS getnameinfo.o"
26 + IPV6_OBJS="$IPV6_OBJS getnameinfo.lo"
29 IPv6_CHECK_SS_FAMILY()
31 dnl function for doing each of the database backends
32 dnl parameters: backend name, variable to set, withval
34 -CYRUSDB_OBJS="cyrusdb_flat.o cyrusdb_skiplist.o cyrusdb_quotalegacy.o"
35 +CYRUSDB_OBJS="cyrusdb_flat.lo cyrusdb_skiplist.lo cyrusdb_quotalegacy.lo"
37 dnl Berkeley DB Detection
40 LIBS="${LIBS} ${BDB_LIBADD}"
41 CPPFLAGS="${BDB_INCADD} ${CPPFLAGS}"
43 - CYRUSDB_OBJS="$CYRUSDB_OBJS cyrusdb_berkeley.o"
44 + CYRUSDB_OBJS="$CYRUSDB_OBJS cyrusdb_berkeley.lo"
45 AC_DEFINE(HAVE_BDB,[],[Build in Berkeley DB support?])
51 if test "$sievedir" != "no"; then
52 - SIEVE_OBJS="lmtp_sieve.o smtpclient.o"
53 + SIEVE_OBJS="lmtp_sieve.lo smtpclient.lo"
55 - SIEVE_LIBS="../${sievedir}/libsieve.a"
56 + SIEVE_LIBS="../${sievedir}/libsieve.la"
58 SIEVE_CPPFLAGS="-I\$(srcdir)/../$sievedir"
59 AC_SUBST(SIEVE_CPPFLAGS)
61 if test $cyrus_cv_lib_syslog = no; then
62 PRE_SUBDIRS="${PRE_SUBDIRS} syslog"
63 EXTRA_OUTPUT="${EXTRA_OUTPUT} syslog/Makefile"
64 - DEPLIBS="${DEPLIBS} ../syslog/libsyslog.a"
65 + DEPLIBS="${DEPLIBS} ../syslog/libsyslog.la"
66 CPPFLAGS="$CPPFLAGS -I\$(srcdir)/../syslog"
68 AC_MSG_RESULT($cyrus_cv_lib_syslog)
70 dnl Check for MD5 functions
71 AC_FUNC_CHECK(MD5Init,,
72 AC_CHECK_LIB(md, MD5Init, LIBS="${LIBS} -lmd",
78 --- cyrus-imapd-2.3.12p2.shared/depot/Makefile.in 2008-09-23 21:44:50.599845178 +0300
79 +++ cyrus-imapd-2.3.12p2/depot/Makefile.in 2008-09-23 22:10:04.419383504 +0300
84 +top_builddir = @top_builddir@
93 CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@
95 -DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
96 +DEPLIBS = ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
101 $(INSTALL) -m 644 $(srcdir)/rc.local.imap $(DESTDIR)etc
102 $(INSTALL) -m 644 $(srcdir)/rc.local.ptclient $(DESTDIR)etc
105 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
107 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
110 - rm -f *.o Makefile.bak makedepend.log
111 + rm -rf .libs *.o *.lo Makefile.bak makedepend.log
115 --- cyrus-imapd-2.3.12p2.shared/imap/Makefile.in 2008-09-23 21:44:50.591844716 +0300
116 +++ cyrus-imapd-2.3.12p2/imap/Makefile.in 2008-09-24 16:29:37.354850372 +0300
119 # \Seen state database. Either 'db' (berkeley db) or
120 # 'local' (legacy flat file).
125 top_srcdir = @top_srcdir@
126 +top_builddir = @top_builddir@
135 CYRUS_USER=@cyrus_user@
136 CYRUS_GROUP=@cyrus_group@
138 IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
139 LIB_WRAP = @LIB_WRAP@
140 LIBS = $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS)
141 -DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
142 +DEPLIBS = ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
145 LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
147 cyrus_prefix = @cyrus_prefix@
148 service_path = @service_path@
150 -LOBJS= append.o mailbox.o mboxlist.o mupdate-client.o mboxname.o message.o \
151 - global.o imap_err.o mupdate_err.o proc.o setproctitle.o \
152 - convert_code.o duplicate.o saslclient.o saslserver.o signals.o \
153 - annotate.o search_engines.o squat.o squat_internal.o mbdump.o \
154 - imapparse.o telemetry.o user.o notify.o idle.o quota_db.o \
155 - sync_log.o $(SEEN) mboxkey.o backend.o tls.o message_guid.o \
157 +LOBJS= append.lo mailbox.lo mboxlist.lo mupdate-client.lo mboxname.lo message.lo \
158 + global.lo imap_err.lo mupdate_err.lo proc.lo setproctitle.lo \
159 + convert_code.lo duplicate.lo saslclient.lo saslserver.lo signals.lo \
160 + annotate.lo search_engines.lo squat.lo squat_internal.lo mbdump.lo \
161 + imapparse.lo telemetry.lo user.lo notify.lo idle.lo quota_db.lo \
162 + sync_log.lo $(SEEN) mboxkey.lo backend.lo tls.lo message_guid.lo \
165 -IMAPDOBJS=pushstats.o imapd.o proxy.o imap_proxy.o index.o version.o
166 +IMAPDOBJS=pushstats.lo imapd.lo proxy.lo imap_proxy.lo index.lo version.lo
168 -LMTPOBJS=lmtpstats.o lmtpengine.o spool.o
169 +LMTPOBJS=lmtpstats.lo lmtpengine.lo spool.lo
171 # Your typical objects for the command line utilities
172 -CLIOBJS=cli_fatal.o mutex_fake.o
173 +CLIOBJS=cli_fatal.lo mutex_fake.lo
175 -SERVICE=../master/service.o
176 -SERVICETHREAD=../master/service-thread.o
177 +SERVICE=../master/service.lo
178 +SERVICETHREAD=../master/service-thread.lo
180 PROGS = imapd lmtpd pop3d \
181 fud smmapd reconstruct quota mbpath ipurge cyr_dbtool cyr_synclog \
182 @@ -131,31 +133,28 @@
185 $(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
186 - for file in $(PROGS); \
188 - $(INSTALL) -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
189 + for file in $(PROGS); do \
190 + $(LIBTOOL) --mode=install $(INSTALL) -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
192 ln -f $(DESTDIR)$(service_path)/pop3d $(DESTDIR)$(service_path)/pop3proxyd
193 ln -f $(DESTDIR)$(service_path)/imapd $(DESTDIR)$(service_path)/proxyd
194 ln -f $(DESTDIR)$(service_path)/lmtpd $(DESTDIR)$(service_path)/lmtpproxyd
197 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
199 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
206 - ar cr libimap.a $(LOBJS)
207 - $(RANLIB) libimap.a
208 +libimap.la: $(LOBJS)
209 + $(LIBTOOL) --mode=link --tag=CC $(CC) -o libimap.la $(LOBJS)
211 ### Built Source Files
214 AWK=$(AWK) $(srcdir)/xversion.sh
216 -version.o: xversion.h
217 +version.lo: xversion.h
219 pushstats.c: pushstats.snmp $(srcdir)/../snmp/snmpgen
220 $(srcdir)/../snmp/snmpgen $(srcdir)/pushstats.snmp
221 @@ -183,179 +182,179 @@
222 mupdate_err.h: mupdate_err.c
225 -idled: idled.o mutex_fake.o libimap.a $(DEPLIBS)
226 - $(CC) $(LDFLAGS) -o idled \
227 - idled.o mutex_fake.o libimap.a $(DEPLIBS) $(LIBS)
229 -lmtpd: lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.o \
230 - libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
231 - $(CC) $(LDFLAGS) -o lmtpd \
232 - $(SERVICE) lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \
233 - mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
235 -lmtpd.pure: lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \
236 - mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
237 - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o lmtpd.pure \
238 - $(SERVICE) lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \
239 - mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
241 -imapd: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
242 - $(CC) $(LDFLAGS) -o imapd \
243 - $(SERVICE) $(IMAPDOBJS) mutex_fake.o \
244 - libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
246 -imapd.pure: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
247 - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o imapd.pure \
248 - $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \
249 +idled: idled.lo mutex_fake.lo libimap.la $(DEPLIBS)
250 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o idled \
251 + idled.lo mutex_fake.lo libimap.la $(DEPLIBS) $(LIBS)
253 +lmtpd: lmtpd.lo proxy.lo $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.lo \
254 + libimap.la $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
255 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o lmtpd \
256 + $(SERVICE) lmtpd.lo proxy.lo $(LMTPOBJS) $(SIEVE_OBJS) \
257 + mutex_fake.lo libimap.la $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
259 +lmtpd.pure: lmtpd.lo proxy.lo $(LMTPOBJS) $(SIEVE_OBJS) \
260 + mutex_fake.lo libimap.la $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
261 + $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o lmtpd.pure \
262 + $(SERVICE) lmtpd.lo proxy.lo $(LMTPOBJS) $(SIEVE_OBJS) \
263 + mutex_fake.lo libimap.la $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
265 +imapd: $(IMAPDOBJS) mutex_fake.lo libimap.la $(DEPLIBS) $(SERVICE)
266 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o imapd \
267 + $(SERVICE) $(IMAPDOBJS) mutex_fake.lo \
268 + libimap.la $(DEPLIBS) $(LIBS) $(LIB_WRAP)
270 +imapd.pure: $(IMAPDOBJS) mutex_fake.lo libimap.la $(DEPLIBS) $(SERVICE)
271 + $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o imapd.pure \
272 + $(SERVICE) $(IMAPDOBJS) mutex_fake.lo libimap.la \
273 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
275 -imapd.quant: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
276 - $(QUANTIFY) $(QUANTOPT) $(CC) $(LDFLAGS) -o imapd.quant \
277 - $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \
278 +imapd.quant: $(IMAPDOBJS) mutex_fake.lo libimap.la $(DEPLIBS) $(SERVICE)
279 + $(QUANTIFY) $(QUANTOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o imapd.quant \
280 + $(SERVICE) $(IMAPDOBJS) mutex_fake.lo libimap.la \
281 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
283 -mupdate: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o tls.o \
284 - libimap.a $(DEPLIBS)
285 - $(CC) $(LDFLAGS) -o mupdate \
286 - $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
287 - mutex_pthread.o tls.o libimap.a \
288 +mupdate: mupdate.lo mupdate-slave.lo mupdate-client.lo mutex_pthread.lo tls.lo \
289 + libimap.la $(DEPLIBS)
290 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o mupdate \
291 + $(SERVICETHREAD) mupdate.lo mupdate-slave.lo mupdate-client.lo \
292 + mutex_pthread.lo tls.lo libimap.la \
293 $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
295 -mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o \
296 - libimap.a $(DEPLIBS)
297 - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o mupdate.pure \
298 - $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
299 - mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
300 +mupdate.pure: mupdate.lo mupdate-slave.lo mupdate-client.lo mutex_pthread.lo \
301 + libimap.la $(DEPLIBS)
302 + $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o mupdate.pure \
303 + $(SERVICETHREAD) mupdate.lo mupdate-slave.lo mupdate-client.lo \
304 + mutex_pthread.lo libimap.la $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
306 -pop3d: pop3d.o proxy.o backend.o tls.o mutex_fake.o libimap.a \
307 +pop3d: pop3d.lo proxy.lo backend.lo tls.lo mutex_fake.lo libimap.la \
308 $(DEPLIBS) $(SERVICE)
309 - $(CC) $(LDFLAGS) -o pop3d pop3d.o proxy.o backend.o tls.o $(SERVICE) \
310 - mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
311 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o pop3d pop3d.lo proxy.lo backend.lo tls.lo $(SERVICE) \
312 + mutex_fake.lo libimap.la $(DEPLIBS) $(LIBS) $(LIB_WRAP)
314 -nntpd: nntpd.o proxy.o backend.o index.o smtpclient.o spool.o tls.o \
315 - mutex_fake.o nntp_err.o libimap.a $(DEPLIBS) $(SERVICE)
316 - $(CC) $(LDFLAGS) -o nntpd nntpd.o proxy.o backend.o index.o spool.o \
317 - smtpclient.o tls.o $(SERVICE) mutex_fake.o nntp_err.o \
318 - libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
319 +nntpd: nntpd.lo proxy.lo backend.lo index.lo smtpclient.lo spool.lo tls.lo \
320 + mutex_fake.lo nntp_err.lo libimap.la $(DEPLIBS) $(SERVICE)
321 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o nntpd nntpd.lo proxy.lo backend.lo index.lo spool.lo \
322 + smtpclient.lo tls.lo $(SERVICE) mutex_fake.lo nntp_err.lo \
323 + libimap.la $(DEPLIBS) $(LIBS) $(LIB_WRAP)
325 -fud: fud.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE)
326 - $(CC) $(LDFLAGS) -o fud $(SERVICE) fud.o mutex_fake.o libimap.a \
327 +fud: fud.lo libimap.la mutex_fake.lo $(DEPLIBS) $(SERVICE)
328 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o fud $(SERVICE) fud.lo mutex_fake.lo libimap.la \
329 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
331 -smmapd: smmapd.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE)
332 - $(CC) $(LDFLAGS) -o smmapd $(SERVICE) smmapd.o mutex_fake.o libimap.a \
333 +smmapd: smmapd.lo libimap.la mutex_fake.lo $(DEPLIBS) $(SERVICE)
334 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o smmapd $(SERVICE) smmapd.lo mutex_fake.lo libimap.la \
335 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
337 -sync_server: sync_server.o sync_support.o sync_commit.o \
338 - imapparse.o tls.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE)
339 - $(CC) $(LDFLAGS) -o \
340 - sync_server sync_server.o sync_support.o sync_commit.o \
341 - imapparse.o tls.o $(SERVICE) libimap.a mutex_fake.o \
342 +sync_server: sync_server.lo sync_support.lo sync_commit.lo \
343 + imapparse.lo tls.lo libimap.la mutex_fake.lo $(DEPLIBS) $(SERVICE)
344 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
345 + sync_server sync_server.lo sync_support.lo sync_commit.lo \
346 + imapparse.lo tls.lo $(SERVICE) libimap.la mutex_fake.lo \
347 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
349 ### Command Line Utilities
350 -arbitron: arbitron.o $(CLIOBJS) libimap.a $(DEPLIBS)
351 - $(CC) $(LDFLAGS) -o arbitron arbitron.o $(CLIOBJS) \
352 - libimap.a $(DEPLIBS) $(LIBS)
354 -cyr_dbtool: cyr_dbtool.o mutex_fake.o libimap.a $(DEPLIBS)
355 - $(CC) $(LDFLAGS) -o cyr_dbtool cyr_dbtool.o $(CLIOBJS) \
356 - libimap.a $(DEPLIBS) $(LIBS)
358 -cyr_synclog: cyr_synclog.o mutex_fake.o libimap.a $(DEPLIBS)
359 - $(CC) $(LDFLAGS) -o cyr_synclog cyr_synclog.o $(CLIOBJS) \
360 - libimap.a $(DEPLIBS) $(LIBS)
362 -cvt_cyrusdb: cvt_cyrusdb.o mutex_fake.o libimap.a $(DEPLIBS)
363 - $(CC) $(LDFLAGS) -o cvt_cyrusdb cvt_cyrusdb.o $(CLIOBJS) \
364 - libimap.a $(DEPLIBS) $(LIBS)
366 -chk_cyrus: chk_cyrus.o mutex_fake.o libimap.a $(DEPLIBS)
367 - $(CC) $(LDFLAGS) -o chk_cyrus chk_cyrus.o $(CLIOBJS) \
368 - libimap.a $(DEPLIBS) $(LIBS)
370 -deliver: deliver.o $(LMTPOBJS) proxy.o mutex_fake.o libimap.a $(DEPLIBS)
371 - $(CC) $(LDFLAGS) -o deliver deliver.o $(LMTPOBJS) proxy.o \
372 - mutex_fake.o libimap.a $(DEPLIBS) $(LIBS)
374 -ctl_deliver: ctl_deliver.o $(CLIOBJS) libimap.a $(DEPLIBS)
375 - $(CC) $(LDFLAGS) -o \
376 - $@ ctl_deliver.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
378 -ctl_mboxlist: ctl_mboxlist.o mupdate-client.o $(CLIOBJS) libimap.a $(DEPLIBS)
379 - $(CC) $(LDFLAGS) -o $@ ctl_mboxlist.o mupdate-client.o $(CLIOBJS) \
380 - libimap.a $(DEPLIBS) $(LIBS)
382 -ctl_cyrusdb: ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS)
383 - $(CC) $(LDFLAGS) -o \
384 - $@ ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
386 -cyr_expire: cyr_expire.o $(CLIOBJS) libimap.a $(DEPLIBS)
387 - $(CC) $(LDFLAGS) -o $@ cyr_expire.o $(CLIOBJS) \
388 - libimap.a $(DEPLIBS) $(LIBS)
390 -fetchnews: fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS)
391 - $(CC) $(LDFLAGS) -o \
392 - $@ fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
394 -squatter: squatter.o index.o squat_build.o $(CLIOBJS) libimap.a $(DEPLIBS)
395 - $(CC) $(LDFLAGS) -o squatter squatter.o index.o squat_build.o \
396 - $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
397 +arbitron: arbitron.lo $(CLIOBJS) libimap.la $(DEPLIBS)
398 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o arbitron arbitron.lo $(CLIOBJS) \
399 + libimap.la $(DEPLIBS) $(LIBS)
401 +cyr_dbtool: cyr_dbtool.lo mutex_fake.lo libimap.la $(DEPLIBS)
402 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o cyr_dbtool cyr_dbtool.lo $(CLIOBJS) \
403 + libimap.la $(DEPLIBS) $(LIBS)
405 +cyr_synclog: cyr_synclog.lo mutex_fake.lo libimap.la $(DEPLIBS)
406 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o cyr_synclog cyr_synclog.lo $(CLIOBJS) \
407 + libimap.la $(DEPLIBS) $(LIBS)
409 +cvt_cyrusdb: cvt_cyrusdb.lo mutex_fake.lo libimap.la $(DEPLIBS)
410 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o cvt_cyrusdb cvt_cyrusdb.lo $(CLIOBJS) \
411 + libimap.la $(DEPLIBS) $(LIBS)
413 +chk_cyrus: chk_cyrus.lo mutex_fake.lo libimap.la $(DEPLIBS)
414 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o chk_cyrus chk_cyrus.lo $(CLIOBJS) \
415 + libimap.la $(DEPLIBS) $(LIBS)
417 +deliver: deliver.lo $(LMTPOBJS) proxy.lo mutex_fake.lo libimap.la $(DEPLIBS)
418 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o deliver deliver.lo $(LMTPOBJS) proxy.lo \
419 + mutex_fake.lo libimap.la $(DEPLIBS) $(LIBS)
421 +ctl_deliver: ctl_deliver.lo $(CLIOBJS) libimap.la $(DEPLIBS)
422 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
423 + $@ ctl_deliver.lo $(CLIOBJS) libimap.la $(DEPLIBS) $(LIBS)
425 +ctl_mboxlist: ctl_mboxlist.lo mupdate-client.lo $(CLIOBJS) libimap.la $(DEPLIBS)
426 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ctl_mboxlist.lo mupdate-client.lo $(CLIOBJS) \
427 + libimap.la $(DEPLIBS) $(LIBS)
429 +ctl_cyrusdb: ctl_cyrusdb.lo $(CLIOBJS) libimap.la $(DEPLIBS)
430 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
431 + $@ ctl_cyrusdb.lo $(CLIOBJS) libimap.la $(DEPLIBS) $(LIBS)
433 +cyr_expire: cyr_expire.lo $(CLIOBJS) libimap.la $(DEPLIBS)
434 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ cyr_expire.lo $(CLIOBJS) \
435 + libimap.la $(DEPLIBS) $(LIBS)
437 +fetchnews: fetchnews.lo $(CLIOBJS) libimap.la $(DEPLIBS)
438 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
439 + $@ fetchnews.lo $(CLIOBJS) libimap.la $(DEPLIBS) $(LIBS)
441 +squatter: squatter.lo index.lo squat_build.lo $(CLIOBJS) libimap.la $(DEPLIBS)
442 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o squatter squatter.lo index.lo squat_build.lo \
443 + $(CLIOBJS) libimap.la $(DEPLIBS) $(LIBS)
445 -mbpath: mbpath.o $(CLIOBJS) libimap.a $(DEPLIBS)
446 - $(CC) $(LDFLAGS) -o mbpath mbpath.o $(CLIOBJS) libimap.a \
447 +mbpath: mbpath.lo $(CLIOBJS) libimap.la $(DEPLIBS)
448 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o mbpath mbpath.lo $(CLIOBJS) libimap.la \
451 -ipurge: ipurge.o $(CLIOBJS) libimap.a $(DEPLIBS)
452 - $(CC) $(LDFLAGS) -o ipurge ipurge.o $(CLIOBJS) \
453 - libimap.a $(DEPLIBS) $(LIBS)
455 -cyrdump: cyrdump.o index.o $(CLIOBJS) libimap.a $(DEPLIBS)
456 - $(CC) $(LDFLAGS) -o cyrdump cyrdump.o index.o $(CLIOBJS) \
457 - libimap.a $(DEPLIBS) $(LIBS)
459 -mbexamine: mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS)
460 - $(CC) $(LDFLAGS) -o \
461 - mbexamine mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
463 -reconstruct: reconstruct.o $(CLIOBJS) libimap.a $(DEPLIBS)
464 - $(CC) $(LDFLAGS) -o \
465 - reconstruct reconstruct.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
467 -quota: quota.o $(CLIOBJS) libimap.a $(DEPLIBS)
468 - $(CC) $(LDFLAGS) -o quota quota.o $(CLIOBJS) \
469 - libimap.a $(DEPLIBS) $(LIBS)
471 -tls_prune: tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS)
472 - $(CC) $(LDFLAGS) -o \
473 - $@ tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
475 -unexpunge: unexpunge.o $(CLIOBJS) libimap.a $(DEPLIBS)
476 - $(CC) $(LDFLAGS) -o $@ unexpunge.o $(CLIOBJS) \
477 - libimap.a $(DEPLIBS) $(LIBS)
479 -make_md5: make_md5.o libimap.a mutex_fake.o $(DEPLIBS)
480 - $(CC) $(LDFLAGS) -o make_md5 make_md5.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS)
482 -make_sha1: make_sha1.o libimap.a mutex_fake.o $(DEPLIBS)
483 - $(CC) $(LDFLAGS) -o make_sha1 make_sha1.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS)
485 -sync_client: sync_client.o sync_support.o \
486 - backend.o tls.o imapparse.o libimap.a mutex_fake.o $(DEPLIBS)
487 - $(CC) $(LDFLAGS) -o \
488 - sync_client sync_client.o sync_support.o \
489 - backend.o tls.o imapparse.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS)
491 -sync_reset: sync_reset.o sync_support.o sync_commit.o \
492 - libimap.a mutex_fake.o $(DEPLIBS)
493 - $(CC) $(LDFLAGS) -o \
494 - sync_reset sync_reset.o sync_support.o sync_commit.o \
495 - libimap.a mutex_fake.o $(DEPLIBS) $(LIBS)
496 +ipurge: ipurge.lo $(CLIOBJS) libimap.la $(DEPLIBS)
497 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o ipurge ipurge.lo $(CLIOBJS) \
498 + libimap.la $(DEPLIBS) $(LIBS)
500 +cyrdump: cyrdump.lo index.lo $(CLIOBJS) libimap.la $(DEPLIBS)
501 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o cyrdump cyrdump.lo index.lo $(CLIOBJS) \
502 + libimap.la $(DEPLIBS) $(LIBS)
504 +mbexamine: mbexamine.lo $(CLIOBJS) libimap.la $(DEPLIBS)
505 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
506 + mbexamine mbexamine.lo $(CLIOBJS) libimap.la $(DEPLIBS) $(LIBS)
508 +reconstruct: reconstruct.lo $(CLIOBJS) libimap.la $(DEPLIBS)
509 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
510 + reconstruct reconstruct.lo $(CLIOBJS) libimap.la $(DEPLIBS) $(LIBS)
512 +quota: quota.lo $(CLIOBJS) libimap.la $(DEPLIBS)
513 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o quota quota.lo $(CLIOBJS) \
514 + libimap.la $(DEPLIBS) $(LIBS)
516 +tls_prune: tls_prune.lo tls.lo $(CLIOBJS) libimap.la $(DEPLIBS)
517 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
518 + $@ tls_prune.lo tls.lo $(CLIOBJS) libimap.la $(DEPLIBS) $(LIBS)
520 +unexpunge: unexpunge.lo $(CLIOBJS) libimap.la $(DEPLIBS)
521 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ unexpunge.lo $(CLIOBJS) \
522 + libimap.la $(DEPLIBS) $(LIBS)
524 +make_md5: make_md5.lo libimap.la mutex_fake.lo $(DEPLIBS)
525 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o make_md5 make_md5.lo libimap.la mutex_fake.lo $(DEPLIBS) $(LIBS)
527 +make_sha1: make_sha1.lo libimap.la mutex_fake.lo $(DEPLIBS)
528 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o make_sha1 make_sha1.lo libimap.la mutex_fake.lo $(DEPLIBS) $(LIBS)
530 +sync_client: sync_client.lo sync_support.lo \
531 + backend.lo tls.lo imapparse.lo libimap.la mutex_fake.lo $(DEPLIBS)
532 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
533 + sync_client sync_client.lo sync_support.lo \
534 + backend.lo tls.lo imapparse.lo libimap.la mutex_fake.lo $(DEPLIBS) $(LIBS)
536 +sync_reset: sync_reset.lo sync_support.lo sync_commit.lo \
537 + libimap.la mutex_fake.lo $(DEPLIBS)
538 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
539 + sync_reset sync_reset.lo sync_support.lo sync_commit.lo \
540 + libimap.la mutex_fake.lo $(DEPLIBS) $(LIBS)
542 ### Other Misc Targets
545 - rm -f *.o *.a Makefile.bak makedepend.log \
546 + rm -rf .libs *.o *.lo *.a *.la Makefile.bak makedepend.log \
547 $(BUILTSOURCES) $(PROGS) $(SUIDPROGS)
550 --- cyrus-imapd-2.3.12p2.shared/imtest/Makefile.in 2008-09-23 21:44:50.599845178 +0300
551 +++ cyrus-imapd-2.3.12p2/imtest/Makefile.in 2008-09-23 22:10:57.494451435 +0300
557 +top_builddir = @top_builddir@
559 DEFS = @DEFS@ @LOCALDEFS@
560 CPPFLAGS = -I.. -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
562 IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
563 -DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
564 +DEPLIBS = ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
567 LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
572 - $(INSTALL) -s -m 755 imtest $(DESTDIR)$(exec_prefix)/bin
573 + $(LIBTOOL) --mode=install $(INSTALL) imtest $(DESTDIR)$(exec_prefix)/bin
574 ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/pop3test
575 ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/nntptest
576 ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/lmtptest
578 ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/sivtest
579 ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/synctest
582 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
584 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
586 -imtest: imtest.o $(DEPLIBS)
587 - $(CC) $(LDFLAGS) -o imtest imtest.o $(DEPLIBS) $(IMAP_LIBS)
588 +imtest: imtest.lo $(DEPLIBS)
589 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o imtest imtest.lo $(DEPLIBS) $(IMAP_LIBS)
591 -imtest.pure: imtest.o $(DEPLIBS)
592 - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o imtest $(OBJS) $(DEPLIBS) $(LIBS) $(IMAP_LIBS)
593 +imtest.pure: imtest.lo $(DEPLIBS)
594 + $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o imtest $(OBJS) $(DEPLIBS) $(LIBS) $(IMAP_LIBS)
597 - rm -f *.o Makefile.bak makedepend.log imtest
598 + rm -rf .libs *.o *.lo Makefile.bak makedepend.log imtest
602 --- cyrus-imapd-2.3.12p2/imtest/imtest.c 2008-04-11 15:35:18.000000000 +0300
603 +++ cyrus-imapd-2.3.12p2.shared/imtest/imtest.c 2008-09-23 21:44:50.595844947 +0300
608 +/* config.c stuff */
609 +const int config_need_data = 0;
611 int mysasl_config(void *context __attribute__((unused)),
612 const char *plugin_name,
614 --- cyrus-imapd-2.3.12p2/installsieve/Makefile.in 2008-03-24 22:33:11.000000000 +0200
615 +++ cyrus-imapd-2.3.12p2.shared/installsieve/Makefile.in 2008-09-23 21:44:50.591844716 +0300
621 +top_builddir = @top_builddir@
624 CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @SASLFLAGS@
627 IMAP_LIBS = @IMAP_LIBS@
629 -DEPLIBS= ../lib/libcyrus.a @DEPLIBS@
630 +DEPLIBS= ../lib/libcyrus.la @DEPLIBS@
633 exec_prefix = @exec_prefix@
638 - $(INSTALL) -s -m 755 installsieve $(DESTDIR)$(exec_prefix)/bin
639 + $(LIBTOOL) --mode=install $(INSTALL) installsieve $(DESTDIR)$(exec_prefix)/bin
641 -OBJS=lex.o mystring.o request.o isieve.o
642 +OBJS=lex.lo mystring.lo request.lo isieve.lo
644 -libinstallsieve.a: $(OBJS)
645 - rm -f libinstallsieve.a
646 - ar cr libinstallsieve.a $(OBJS)
647 - $(RANLIB) libinstallsieve.a
648 +libinstallsieve.la: $(OBJS)
649 + $(LIBTOOL) --mode=link --tag=CC $(CC) -o libinstallsieve.la $(OBJS)
651 -installsieve: libinstallsieve.a installscript.o $(DEPLIBS)
652 - $(CC) $(LDFLAGS) -o installsieve libinstallsieve.a installscript.o $(DEPLIBS) $(IMAP_LIBS)
653 +installsieve: libinstallsieve.la installscript.lo $(DEPLIBS)
654 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o installsieve libinstallsieve.la installscript.lo $(DEPLIBS) $(IMAP_LIBS)
657 - rm -f *.o *.a Makefile.bak makedepend.log
658 + rm -rf .libs *.o *.lo *.a *.la Makefile.bak makedepend.log
661 rm -f Makefile installsieve
664 ${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) *.c $(srcdir)/*.c 1>makedepend.log 2>&1
667 - $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I. $(CFLAGS) \
669 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I. $(CFLAGS) \
673 # DO NOT DELETE THIS LINE -- make depend depends on it.
674 --- cyrus-imapd-2.3.12p2/lib/Makefile.in 2008-09-23 21:52:42.531135729 +0300
675 +++ cyrus-imapd-2.3.12p2/lib/Makefile.in 2008-09-24 00:04:08.275006403 +0300
679 # Authorization namespace.
680 -AUTH=auth.o auth_krb.o auth_unix.o auth_krb5.o auth_pts.o
681 +AUTH=auth.lo auth_krb.lo auth_unix.lo auth_krb5.lo auth_pts.lo
683 # ACL interpretation. Only one choice for now:
688 top_srcdir = @top_srcdir@
694 +top_builddir = @top_builddir@
696 DEFS = @DEFS@ @LOCALDEFS@
697 CPPFLAGS = -I.. @CPPFLAGS@ @COM_ERR_CPPFLAGS@ @SASLFLAGS@
700 exec_prefix = @exec_prefix@
701 cyrus_prefix = @cyrus_prefix@
707 $(srcdir)/libcyr_cfg.h $(srcdir)/byteorder64.h \
708 $(srcdir)/md5.h $(srcdir)/hmac-md5.h
710 -LIBCYR_OBJS = acl.o bsearch.o charset.o glob.o retry.o util.o \
711 - libcyr_cfg.o mkgmtime.o prot.o parseaddr.o imclient.o imparse.o \
712 - lsort.o stristr.o rfc822date.o cyrusdb.o strhash.o \
713 - chartable.o imapurl.o nonblock_@WITH_NONBLOCK@.o lock_@WITH_LOCK@.o \
714 - gmtoff_@WITH_GMTOFF@.o map_@WITH_MAP@.o $(ACL) $(AUTH) \
715 +LIBCYR_OBJS = acl.lo bsearch.lo charset.lo glob.lo retry.lo util.lo \
716 + libcyr_cfg.lo mkgmtime.lo prot.lo parseaddr.lo imclient.lo imparse.lo \
717 + lsort.lo stristr.lo rfc822date.lo cyrusdb.lo strhash.lo \
718 + chartable.lo imapurl.lo nonblock_@WITH_NONBLOCK@.lo lock_@WITH_LOCK@.lo \
719 + gmtoff_@WITH_GMTOFF@.lo map_@WITH_MAP@.lo $(ACL) $(AUTH) \
720 @LIBOBJS@ @CYRUSDB_OBJS@ @MD5OBJ@ \
721 - iptostring.o xmalloc.o wildmat.o byteorder64.o \
722 - xstrlcat.o xstrlcpy.o
723 + iptostring.lo xmalloc.lo wildmat.lo byteorder64.lo \
724 + xstrlcat.lo xstrlcpy.lo
726 LIBCYRM_HDRS = $(srcdir)/hash.h $(srcdir)/mpool.h $(srcdir)/xmalloc.h \
727 $(srcdir)/xstrlcat.h $(srcdir)/xstrlcpy.h $(srcdir)/util.h \
728 $(srcdir)/strhash.h $(srcdir)/libconfig.h $(srcdir)/assert.h \
730 -LIBCYRM_OBJS = libconfig.o imapopts.o hash.o mpool.o xmalloc.o strhash.o \
731 - xstrlcat.o xstrlcpy.o assert.o util.o @IPV6_OBJS@
732 +LIBCYRM_OBJS = libconfig.lo imapopts.lo hash.lo mpool.lo xmalloc.lo strhash.lo \
733 + xstrlcat.lo xstrlcpy.lo assert.lo util.lo @IPV6_OBJS@
735 -all: $(BUILTSOURCES) libcyrus_min.a libcyrus.a
736 +all: $(BUILTSOURCES) libcyrus_min.la libcyrus.la
739 $(srcdir)/../install-sh -d $(DESTDIR)$(libdir)
740 - $(INSTALL) -m 644 libcyrus.a $(DESTDIR)$(libdir)
741 - $(INSTALL) -m 644 libcyrus_min.a $(DESTDIR)$(libdir)
742 - $(RANLIB) $(DESTDIR)$(libdir)/libcyrus.a
743 + $(LIBTOOL) --mode=install $(INSTALL) -m 644 libcyrus_min.la $(DESTDIR)$(libdir)
744 + $(LIBTOOL) --mode=install $(INSTALL) -m 644 libcyrus.la $(DESTDIR)$(libdir)
745 for file in $(LIBCYR_HDRS); \
747 $(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/include/cyrus || exit 1; \
748 @@ -122,19 +124,15 @@
749 $(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/include/cyrus || exit 1; \
753 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
755 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
758 -libcyrus.a: $(LIBCYR_OBJS)
760 - ar cr libcyrus.a $(LIBCYR_OBJS)
761 - $(RANLIB) libcyrus.a
763 -libcyrus_min.a: $(LIBCYRM_OBJS)
764 - rm -f libcyrus_min.a
765 - ar cr libcyrus_min.a $(LIBCYRM_OBJS)
766 - $(RANLIB) libcyrus_min.a
767 +libcyrus.la: $(LIBCYR_OBJS) libcyrus_min.la
768 + $(LIBTOOL) --mode=link --tag=CC $(CC) -o libcyrus.la $(LIBCYR_OBJS) libcyrus_min.la @LIBS@ @LIB_SASL@ -rpath $(libdir)
770 +libcyrus_min.la: $(LIBCYRM_OBJS)
771 + $(LIBTOOL) --mode=link --tag=CC $(CC) -o libcyrus_min.la $(LIBCYRM_OBJS) @IMAP_COM_ERR_LIBS@ -rpath $(libdir)
773 imapopts.c: imapoptions $(srcdir)/../tools/config2header
774 $(srcdir)/../tools/config2header CC="$(CC)" $(srcdir)/imapopts.c $(srcdir)/imapopts.h < $(srcdir)/imapoptions
775 @@ -154,11 +152,11 @@
776 # ./mkchartable -m $(srcdir)/charset/unicode.map $(srcdir)/charset/*.t >x-chartables.h
777 # mv x-chartables.h chartables.h
779 -mkchartable: mkchartable.o xstrlcpy.o xstrlcat.o xmalloc.o assert.o
780 - $(CC) $(LDFLAGS) -o mkchartable mkchartable.o xstrlcpy.o xstrlcat.o xmalloc.o assert.o
781 +mkchartable: mkchartable.lo xstrlcpy.lo xstrlcat.lo xmalloc.lo assert.lo
782 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o mkchartable mkchartable.lo xstrlcpy.lo xstrlcat.lo xmalloc.lo assert.lo
785 - rm -f *.o *.a chartable.c Makefile.bak mkchartable makedepend.log \
786 + rm -rf .libs *.o *.lo *.a *.la chartable.c Makefile.bak mkchartable makedepend.log \
790 --- cyrus-imapd-2.3.12p2.shared/master/Makefile.in 2008-09-23 21:44:50.599845178 +0300
791 +++ cyrus-imapd-2.3.12p2/master/Makefile.in 2008-09-23 22:12:15.234944271 +0300
797 +top_builddir = @top_builddir@
799 CYRUS_USER=@cyrus_user@
800 CYRUS_GROUP=@cyrus_group@
804 LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
805 -LIBS = ../lib/libcyrus_min.a @LIB_UCDSNMP@ @LIBS@ @COM_ERR_LIBS@
806 +LIBS = ../lib/libcyrus_min.la @LIB_UCDSNMP@ @LIBS@ @COM_ERR_LIBS@
809 MAKEDEPEND = @MAKEDEPEND@
811 cyrus_prefix = @cyrus_prefix@
812 service_path = @service_path@
814 -LOBJS=service.o service-thread.o
815 +LOBJS=service.lo service-thread.lo
820 $(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
821 for file in $(PROGS); \
823 - $(INSTALL) -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
824 + $(LIBTOOL) --mode=install $(INSTALL) $$file $(DESTDIR)$(service_path) || exit 1; \
828 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
830 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
833 -master: master.o masterconf.o cyrusMasterMIB.o ../lib/lock_@WITH_LOCK@.o
834 - $(CC) $(LDFLAGS) -o master master.o masterconf.o cyrusMasterMIB.o ../lib/lock_@WITH_LOCK@.o $(LIBS) $(DEPLIBS)
835 +master: master.lo masterconf.lo cyrusMasterMIB.lo ../lib/lock_@WITH_LOCK@.lo
836 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o master master.lo masterconf.lo cyrusMasterMIB.lo ../lib/lock_@WITH_LOCK@.lo $(LIBS) $(DEPLIBS)
839 - rm -f *.o *.a Makefile.bak $(PROGS)
840 + rm -rf .libs *.lo *.a *.la Makefile.bak $(PROGS)
844 --- cyrus-imapd-2.3.12p2.shared/netnews/Makefile.in 2008-09-23 21:44:50.587844484 +0300
845 +++ cyrus-imapd-2.3.12p2/netnews/Makefile.in 2008-09-23 22:09:19.744800216 +0300
851 +top_builddir = @top_builddir@
854 CPPFLAGS = -I.. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../com_err/et @CPPFLAGS@
855 LIBS = @IMAP_LIBS@ @LIB_RT@
856 -DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
857 +DEPLIBS = ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
862 cyrus_prefix = @cyrus_prefix@
863 service_path = @service_path@
865 -OBJS = remotepurge.o readconfig.o
866 +OBJS = remotepurge.lo readconfig.lo
871 - $(INSTALL) -s -m 755 remotepurge $(DESTDIR)$(service_path)
872 + $(LIBTOOL) --mode=install $(INSTALL) remotepurge $(DESTDIR)$(service_path)
875 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
877 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
879 remotepurge: $(OBJS) $(DEPLIBS)
880 - $(CC) $(LDFLAGS) -o remotepurge $(OBJS) \
881 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o remotepurge $(OBJS) \
886 - rm -f *.o Makefile.bak remotepurge makedepend.log
887 + rm -rf .libs *.o *.lo Makefile.bak remotepurge makedepend.log
891 --- cyrus-imapd-2.3.12p2/notifyd/Makefile.in 2008-09-23 22:54:37.285871790 +0300
892 +++ cyrus-imapd-2.3.12p2/notifyd/Makefile.in 2008-09-24 16:33:47.953341763 +0300
898 +top_builddir = @top_builddir@
901 CYRUS_USER=@cyrus_user@
904 NOTIFYD_LIBS = @NOTIFYD_LIBS@
906 -SERVICE=../master/service.o
907 +SERVICE=../master/service.lo
909 IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
910 IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
911 LIB_WRAP = @LIB_WRAP@
912 LIBS = @ZEPHYR_LIBS@ @LIBS@ $(IMAP_COM_ERR_LIBS)
913 -DEPLIBS=../imap/mutex_fake.o ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
914 +DEPLIBS=../imap/mutex_fake.lo ../imap/libimap.la ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
916 PURIFY=/usr/local/bin/purify
922 - $(INSTALL) -m 755 notifyd $(DESTDIR)$(service_path)
923 + $(LIBTOOL) --mode=install $(INSTALL) -m 755 notifyd $(DESTDIR)$(service_path)
925 -OBJS= notifyd.o notify_null.o notify_log.o notify_mailto.o notify_zephyr.o
926 +OBJS= notifyd.lo notify_null.lo notify_log.lo notify_mailto.lo notify_zephyr.lo
928 -notifytest: notifytest.o
929 - $(CC) $(LDFLAGS) -o notifytest \
930 - notifytest.o $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
931 +notifytest: notifytest.lo
932 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o notifytest \
933 + notifytest.lo $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
935 notifyd: $(OBJS) $(SERVICE)
936 - $(CC) $(LDFLAGS) -o notifyd \
937 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o notifyd \
938 $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
940 notifyd.pure: $(OBJS) $(SERVICE)
941 $(PURIFY) $(PUREOPT) \
942 - $(CC) $(LDFLAGS) -o notifyd.pure \
943 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o notifyd.pure \
944 $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
947 - rm -f notifyd notifytest *.o *.a *~ Makefile.bak makedepend.log
948 + rm -rf notifyd notifytest .libs *.o *.lo *.a *.la *~ Makefile.bak makedepend.log
954 ${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) *.c $(srcdir)/*.c 1>makedepend.log 2>&1
957 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
959 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
962 # DO NOT DELETE THIS LINE -- make depend depends on it.
963 --- cyrus-imapd-2.3.12p2/perl/imap/IMAP.xs 2008-04-04 15:47:09.000000000 +0300
964 +++ cyrus-imapd-2.3.12p2.shared/perl/imap/IMAP.xs 2008-09-23 21:44:50.595844947 +0300
969 +const int config_need_data = 0;
972 * Decrement the refcounts of the Perl SV's in the passed rock, then free the
973 --- cyrus-imapd-2.3.12p2/perl/imap/Makefile.PL 2007-10-17 23:06:33.000000000 +0300
974 +++ cyrus-imapd-2.3.12p2.shared/perl/imap/Makefile.PL 2008-09-23 21:44:50.595844947 +0300
976 'macro' => {'IMCLIENT_LIBS' => ''}, # hack
977 'clean' => {'FILES' => 'libcyrperl.a cyradm'},
978 'OBJECT' => 'IMAP.o',
979 - 'MYEXTLIB' => '../../lib/libcyrus.a ../../lib/libcyrus_min.a',
980 - 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT -lssl -lcrypto"],
981 + 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT -lssl -lcrypto -L../../lib/.libs -lcyrus -lcyrus_min"],
982 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING'
983 'INC' => "-I../../lib -I../.. -I../../com_err/et $SASL_INC $OPENSSL_INC",
984 'EXE_FILES' => [cyradm],
985 --- cyrus-imapd-2.3.12p2.shared/perl/sieve/lib/Makefile.in 2008-09-23 21:44:50.595844947 +0300
986 +++ cyrus-imapd-2.3.12p2/perl/sieve/lib/Makefile.in 2008-09-23 22:08:41.078564354 +0300
992 +top_builddir = @top_builddir@
994 DEFS = @DEFS@ @LOCALDEFS@ -Dbool=char -DHAS_BOOL
995 CPPFLAGS = -I. -I../../.. -I$(srcdir) -I$(srcdir)/../../../lib @CPPFLAGS@ @DYNSASLFLAGS@ @COM_ERR_CPPFLAGS@
996 -LIBS = ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a @LIB_DYN_SASL@ @LIBS@
997 +LIBS = ../../../lib/libcyrus.la ../../../lib/libcyrus_min.la @LIB_DYN_SASL@ @LIBS@
998 IMAP_LIBS = @IMAP_LIBS@
999 -DEPLIBS = ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a @DEPLIBS@
1000 +DEPLIBS = ../../../lib/libcyrus.la ../../../lib/libcyrus_min.la @DEPLIBS@
1002 MAKEDEPEND_CFLAGS = @CFLAGS@
1003 CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
1005 exec_prefix = @exec_prefix@
1006 cyrus_prefix = @cyrus_prefix@
1008 -OBJS=isieve.o lex.o mystring.o request.o
1009 +OBJS=isieve.lo lex.lo mystring.lo request.lo
1017 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
1019 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
1021 -libisieve.a: $(OBJS)
1023 - ar cr libisieve.a $(OBJS)
1024 - $(RANLIB) libisieve.a
1025 +libisieve.la: $(OBJS)
1026 + $(LIBTOOL) --mode=link --tag=CC $(CC) -o libisievie.la $(OBJS)
1029 - rm -f *.o Makefile.bak makedepend.log libisieve.a
1030 + rm -rf .libs *.o *.lo Makefile.bak makedepend.log libisieve.la
1034 --- cyrus-imapd-2.3.12p2/perl/sieve/managesieve/Makefile.PL 2008-04-04 15:47:23.000000000 +0300
1035 +++ cyrus-imapd-2.3.12p2.shared/perl/sieve/managesieve/Makefile.PL 2008-09-23 21:44:50.591844716 +0300
1037 'NAME' => 'Cyrus::SIEVE::managesieve',
1038 'ABSTRACT' => 'Cyurs Sieve management interface',
1039 'VERSION_FROM' => 'managesieve.pm', # finds $VERSION
1040 - 'MYEXTLIB' => '../lib/isieve.o ../lib/lex.o ../lib/mystring.o ../lib/request.o ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a',
1041 - 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT -lssl -lcrypto"],
1042 + 'MYEXTLIB' => '../lib/.libs/isieve.o ../lib/.libs/lex.o ../lib/.libs/mystring.o ../lib/.libs/request.o',
1043 + 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT -lssl -lcrypto -L../../../lib/.libs -lcyrus -lcyrus_min"],
1044 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING'
1045 'INC' => "-I../lib/ -I../../../lib/ $SASL_INC $OPENSSL_INC",
1047 --- cyrus-imapd-2.3.12p2/perl/sieve/managesieve/managesieve.xs 2008-04-04 15:47:24.000000000 +0300
1048 +++ cyrus-imapd-2.3.12p2.shared/perl/sieve/managesieve/managesieve.xs 2008-09-23 21:44:50.595844947 +0300
1050 croak("failure: %s", s);
1053 +const int config_need_data = 0;
1056 perlsieve_getpass(conn, context, id, psecret)
1057 --- cyrus-imapd-2.3.12p2/ptclient/Makefile.in 2008-03-24 20:34:22.000000000 +0200
1058 +++ cyrus-imapd-2.3.12p2.shared/ptclient/Makefile.in 2008-09-23 21:44:50.587844484 +0300
1063 +LIBTOOL = @LIBTOOL@
1064 +top_builddir = @top_builddir@
1067 CPPFLAGS = -I.. -I$(srcdir)/../imap -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
1069 LIBS = $(IMAP_LIBS) @COM_ERR_LIBS@
1070 LIB_SASL = @LIB_SASL@
1071 LIB_WRAP = @LIB_WRAP@
1072 -DEPLIBS = ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
1073 -UTIL_LIBS = ../imap/mutex_fake.o ../imap/cli_fatal.o
1074 +DEPLIBS = ../imap/libimap.la ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
1075 +UTIL_LIBS = ../imap/mutex_fake.lo ../imap/cli_fatal.lo
1077 LDAP_LIBS=@LDAP_LIBS@
1078 LDAP_CPPFLAGS=@LDAP_CPPFLAGS@
1083 -SERVICE=../master/service.o
1084 -SERVICETHREAD=../master/service-thread.o
1085 +SERVICE=../master/service.lo
1086 +SERVICETHREAD=../master/service-thread.lo
1091 - $(INSTALL) -m 755 ptloader $(DESTDIR)$(service_path)
1092 - $(INSTALL) -m 755 ptexpire $(DESTDIR)$(service_path)
1093 - $(INSTALL) -m 755 ptdump $(DESTDIR)$(service_path)
1094 + $(LIBTOOL) --mode=install $(INSTALL) ptloader $(DESTDIR)$(service_path)
1095 + $(LIBTOOL) --mode=install $(INSTALL) ptexpire $(DESTDIR)$(service_path)
1096 + $(LIBTOOL) --mode=install $(INSTALL) ptdump $(DESTDIR)$(service_path)
1099 - $(CC) -c $(CPPFLAGS) $(LDAP_CPPFLAGS) $(DEFS) $(CFLAGS) $<
1101 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(LDAP_CPPFLAGS) $(DEFS) $(CFLAGS) $<
1103 -ptloader: ptloader.o afskrb.o ldap.o ../imap/mutex_fake.o $(DEPLIBS)
1104 - $(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)
1105 +ptloader: ptloader.lo afskrb.lo ldap.lo ../imap/mutex_fake.lo $(DEPLIBS)
1106 + $(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)
1108 -ptloader.pure: ptloader.o afskrb.o ldap.o ../imap/mutex_fake.o $(DEPLIBS)
1109 - $(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)
1110 +ptloader.pure: ptloader.lo afskrb.lo ldap.lo ../imap/mutex_fake.lo $(DEPLIBS)
1111 + $(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)
1113 -ptexpire: ptexpire.o $(DEPLIBS) $(UTIL_LIBS)
1114 - $(CC) $(LDFLAGS) -o $@ ptexpire.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_RT)
1115 +ptexpire: ptexpire.lo $(DEPLIBS) $(UTIL_LIBS)
1116 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ptexpire.lo $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_RT)
1118 -ptexpire.pure: ptexpire.o $(DEPLIBS) $(UTIL_LIBS)
1119 - $(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ ptexpire.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
1120 +ptexpire.pure: ptexpire.lo $(DEPLIBS) $(UTIL_LIBS)
1121 + $(PURIFY) $(PUREARGS) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ptexpire.lo $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
1123 -ptdump: ptdump.o $(DEPLIBS) $(UTIL_LIBS)
1124 - $(CC) $(LDFLAGS) -o $@ ptdump.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_RT)
1125 +ptdump: ptdump.lo $(DEPLIBS) $(UTIL_LIBS)
1126 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ptdump.lo $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_RT)
1128 -ptdump.pure: ptexpire.o $(DEPLIBS) $(UTIL_LIBS)
1129 - $(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ ptdump.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
1130 +ptdump.pure: ptexpire.lo $(DEPLIBS) $(UTIL_LIBS)
1131 + $(PURIFY) $(PUREARGS) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ptdump.lo $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
1133 -ptextract: ptextract.o $(DEPLIBS) $(UTIL_LIBS)
1134 - $(CC) $(LDFLAGS) -o $@ ptextract.o $(UTIL_LIBS) $(DEPLIBS) $(LIBS)
1135 +ptextract: ptextract.lo $(DEPLIBS) $(UTIL_LIBS)
1136 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ptextract.lo $(UTIL_LIBS) $(DEPLIBS) $(LIBS)
1139 - rm -f *.o Makefile.bak $(PROGS) makedepend.log
1140 + rm -rf .libs *.o *.lo Makefile.bak $(PROGS) makedepend.log
1144 --- cyrus-imapd-2.3.12p2.shared/sieve/Makefile.in 2008-09-23 21:44:50.587844484 +0300
1145 +++ cyrus-imapd-2.3.12p2/sieve/Makefile.in 2008-09-23 21:57:13.302793477 +0300
1150 +LIBTOOL = @LIBTOOL@
1151 +top_builddir = @top_builddir@
1152 COMPILE_ET = @COMPILE_ET@
1154 DEFS = @DEFS@ @LOCALDEFS@
1156 IMAP_LIBS = @IMAP_LIBS@
1157 IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
1158 IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
1159 -LIBS = libsieve.a $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS)
1160 -DEPLIBS=../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
1161 +LIBS = libsieve.la $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS)
1162 +DEPLIBS=../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
1164 BUILT_SOURCES = addr.c addr.h addr-lex.c \
1165 sieve.c sieve.h sieve-lex.c \
1166 sieve_err.h sieve_err.c
1168 -all: libsieve.a sievec sieved
1169 +all: libsieve.la sievec sieved
1171 dist: $(BUILT_SOURCES)
1174 $(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
1175 - $(srcdir)/../install-sh -c -m 755 sievec $(DESTDIR)$(service_path) || exit
1176 + $(LIBTOOL) --mode=install $(srcdir)/../install-sh -c -m 755 sievec $(DESTDIR)$(service_path) || exit
1178 -test: $(DEPLIBS) libsieve.a test.o ../imap/message.o
1179 - $(CC) $(LDFLAGS) -o test test.o ../imap/message.o \
1180 - libsieve.a $(DEPLIBS) $(LIBS)
1182 -OBJS = sieve_err.o \
1183 - sieve.o sieve-lex.o comparator.o interp.o message.o \
1184 - bc_generate.o bc_dump.o bc_emit.o bc_eval.o \
1185 - script.o tree.o addr.o addr-lex.o
1186 +test: $(DEPLIBS) libsieve.la test.lo ../imap/message.lo
1187 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o test test.lo ../imap/message.lo \
1188 + libsieve.la $(DEPLIBS) $(LIBS)
1190 +OBJS = sieve_err.lo \
1191 + sieve.lo sieve-lex.lo comparator.lo interp.lo message.lo \
1192 + bc_generate.lo bc_dump.lo bc_emit.lo bc_eval.lo \
1193 + script.lo tree.lo addr.lo addr-lex.lo
1195 sieve-lex.c: sieve-lex.l sieve.h
1197 @@ -112,21 +114,19 @@
1199 # This is needed because 'makedepend' leaves it out
1200 #(this is not in newer version, is it still needed?)
1205 -#libsieve.a: sieve.c sieve.h sieve_err.h sieve_err.c $(OBJS)
1206 +#libsieve.la: sieve.c sieve.h sieve_err.h sieve_err.c $(OBJS)
1208 -libsieve.a: $(OBJS)
1210 - ar cr libsieve.a $(OBJS)
1211 - $(RANLIB) libsieve.a
1212 +libsieve.la: $(OBJS)
1213 + $(LIBTOOL) --mode=link --tag=CC $(CC) -o libsieve.la $(OBJS)
1215 -sievec: sievec.o libsieve.a
1216 - $(CC) $(LDFLAGS) -o sievec sievec.o libsieve.a $(DEPLIBS) $(LIBS)
1217 +sievec: sievec.lo libsieve.la
1218 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o sievec sievec.lo libsieve.la $(DEPLIBS) $(LIBS)
1220 -sieved: sieved.o libsieve.a
1221 - $(CC) $(LDFLAGS) -o sieved sieved.o libsieve.a $(DEPLIBS) $(LIBS)
1222 +sieved: sieved.lo libsieve.la
1223 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o sieved sieved.lo libsieve.la $(DEPLIBS) $(LIBS)
1226 sieve_interface.h: sieve_err.h
1228 $(COMPILE_ET) $(srcdir)/sieve_err.et
1231 - rm -f sievec sieved test *~ *.o *.a Makefile.bak makedepend.log
1232 + rm -rf sievec sieved test *~ .libs *.o *.lo *.a *.la Makefile.bak makedepend.log
1235 rm -f sieve_err.c sieve_err.h
1238 ${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(MAKEDEPEND_CFLAGS) *.c *.y $(srcdir)/*.y $(srcdir)/*.c 1>makedepend.log 2>&1
1241 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
1243 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
1246 # DO NOT DELETE THIS LINE -- make depend depends on it.
1247 --- cyrus-imapd-2.3.12p2/timsieved/Makefile.in 2008-09-23 22:53:34.478241318 +0300
1248 +++ cyrus-imapd-2.3.12p2/timsieved/Makefile.in 2008-09-24 16:34:58.453418565 +0300
1253 +LIBTOOL = @LIBTOOL@
1254 +top_builddir = @top_builddir@
1257 CYRUS_USER=@cyrus_user@
1260 TIMSIEVED_LIBS = @TIMSIEVED_LIBS@
1262 -SERVICE=../master/service.o
1263 +SERVICE=../master/service.lo
1265 IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
1266 IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
1267 LIB_WRAP = @LIB_WRAP@
1268 LIBS = $(IMAP_COM_ERR_LIBS)
1269 -DEPLIBS=../sieve/libsieve.a ../imap/mutex_fake.o ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
1270 +DEPLIBS=../sieve/libsieve.la ../imap/mutex_fake.lo ../imap/libimap.la ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
1272 PURIFY=/usr/local/bin/purify
1273 PUREOPT=-best-effort
1278 - $(INSTALL) -m 755 timsieved $(DESTDIR)$(service_path)
1279 + $(LIBTOOL) --mode=install $(INSTALL) -m 755 timsieved $(DESTDIR)$(service_path)
1281 -OBJS= actions.o lex.o mystring.o scripttest.o timsieved.o parser.o \
1283 +OBJS= actions.lo lex.lo mystring.lo scripttest.lo timsieved.lo parser.lo \
1286 timsieved: $(OBJS) $(SERVICE)
1287 - $(CC) $(LDFLAGS) -o timsieved \
1288 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o timsieved \
1289 $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
1291 timsieved.pure: $(OBJS) $(SERVICE)
1292 $(PURIFY) $(PUREOPT) \
1293 - $(CC) $(LDFLAGS) -o timsieved.pure \
1294 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o timsieved.pure \
1295 $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
1298 - rm -f timsieved *~ *.o *.a Makefile.bak makedepend.log
1299 + rm -rf timsieved *~ .libs *.o *.lo *.a *.la Makefile.bak makedepend.log
1305 ${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) *.c $(srcdir)/*.c 1>makedepend.log 2>&1
1308 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
1310 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
1313 # DO NOT DELETE THIS LINE -- make depend depends on it.
1314 --- cyrus-imapd-2.3.12p2/makedepend/Makefile.in 2008-09-23 21:53:54.051271496 +0300
1315 +++ cyrus-imapd-2.3.12p2/makedepend/Makefile.in 2008-09-23 21:54:30.469377429 +0300
1320 +top_builddir = @top_builddir@
1326 +LIBTOOL = @LIBTOOL@
1329 CPPFLAGS = -I. -I$(srcdir) @CPPFLAGS@
1335 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
1337 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
1339 -makedepend: cppsetup.o ifparser.o include.o main.o parse.o pr.o
1340 - $(CC) $(LDFLAGS) -o makedepend cppsetup.o ifparser.o include.o \
1341 - main.o parse.o pr.o $(DEPLIBS) $(LIBS)
1342 +makedepend: cppsetup.lo ifparser.lo include.lo main.lo parse.lo pr.lo
1343 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o makedepend cppsetup.lo ifparser.lo include.lo \
1344 + main.lo parse.lo pr.lo $(DEPLIBS) $(LIBS)
1347 - rm -f *.o Makefile.bak makedepend
1348 + rm -rf .libs *.o *.lo Makefile.bak makedepend
1352 --- cyrus-imapd-2.3.12p2/com_err/et/Makefile.in~ 2008-03-24 20:53:40.000000000 +0200
1353 +++ cyrus-imapd-2.3.12p2/com_err/et/Makefile.in 2008-09-23 22:08:08.228664820 +0300
1358 +top_builddir = @top_builddir@
1364 +LIBTOOL = @LIBTOOL@
1372 -LIBOBJS= error_message.o et_name.o init_et.o com_err.o
1373 +LIBOBJS= error_message.lo et_name.lo init_et.lo com_err.lo
1374 # for et_lex.lex.c include in error_table.y
1375 LOCALINCLUDE=-I. -I.. -I$(srcdir)
1377 -all: compile_et libcom_err.a
1378 +all: compile_et libcom_err.la
1383 - $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I$(srcdir)/../../lib -I. -I../.. $(CFLAGS) $<
1385 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I$(srcdir)/../../lib -I. -I../.. $(CFLAGS) $<
1387 # solaris make loses on com_err.c but not on init_et.c, but this helps
1388 -com_err.o: com_err.c
1389 +com_err.lo: com_err.c
1394 $(CP) $(srcdir)/et_h.awk et_h.awk
1397 - rm -f compile_et compile_et.o error_table.o
1398 - rm -f libcom_err.a
1399 + rm -f compile_et compile_et.o compile_et.lo error_table.o error_table.lo
1400 + rm -rf .libs libcom_err.a libcom_err.la
1404 - rm -f compile_et compile_et.o error_table.o
1405 - rm -f libcom_err.a
1406 + rm -f compile_et compile_et.o compile_et.lo error_table.o error_table.lo
1407 + rm -rf .libs libcom_err.a libcom_err.la
1411 @@ -119,21 +121,15 @@
1413 ## install_library_target(com_err,$(LIBOBJS),$(LINTFILES),)
1415 -libcom_err.a: $(LIBOBJS)
1416 - rm -f libcom_err.a
1417 - $(ARCHIVE) $@ $(LIBOBJS)
1419 +libcom_err.la: $(LIBOBJS)
1420 + $(LIBTOOL) --mode=link --tag=CC $(CC) -o libcom_err.la $(LIBOBJS)
1423 -# $(INSTALLLIB) libcom_err.a $(DESTDIR)$(LIBDIR)/libcom_err.a
1424 -# $(CHMOD) 644 $(DESTDIR)$(LIBDIR)/libcom_err.a
1425 -# $(RANLIB) $(DESTDIR)$(LIBDIR)/libcom_err.a
1426 -# $(CHMOD) 444 $(DESTDIR)$(LIBDIR)/libcom_err.a
1427 +# $(LIBTOOL) --mode=install $(INSTALL) -m 644 libcom_err.la $(DESTDIR)$(LIBDIR)
1430 -libcom_err.o: $(LIBOBJS)
1431 - ld -r -s -o libcom_err.o $(LIBOBJS)
1432 - chmod -x libcom_err.o
1433 +libcom_err.lo: $(LIBOBJS)
1434 + $(LIBTOOL) --mode=link --tag=CC ld -r -o libcom_err.lo $(LIBOBJS)
1436 TAGS: et_name.c error_message.c compile_et.c error_table.c \
1438 --- cyrus-imapd-2.3.12p2/syslog/Makefile.in~ 2008-03-24 22:15:59.000000000 +0200
1439 +++ cyrus-imapd-2.3.12p2/syslog/Makefile.in 2008-09-23 22:13:49.520393331 +0300
1444 +top_builddir = @top_builddir@
1451 +LIBTOOL = @LIBTOOL@
1454 CPPFLAGS = @CPPFLAGS@
1457 MAKEDEPEND = @MAKEDEPEND@
1459 -all: libsyslog.a syslogd
1460 +all: libsyslog.la syslogd
1463 @echo "Install syslogd and syslog.conf as appropriate"
1466 - $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) $<
1468 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) $<
1470 -libsyslog.a: syslog.o
1471 - ar cr libsyslog.a syslog.o
1472 - $(RANLIB) libsyslog.a
1473 +libsyslog.la: syslog.lo
1474 + $(LIBTOOL) --mode=link --tag=CC $(CC) -o libsyslog.la syslog.lo
1477 - $(CC) $(LDFLAGS) -o syslogd syslogd.o $(LIBS)
1478 +syslogd: syslogd.lo
1479 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o syslogd syslogd.lo $(LIBS)
1482 - rm -f *.o *.a Makefile.bak
1483 + rm -rf .libs *.o *.lo *.a *.la Makefile.bak
1487 --- cyrus-imapd-2.3.12p2/makedepend/configure.in 2008-09-23 22:16:22.353226136 +0300
1488 +++ cyrus-imapd-2.3.12p2/makedepend/configure.in 2008-09-23 22:20:08.678306577 +0300
1496 AC_CHECK_HEADERS(stdarg.h)