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@
8 +top_builddir = @top_builddir@
10 CYRUS_USER=@cyrus_user@
11 CYRUS_GROUP=@cyrus_group@
12 @@ -58,7 +60,7 @@ DEPLIBS = @DEPLIBS@
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@
20 MAKEDEPEND = @MAKEDEPEND@
21 @@ -68,7 +70,7 @@ exec_prefix = @exec_prefix@
22 cyrus_prefix = @cyrus_prefix@
23 service_path = @service_path@
25 -LOBJS=service.o service-thread.o
26 +LOBJS=service.lo service-thread.lo
30 @@ -78,18 +80,18 @@ install:
31 $(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
32 for file in $(PROGS); \
34 - $(INSTALL) -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
35 + $(LIBTOOL) --mode=install $(INSTALL) $$file $(DESTDIR)$(service_path) || exit 1; \
39 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
41 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
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)
50 - rm -f *.o *.a Makefile.bak $(PROGS)
51 + rm -rf .libs *.lo *.a *.la Makefile.bak $(PROGS)
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@
62 +top_builddir = @top_builddir@
65 CYRUS_USER=@cyrus_user@
66 @@ -68,13 +70,13 @@ MAKEDEPEND = @MAKEDEPEND@
68 NOTIFYD_LIBS = @NOTIFYD_LIBS@
70 -SERVICE=../master/service.o
71 +SERVICE=../master/service.lo
73 IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
74 IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
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@
80 PURIFY=/usr/local/bin/purify
82 @@ -82,25 +84,25 @@ PUREOPT=-best-effort
86 - $(INSTALL) -m 755 notifyd $(DESTDIR)$(service_path)
87 + $(LIBTOOL) --mode=install $(INSTALL) -m 755 notifyd $(DESTDIR)$(service_path)
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
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)
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)
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)
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
116 @@ -108,8 +110,8 @@ distclean: clean
118 ${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) *.c $(srcdir)/*.c 1>makedepend.log 2>&1
121 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
123 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
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@
134 +top_builddir = @top_builddir@
137 CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @SASLFLAGS@
138 @@ -59,7 +61,7 @@ MAKEDEPEND = @MAKEDEPEND@
140 IMAP_LIBS = @IMAP_LIBS@
142 -DEPLIBS= ../lib/libcyrus.a @DEPLIBS@
143 +DEPLIBS= ../lib/libcyrus.la @DEPLIBS@
146 exec_prefix = @exec_prefix@
147 @@ -68,20 +70,18 @@ cyrus_prefix = @cyrus_prefix@
151 - $(INSTALL) -s -m 755 installsieve $(DESTDIR)$(exec_prefix)/bin
152 + $(LIBTOOL) --mode=install $(INSTALL) installsieve $(DESTDIR)$(exec_prefix)/bin
154 -OBJS=lex.o mystring.o request.o isieve.o
155 +OBJS=lex.lo mystring.lo request.lo isieve.lo
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)
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)
170 - rm -f *.o *.a Makefile.bak makedepend.log
171 + rm -rf .libs *.o *.lo *.a *.la Makefile.bak makedepend.log
174 rm -f Makefile installsieve
175 @@ -89,9 +89,8 @@ distclean: clean
177 ${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) *.c $(srcdir)/*.c 1>makedepend.log 2>&1
180 - $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I. $(CFLAGS) \
182 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I. $(CFLAGS) \
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
193 +top_builddir = @top_builddir@
203 CPPFLAGS = @CPPFLAGS@
204 @@ -61,23 +63,22 @@ LDFLAGS = @LDFLAGS@
206 MAKEDEPEND = @MAKEDEPEND@
208 -all: libsyslog.a syslogd
209 +all: libsyslog.la syslogd
212 @echo "Install syslogd and syslog.conf as appropriate"
215 - $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) $<
217 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) $<
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
226 - $(CC) $(LDFLAGS) -o syslogd syslogd.o $(LIBS)
228 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o syslogd syslogd.lo $(LIBS)
231 - rm -f *.o *.a Makefile.bak
232 + rm -rf .libs *.o *.lo *.a *.la Makefile.bak
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
240 # \Seen state database. Either 'db' (berkeley db) or
241 # 'local' (legacy flat file).
246 top_srcdir = @top_srcdir@
247 +top_builddir = @top_builddir@
256 CYRUS_USER=@cyrus_user@
257 CYRUS_GROUP=@cyrus_group@
258 @@ -67,7 +69,7 @@ SIEVE_LIBS = @SIEVE_LIBS@
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@
266 LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
267 @@ -96,23 +98,23 @@ exec_prefix = @exec_prefix@
268 cyrus_prefix = @cyrus_prefix@
269 service_path = @service_path@
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 \
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 \
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
289 -LMTPOBJS=lmtpstats.o lmtpengine.o spool.o
290 +LMTPOBJS=lmtpstats.lo lmtpengine.lo spool.lo
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
296 -SERVICE=../master/service.o
297 -SERVICETHREAD=../master/service-thread.o
298 +SERVICE=../master/service.lo
299 +SERVICETHREAD=../master/service-thread.lo
301 PROGS = imapd lmtpd pop3d \
302 fud smmapd reconstruct quota mbpath ipurge cyr_dbtool cyr_synclog \
303 @@ -131,31 +133,28 @@ pure: imapd.pure lmtpd.pure mupdate.pure
306 $(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
307 - for file in $(PROGS); \
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; \
313 ln -f $(DESTDIR)$(service_path)/pop3d $(DESTDIR)$(service_path)/pop3proxyd
314 ln -f $(DESTDIR)$(service_path)/imapd $(DESTDIR)$(service_path)/proxyd
315 ln -f $(DESTDIR)$(service_path)/lmtpd $(DESTDIR)$(service_path)/lmtpproxyd
318 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
320 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
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)
332 ### Built Source Files
335 AWK=$(AWK) $(srcdir)/xversion.sh
337 -version.o: xversion.h
338 +version.lo: xversion.h
340 pushstats.c: pushstats.snmp $(srcdir)/../snmp/snmpgen
341 $(srcdir)/../snmp/snmpgen $(srcdir)/pushstats.snmp
342 @@ -183,182 +182,182 @@ mupdate_err.c: mupdate_err.et
343 mupdate_err.h: mupdate_err.c
346 -idled: idled.o mutex_fake.o libimap.a $(DEPLIBS)
347 - $(CC) $(LDFLAGS) -o idled \
348 - idled.o mutex_fake.o libimap.a $(DEPLIBS) $(LIBS)
350 -lmtpd: lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.o \
351 - libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
352 - $(CC) $(LDFLAGS) -o lmtpd \
353 - $(SERVICE) lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \
354 - mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
356 -lmtpd.pure: lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \
357 - mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
358 - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o lmtpd.pure \
359 - $(SERVICE) lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \
360 - mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
362 -imapd: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
363 - $(CC) $(LDFLAGS) -o imapd \
364 - $(SERVICE) $(IMAPDOBJS) mutex_fake.o \
365 - libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
367 -imapd.pure: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
368 - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o imapd.pure \
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)
374 +lmtpd: lmtpd.lo proxy.lo $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.lo \
375 + libimap.la $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
376 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o lmtpd \
377 + $(SERVICE) lmtpd.lo proxy.lo $(LMTPOBJS) $(SIEVE_OBJS) \
378 + mutex_fake.lo libimap.la $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
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)
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)
391 +imapd.pure: $(IMAPDOBJS) mutex_fake.lo libimap.la $(DEPLIBS) $(SERVICE)
392 + $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o imapd.pure \
393 + $(SERVICE) $(IMAPDOBJS) mutex_fake.lo libimap.la \
394 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
396 -imapd.quant: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
397 - $(QUANTIFY) $(QUANTOPT) $(CC) $(LDFLAGS) -o imapd.quant \
398 - $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \
399 +imapd.quant: $(IMAPDOBJS) mutex_fake.lo libimap.la $(DEPLIBS) $(SERVICE)
400 + $(QUANTIFY) $(QUANTOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o imapd.quant \
401 + $(SERVICE) $(IMAPDOBJS) mutex_fake.lo libimap.la \
402 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
404 -mupdate: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o tls.o \
405 - libimap.a $(DEPLIBS)
406 - $(CC) $(LDFLAGS) -o mupdate \
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)
411 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o mupdate \
412 + $(SERVICETHREAD) mupdate.lo mupdate-slave.lo mupdate-client.lo \
413 + mutex_pthread.lo tls.lo libimap.la \
414 $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
416 -mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o \
417 - libimap.a $(DEPLIBS)
418 - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o mupdate.pure \
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)
423 + $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o mupdate.pure \
424 + $(SERVICETHREAD) mupdate.lo mupdate-slave.lo mupdate-client.lo \
425 + mutex_pthread.lo libimap.la $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
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 \
429 $(DEPLIBS) $(SERVICE)
430 - $(CC) $(LDFLAGS) -o pop3d pop3d.o proxy.o backend.o tls.o $(SERVICE) \
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)
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)
437 - $(CC) $(LDFLAGS) -o nntpd nntpd.o proxy.o backend.o index.o spool.o \
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)
446 -fud: fud.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE)
447 - $(CC) $(LDFLAGS) -o fud $(SERVICE) fud.o mutex_fake.o libimap.a \
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 \
450 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
452 -smmapd: smmapd.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE)
453 - $(CC) $(LDFLAGS) -o smmapd $(SERVICE) smmapd.o mutex_fake.o libimap.a \
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 \
456 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
458 -sync_server: sync_server.o sync_support.o sync_commit.o \
459 - imapparse.o tls.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE)
460 - $(CC) $(LDFLAGS) -o \
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)
465 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
466 + sync_server sync_server.lo sync_support.lo sync_commit.lo \
467 + imapparse.lo tls.lo $(SERVICE) libimap.la mutex_fake.lo \
468 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
470 ### Command Line Utilities
471 -arbitron: arbitron.o $(CLIOBJS) libimap.a $(DEPLIBS)
472 - $(CC) $(LDFLAGS) -o arbitron arbitron.o $(CLIOBJS) \
473 - libimap.a $(DEPLIBS) $(LIBS)
475 -cyr_dbtool: cyr_dbtool.o mutex_fake.o libimap.a $(DEPLIBS)
476 - $(CC) $(LDFLAGS) -o cyr_dbtool cyr_dbtool.o $(CLIOBJS) \
477 - libimap.a $(DEPLIBS) $(LIBS)
479 -cyr_synclog: cyr_synclog.o mutex_fake.o libimap.a $(DEPLIBS)
480 - $(CC) $(LDFLAGS) -o cyr_synclog cyr_synclog.o $(CLIOBJS) \
481 - libimap.a $(DEPLIBS) $(LIBS)
483 -cvt_cyrusdb: cvt_cyrusdb.o mutex_fake.o libimap.a $(DEPLIBS)
484 - $(CC) $(LDFLAGS) -o cvt_cyrusdb cvt_cyrusdb.o $(CLIOBJS) \
485 - libimap.a $(DEPLIBS) $(LIBS)
487 -chk_cyrus: chk_cyrus.o mutex_fake.o libimap.a $(DEPLIBS)
488 - $(CC) $(LDFLAGS) -o chk_cyrus chk_cyrus.o $(CLIOBJS) \
489 - libimap.a $(DEPLIBS) $(LIBS)
491 -deliver: deliver.o $(LMTPOBJS) proxy.o mutex_fake.o libimap.a $(DEPLIBS)
492 - $(CC) $(LDFLAGS) -o deliver deliver.o $(LMTPOBJS) proxy.o \
493 - mutex_fake.o libimap.a $(DEPLIBS) $(LIBS)
495 -ctl_deliver: ctl_deliver.o $(CLIOBJS) libimap.a $(DEPLIBS)
496 - $(CC) $(LDFLAGS) -o \
497 - $@ ctl_deliver.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
499 -ctl_mboxlist: ctl_mboxlist.o mupdate-client.o $(CLIOBJS) libimap.a $(DEPLIBS)
500 - $(CC) $(LDFLAGS) -o $@ ctl_mboxlist.o mupdate-client.o $(CLIOBJS) \
501 - libimap.a $(DEPLIBS) $(LIBS)
503 -ctl_cyrusdb: ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS)
504 - $(CC) $(LDFLAGS) -o \
505 - $@ ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
507 -cyr_expire: cyr_expire.o $(CLIOBJS) libimap.a $(DEPLIBS)
508 - $(CC) $(LDFLAGS) -o $@ cyr_expire.o $(CLIOBJS) \
509 - libimap.a $(DEPLIBS) $(LIBS)
511 -fetchnews: fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS)
512 - $(CC) $(LDFLAGS) -o \
513 - $@ fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
515 -squatter: squatter.o index.o squat_build.o $(CLIOBJS) libimap.a $(DEPLIBS)
516 - $(CC) $(LDFLAGS) -o squatter squatter.o index.o squat_build.o \
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)
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)
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)
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)
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)
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)
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)
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)
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)
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)
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)
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)
566 -mbpath: mbpath.o $(CLIOBJS) libimap.a $(DEPLIBS)
567 - $(CC) $(LDFLAGS) -o mbpath mbpath.o $(CLIOBJS) libimap.a \
568 +mbpath: mbpath.lo $(CLIOBJS) libimap.la $(DEPLIBS)
569 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o mbpath mbpath.lo $(CLIOBJS) libimap.la \
572 -ipurge: ipurge.o $(CLIOBJS) libimap.a $(DEPLIBS)
573 - $(CC) $(LDFLAGS) -o ipurge ipurge.o $(CLIOBJS) \
574 - libimap.a $(DEPLIBS) $(LIBS)
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
580 -cyrdump: cyrdump.o index.o $(CLIOBJS) libimap.a $(DEPLIBS)
581 - $(CC) $(LDFLAGS) -o cyrdump cyrdump.o index.o $(CLIOBJS) \
582 - libimap.a $(DEPLIBS) $(LIBS)
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)
588 -mbexamine: mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS)
589 - $(CC) $(LDFLAGS) -o \
590 - mbexamine mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
592 -reconstruct: reconstruct.o $(CLIOBJS) libimap.a $(DEPLIBS)
593 - $(CC) $(LDFLAGS) -o \
594 - reconstruct reconstruct.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
596 -quota: quota.o $(CLIOBJS) libimap.a $(DEPLIBS)
597 - $(CC) $(LDFLAGS) -o quota quota.o $(CLIOBJS) \
598 - libimap.a $(DEPLIBS) $(LIBS)
600 -tls_prune: tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS)
601 - $(CC) $(LDFLAGS) -o \
602 - $@ tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
604 -unexpunge: unexpunge.o $(CLIOBJS) libimap.a $(DEPLIBS)
605 - $(CC) $(LDFLAGS) -o $@ unexpunge.o $(CLIOBJS) \
606 - libimap.a $(DEPLIBS) $(LIBS)
608 -make_md5: make_md5.o libimap.a mutex_fake.o $(DEPLIBS)
609 - $(CC) $(LDFLAGS) -o make_md5 make_md5.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS)
611 -make_sha1: make_sha1.o libimap.a mutex_fake.o $(DEPLIBS)
612 - $(CC) $(LDFLAGS) -o make_sha1 make_sha1.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS)
614 -sync_client: sync_client.o sync_support.o \
615 - backend.o tls.o imapparse.o libimap.a mutex_fake.o $(DEPLIBS)
616 - $(CC) $(LDFLAGS) -o \
617 - sync_client sync_client.o sync_support.o \
618 - backend.o tls.o imapparse.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS)
620 -sync_reset: sync_reset.o sync_support.o sync_commit.o \
621 - libimap.a mutex_fake.o $(DEPLIBS)
622 - $(CC) $(LDFLAGS) -o \
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)
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
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)
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)
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)
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)
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)
653 +tls_prune: tls_prune.lo tls.lo $(CLIOBJS) libimap.la $(DEPLIBS)
654 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
655 + $@ tls_prune.lo tls.lo $(CLIOBJS) libimap.la $(DEPLIBS) $(LIBS)
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)
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)
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)
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)
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)
679 ### Other Misc Targets
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
684 AC_DEFINE_UNQUOTED(SYSCONFDIR,"$sysconfdir",[Config File Location])
692 @@ -137,7 +137,7 @@ IPv6_CHECK_FUNC(getaddrinfo, [IPv6_CHECK
693 cyrus_cv_getaddrinfo=no)], cyrus_cv_getaddrinfo=no)
695 if test $cyrus_cv_getaddrinfo = no; then
696 - IPV6_OBJS="getaddrinfo.o"
697 + IPV6_OBJS="getaddrinfo.lo"
700 cyrus_cv_getnameinfo=yes
701 @@ -146,7 +146,7 @@ IPv6_CHECK_FUNC(getnameinfo,
702 cyrus_cv_getnameinfo=no)
704 if test $cyrus_cv_getnameinfo = no; then
705 - IPV6_OBJS="$IPV6_OBJS getnameinfo.o"
706 + IPV6_OBJS="$IPV6_OBJS getnameinfo.lo"
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
714 -CYRUSDB_OBJS="cyrusdb_flat.o cyrusdb_skiplist.o cyrusdb_quotalegacy.o"
715 +CYRUSDB_OBJS="cyrusdb_flat.lo cyrusdb_skiplist.lo cyrusdb_quotalegacy.lo"
717 dnl Berkeley DB Detection
719 @@ -217,7 +217,7 @@ if test "$use_berkeley" != "no"; then
720 LIBS="${LIBS} ${BDB_LIBADD}"
721 CPPFLAGS="${BDB_INCADD} ${CPPFLAGS}"
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?])
728 @@ -377,9 +377,9 @@ AC_ARG_ENABLE(sieve,
731 if test "$sievedir" != "no"; then
732 - SIEVE_OBJS="lmtp_sieve.o smtpclient.o"
733 + SIEVE_OBJS="lmtp_sieve.lo smtpclient.lo"
735 - SIEVE_LIBS="../${sievedir}/libsieve.a"
736 + SIEVE_LIBS="../${sievedir}/libsieve.la"
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"
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",
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@
765 +top_builddir = @top_builddir@
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@
775 @@ -66,23 +68,23 @@ exec_prefix = @exec_prefix@
776 cyrus_prefix = @cyrus_prefix@
777 service_path = @service_path@
779 -OBJS = remotepurge.o readconfig.o
780 +OBJS = remotepurge.lo readconfig.lo
785 - $(INSTALL) -s -m 755 remotepurge $(DESTDIR)$(service_path)
786 + $(LIBTOOL) --mode=install $(INSTALL) remotepurge $(DESTDIR)$(service_path)
789 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
791 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
793 remotepurge: $(OBJS) $(DEPLIBS)
794 - $(CC) $(LDFLAGS) -o remotepurge $(OBJS) \
795 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o remotepurge $(OBJS) \
800 - rm -f *.o Makefile.bak remotepurge makedepend.log
801 + rm -rf .libs *.o *.lo Makefile.bak remotepurge makedepend.log
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@
812 +top_builddir = @top_builddir@
815 CYRUS_USER=@cyrus_user@
816 @@ -68,13 +70,13 @@ MAKEDEPEND = @MAKEDEPEND@
818 TIMSIEVED_LIBS = @TIMSIEVED_LIBS@
820 -SERVICE=../master/service.o
821 +SERVICE=../master/service.lo
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@
830 PURIFY=/usr/local/bin/purify
832 @@ -82,22 +84,22 @@ PUREOPT=-best-effort
836 - $(INSTALL) -m 755 timsieved $(DESTDIR)$(service_path)
837 + $(LIBTOOL) --mode=install $(INSTALL) -m 755 timsieved $(DESTDIR)$(service_path)
839 -OBJS= actions.o lex.o mystring.o scripttest.o timsieved.o parser.o \
841 +OBJS= actions.lo lex.lo mystring.lo scripttest.lo timsieved.lo parser.lo \
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)
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)
856 - rm -f timsieved *~ *.o *.a Makefile.bak makedepend.log
857 + rm -rf timsieved *~ .libs *.o *.lo *.a *.la Makefile.bak makedepend.log
861 @@ -105,8 +107,8 @@ distclean: clean
863 ${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) *.c $(srcdir)/*.c 1>makedepend.log 2>&1
866 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
868 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
871 # DO NOT DELETE THIS LINE -- make depend depends on it.
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)
890 +const int config_need_data = 0;
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@
901 +top_builddir = @top_builddir@
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@
911 MAKEDEPEND_CFLAGS = @CFLAGS@
912 CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
913 @@ -68,22 +70,20 @@ prefix = @prefix@
914 exec_prefix = @exec_prefix@
915 cyrus_prefix = @cyrus_prefix@
917 -OBJS=isieve.o lex.o mystring.o request.o
918 +OBJS=isieve.lo lex.lo mystring.lo request.lo
926 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
928 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
930 -libisieve.a: $(OBJS)
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)
938 - rm -f *.o Makefile.bak makedepend.log libisieve.a
939 + rm -rf .libs *.o *.lo Makefile.bak makedepend.log libisieve.la
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);
949 +const int config_need_data = 0;
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",
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
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
975 # ACL interpretation. Only one choice for now:
980 top_srcdir = @top_srcdir@
981 @@ -57,6 +57,8 @@ CC = @CC@
986 +top_builddir = @top_builddir@
988 DEFS = @DEFS@ @LOCALDEFS@
989 CPPFLAGS = -I.. @CPPFLAGS@ @COM_ERR_CPPFLAGS@ @SASLFLAGS@
990 @@ -72,6 +74,7 @@ MAKEDEPEND = @MAKEDEPEND@
992 exec_prefix = @exec_prefix@
993 cyrus_prefix = @cyrus_prefix@
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
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
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 \
1022 -LIBCYRM_OBJS = libconfig.o imapopts.o hash.o mpool.o xmalloc.o strhash.o \
1023 - xstrlcat.o xstrlcpy.o assert.o util.o @IPV6_OBJS@
1024 +LIBCYRM_OBJS = libconfig.lo imapopts.lo hash.lo mpool.lo xmalloc.lo strhash.lo \
1025 + xstrlcat.lo xstrlcpy.lo assert.lo util.lo @IPV6_OBJS@
1027 -all: $(BUILTSOURCES) libcyrus_min.a libcyrus.a
1028 +all: $(BUILTSOURCES) libcyrus_min.la libcyrus.la
1031 $(srcdir)/../install-sh -d $(DESTDIR)$(libdir)
1032 - $(INSTALL) -m 644 libcyrus.a $(DESTDIR)$(libdir)
1033 - $(INSTALL) -m 644 libcyrus_min.a $(DESTDIR)$(libdir)
1034 - $(RANLIB) $(DESTDIR)$(libdir)/libcyrus.a
1035 + $(LIBTOOL) --mode=install $(INSTALL) -m 644 libcyrus_min.la $(DESTDIR)$(libdir)
1036 + $(LIBTOOL) --mode=install $(INSTALL) -m 644 libcyrus.la $(DESTDIR)$(libdir)
1037 for file in $(LIBCYR_HDRS); \
1039 $(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/include/cyrus || exit 1; \
1040 @@ -122,19 +124,15 @@ install:
1041 $(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/include/cyrus || exit 1; \
1045 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
1047 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
1050 -libcyrus.a: $(LIBCYR_OBJS)
1052 - ar cr libcyrus.a $(LIBCYR_OBJS)
1053 - $(RANLIB) libcyrus.a
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
1060 + $(LIBTOOL) --mode=link --tag=CC $(CC) -o libcyrus.la $(LIBCYR_OBJS) libcyrus_min.la @LIBS@ @LIB_SASL@ -rpath $(libdir) -release $(VERSION)
1062 +libcyrus_min.la: $(LIBCYRM_OBJS)
1063 + $(LIBTOOL) --mode=link --tag=CC $(CC) -o libcyrus_min.la $(LIBCYRM_OBJS) @IMAP_COM_ERR_LIBS@ -rpath $(libdir) -release $(VERSION)
1065 imapopts.c: imapoptions $(srcdir)/../tools/config2header
1066 $(srcdir)/../tools/config2header CC="$(CC)" $(srcdir)/imapopts.c $(srcdir)/imapopts.h < $(srcdir)/imapoptions
1067 @@ -154,11 +152,11 @@ chartable.c: mkchartable
1068 # ./mkchartable -m $(srcdir)/charset/unicode.map $(srcdir)/charset/*.t >x-chartables.h
1069 # mv x-chartables.h chartables.h
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
1077 - rm -f *.o *.a chartable.c Makefile.bak mkchartable makedepend.log \
1078 + rm -rf .libs *.o *.lo *.a *.la chartable.c Makefile.bak mkchartable makedepend.log \
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
1091 AC_CHECK_HEADERS(stdarg.h)
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
1099 +top_builddir = @top_builddir@
1105 +LIBTOOL = @LIBTOOL@
1108 CPPFLAGS = -I. -I$(srcdir) @CPPFLAGS@
1109 @@ -62,15 +64,15 @@ SHELL = /bin/sh
1114 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
1116 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
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)
1126 - rm -f *.o Makefile.bak makedepend
1127 + rm -rf .libs *.o *.lo Makefile.bak makedepend
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@
1137 +LIBTOOL = @LIBTOOL@
1138 +top_builddir = @top_builddir@
1140 DEFS = @DEFS@ @LOCALDEFS@
1141 CPPFLAGS = -I.. -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
1143 IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
1144 -DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
1145 +DEPLIBS = ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
1148 LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
1149 @@ -73,7 +75,7 @@ cyrus_prefix = @cyrus_prefix@
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
1163 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
1165 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
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)
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)
1178 - rm -f *.o Makefile.bak makedepend.log imtest
1179 + rm -rf .libs *.o *.lo Makefile.bak makedepend.log imtest
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
1189 +/* config.c stuff */
1190 +const int config_need_data = 0;
1192 int mysasl_config(void *context __attribute__((unused)),
1193 const char *plugin_name,
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
1201 +LIBTOOL = @LIBTOOL@
1202 +top_builddir = @top_builddir@
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
1215 LDAP_LIBS=@LDAP_LIBS@
1216 LDAP_CPPFLAGS=@LDAP_CPPFLAGS@
1217 @@ -83,42 +85,42 @@ PROGS = ptexpire ptloader ptdump $(EXTRA
1221 -SERVICE=../master/service.o
1222 -SERVICETHREAD=../master/service-thread.o
1223 +SERVICE=../master/service.lo
1224 +SERVICETHREAD=../master/service-thread.lo
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)
1237 - $(CC) -c $(CPPFLAGS) $(LDAP_CPPFLAGS) $(DEFS) $(CFLAGS) $<
1239 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(LDAP_CPPFLAGS) $(DEFS) $(CFLAGS) $<
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)
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)
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)
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)
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)
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)
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)
1277 - rm -f *.o Makefile.bak $(PROGS) makedepend.log
1278 + rm -rf .libs *.o *.lo Makefile.bak $(PROGS) makedepend.log
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
1288 +top_builddir = @top_builddir@
1294 +LIBTOOL = @LIBTOOL@
1298 @@ -63,19 +65,19 @@ LDFLAGS = @LDFLAGS@
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)
1307 -all: compile_et libcom_err.a
1308 +all: compile_et libcom_err.la
1313 - $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I$(srcdir)/../../lib -I. -I../.. $(CFLAGS) $<
1315 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I$(srcdir)/../../lib -I. -I../.. $(CFLAGS) $<
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
1323 @@ -92,13 +94,13 @@ et_h.awk: $(srcdir)/et_h.awk
1324 $(CP) $(srcdir)/et_h.awk et_h.awk
1327 - rm -f compile_et compile_et.o error_table.o
1328 - rm -f libcom_err.a
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
1334 - rm -f compile_et compile_et.o error_table.o
1335 - rm -f libcom_err.a
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
1341 @@ -119,21 +121,15 @@ depend: compile_et
1343 ## install_library_target(com_err,$(LIBOBJS),$(LINTFILES),)
1345 -libcom_err.a: $(LIBOBJS)
1346 - rm -f libcom_err.a
1347 - $(ARCHIVE) $@ $(LIBOBJS)
1349 +libcom_err.la: $(LIBOBJS)
1350 + $(LIBTOOL) --mode=link --tag=CC $(CC) -o libcom_err.la $(LIBOBJS)
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)
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)
1366 TAGS: et_name.c error_message.c compile_et.c error_table.c \
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
1374 +top_builddir = @top_builddir@
1380 +LIBTOOL = @LIBTOOL@
1383 CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@
1385 -DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
1386 +DEPLIBS = ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
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
1395 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
1397 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
1400 - rm -f *.o Makefile.bak makedepend.log
1401 + rm -rf .libs *.o *.lo Makefile.bak makedepend.log
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@
1411 +INSTALL = @INSTALL@
1416 +LIBTOOL = @LIBTOOL@
1417 +top_builddir = @top_builddir@
1418 COMPILE_ET = @COMPILE_ET@
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@
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
1434 -all: libsieve.a sievec sieved
1435 +all: libsieve.la sievec sieved
1437 dist: $(BUILT_SOURCES)
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
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)
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
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)
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
1464 sieve-lex.c: sieve-lex.l sieve.h
1466 @@ -113,21 +118,19 @@ addr.c addr.h: addr.y
1468 # This is needed because 'makedepend' leaves it out
1469 #(this is not in newer version, is it still needed?)
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)
1477 -libsieve.a: $(OBJS)
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)
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)
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)
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
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
1504 rm -f sieve_err.c sieve_err.h
1505 @@ -148,8 +151,8 @@ clobber:
1507 ${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(MAKEDEPEND_CFLAGS) *.c *.y $(srcdir)/*.y $(srcdir)/*.c 1>makedepend.log 2>&1
1510 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
1512 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
1515 # DO NOT DELETE THIS LINE -- make depend depends on it.