1 --- cyrus-imapd-2.3.8/ptclient/Makefile.in 2007-02-18 23:43:17.000000000 +0100
2 +++ cyrus-imapd-2.3.12p2/ptclient/Makefile.in 2008-09-23 21:36:44.543737168 +0300
8 +top_builddir = @top_builddir@
11 CPPFLAGS = -I.. -I$(srcdir)/../imap -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
13 LIBS = $(IMAP_LIBS) @COM_ERR_LIBS@
16 -DEPLIBS = ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
17 -UTIL_LIBS = ../imap/mutex_fake.o ../imap/cli_fatal.o
18 +DEPLIBS = ../imap/libimap.la ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
19 +UTIL_LIBS = ../imap/mutex_fake.lo ../imap/cli_fatal.lo
22 LDAP_CPPFLAGS=@LDAP_CPPFLAGS@
27 -SERVICE=../master/service.o
28 -SERVICETHREAD=../master/service-thread.o
29 +SERVICE=../master/service.lo
30 +SERVICETHREAD=../master/service-thread.lo
35 - $(INSTALL) -m 755 ptloader $(DESTDIR)$(service_path)
36 - $(INSTALL) -m 755 ptexpire $(DESTDIR)$(service_path)
37 - $(INSTALL) -m 755 ptdump $(DESTDIR)$(service_path)
38 + $(LIBTOOL) --mode=install $(INSTALL) ptloader $(DESTDIR)$(service_path)
39 + $(LIBTOOL) --mode=install $(INSTALL) ptexpire $(DESTDIR)$(service_path)
40 + $(LIBTOOL) --mode=install $(INSTALL) ptdump $(DESTDIR)$(service_path)
43 - $(CC) -c $(CPPFLAGS) $(LDAP_CPPFLAGS) $(DEFS) $(CFLAGS) $<
45 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(LDAP_CPPFLAGS) $(DEFS) $(CFLAGS) $<
47 -ptloader: ptloader.o afskrb.o ldap.o ../imap/mutex_fake.o $(DEPLIBS)
48 - $(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)
49 +ptloader: ptloader.lo afskrb.lo ldap.lo ../imap/mutex_fake.lo $(DEPLIBS)
50 + $(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)
52 -ptloader.pure: ptloader.o afskrb.o ldap.o ../imap/mutex_fake.o $(DEPLIBS)
53 - $(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)
54 +ptloader.pure: ptloader.lo afskrb.lo ldap.lo ../imap/mutex_fake.lo $(DEPLIBS)
55 + $(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)
57 -ptexpire: ptexpire.o $(DEPLIBS) $(UTIL_LIBS)
58 - $(CC) $(LDFLAGS) -o $@ ptexpire.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_RT)
59 +ptexpire: ptexpire.lo $(DEPLIBS) $(UTIL_LIBS)
60 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ptexpire.lo $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_RT)
62 -ptexpire.pure: ptexpire.o $(DEPLIBS) $(UTIL_LIBS)
63 - $(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ ptexpire.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
64 +ptexpire.pure: ptexpire.lo $(DEPLIBS) $(UTIL_LIBS)
65 + $(PURIFY) $(PUREARGS) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ptexpire.lo $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
67 -ptdump: ptdump.o $(DEPLIBS) $(UTIL_LIBS)
68 - $(CC) $(LDFLAGS) -o $@ ptdump.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_RT)
69 +ptdump: ptdump.lo $(DEPLIBS) $(UTIL_LIBS)
70 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ptdump.lo $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_RT)
72 -ptdump.pure: ptexpire.o $(DEPLIBS) $(UTIL_LIBS)
73 - $(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ ptdump.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
74 +ptdump.pure: ptexpire.lo $(DEPLIBS) $(UTIL_LIBS)
75 + $(PURIFY) $(PUREARGS) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ptdump.lo $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
77 -ptextract: ptextract.o $(DEPLIBS) $(UTIL_LIBS)
78 - $(CC) $(LDFLAGS) -o $@ ptextract.o $(UTIL_LIBS) $(DEPLIBS) $(LIBS)
79 +ptextract: ptextract.lo $(DEPLIBS) $(UTIL_LIBS)
80 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ptextract.lo $(UTIL_LIBS) $(DEPLIBS) $(LIBS)
83 - rm -f *.o Makefile.bak $(PROGS) makedepend.log
84 + rm -f *.lo Makefile.bak $(PROGS) makedepend.log
88 --- cyrus-imapd-2.3.8/sieve/Makefile.in.wiget 2006-11-30 18:11:24.000000000 +0100
89 +++ cyrus-imapd-2.3.8/sieve/Makefile.in 2007-02-18 23:43:17.000000000 +0100
95 +top_builddir = @top_builddir@
96 COMPILE_ET = @COMPILE_ET@
98 DEFS = @DEFS@ @LOCALDEFS@
100 IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
101 IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
102 LIBS = libsieve.a $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS)
103 -DEPLIBS=../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
104 +DEPLIBS=../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
106 BUILT_SOURCES = addr.c addr.h addr-lex.c \
107 sieve.c sieve.h sieve-lex.c \
111 $(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
112 - $(srcdir)/../install-sh -c -m 755 sievec $(DESTDIR)$(service_path) || exit
113 + $(LIBTOOL) --mode=install $(srcdir)/../install-sh -c -m 755 sievec $(DESTDIR)$(service_path) || exit
115 test: $(DEPLIBS) libsieve.a test.o ../imap/message.o
116 - $(CC) $(LDFLAGS) -o test test.o ../imap/message.o \
117 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o test test.o ../imap/message.o \
118 libsieve.a $(DEPLIBS) $(LIBS)
121 @@ -103,10 +105,10 @@
124 sievec: sievec.o libsieve.a
125 - $(CC) $(LDFLAGS) -o sievec sievec.o libsieve.a $(DEPLIBS) $(LIBS)
126 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o sievec sievec.o libsieve.a $(DEPLIBS) $(LIBS)
128 sieved: sieved.o libsieve.a
129 - $(CC) $(LDFLAGS) -o sieved sieved.o libsieve.a $(DEPLIBS) $(LIBS)
130 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o sieved sieved.o libsieve.a $(DEPLIBS) $(LIBS)
133 sieve_interface.h: sieve_err.h
134 --- cyrus-imapd-2.3.12p2/netnews/Makefile.in~ 2008-09-23 18:00:16.000000000 +0300
135 +++ cyrus-imapd-2.3.12p2/netnews/Makefile.in 2008-09-23 18:01:26.824280572 +0300
141 +top_builddir = @top_builddir@
144 CPPFLAGS = -I.. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../com_err/et @CPPFLAGS@
145 LIBS = @IMAP_LIBS@ @LIB_RT@
146 -DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
147 +DEPLIBS = ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
155 - $(INSTALL) -s -m 755 remotepurge $(DESTDIR)$(service_path)
156 + $(LIBTOOL) --mode=install $(INSTALL) remotepurge $(DESTDIR)$(service_path)
159 $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
161 remotepurge: $(OBJS) $(DEPLIBS)
162 - $(CC) $(LDFLAGS) -o remotepurge $(OBJS) \
163 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o remotepurge $(OBJS) \
167 --- cyrus-imapd-2.3.8/timsieved/Makefile.in 2007-02-18 23:43:17.000000000 +0100
168 +++ cyrus-imapd-2.3.12p2/timsieved/Makefile.in 2008-09-23 21:34:25.039668022 +0300
174 +top_builddir = @top_builddir@
177 CYRUS_USER=@cyrus_user@
180 ${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) *.c $(srcdir)/*.c 1>makedepend.log 2>&1
183 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
185 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
188 # DO NOT DELETE THIS LINE -- make depend depends on it.
189 --- cyrus-imapd-2.3.8/configure.in.wiget 2007-02-18 23:43:17.000000000 +0100
190 +++ cyrus-imapd-2.3.8/configure.in 2007-02-18 23:43:17.000000000 +0100
192 AC_DEFINE_UNQUOTED(SYSCONFDIR,"$sysconfdir",[Config File Location])
201 cyrus_cv_getaddrinfo=no)], cyrus_cv_getaddrinfo=no)
203 if test $cyrus_cv_getaddrinfo = no; then
204 - IPV6_OBJS="getaddrinfo.o"
205 + IPV6_OBJS="getaddrinfo.lo"
208 cyrus_cv_getnameinfo=yes
210 cyrus_cv_getnameinfo=no)
212 if test $cyrus_cv_getnameinfo = no; then
213 - IPV6_OBJS="$IPV6_OBJS getnameinfo.o"
214 + IPV6_OBJS="$IPV6_OBJS getnameinfo.lo"
217 IPv6_CHECK_SS_FAMILY()
219 dnl function for doing each of the database backends
220 dnl parameters: backend name, variable to set, withval
222 -CYRUSDB_OBJS="cyrusdb_flat.o cyrusdb_skiplist.o cyrusdb_quotalegacy.o"
223 +CYRUSDB_OBJS="cyrusdb_flat.lo cyrusdb_skiplist.lo cyrusdb_quotalegacy.lo"
225 dnl Berkeley DB Detection
228 LIBS="${LIBS} ${BDB_LIBADD}"
229 CPPFLAGS="${BDB_INCADD} ${CPPFLAGS}"
231 - CYRUSDB_OBJS="$CYRUSDB_OBJS cyrusdb_berkeley.o"
232 + CYRUSDB_OBJS="$CYRUSDB_OBJS cyrusdb_berkeley.lo"
233 AC_DEFINE(HAVE_BDB,[],[Build in Berkeley DB support?])
237 dnl Check for MD5 functions
238 AC_FUNC_CHECK(MD5Init,,
239 AC_CHECK_LIB(md, MD5Init, LIBS="${LIBS} -lmd",
245 --- cyrus-imapd-2.3.12p2/imap/Makefile.in 2008-09-23 21:18:02.070806071 +0300
246 +++ cyrus-imapd-2.3.12p2/imap/Makefile.in 2008-09-23 21:20:01.537715249 +0300
249 # \Seen state database. Either 'db' (berkeley db) or
250 # 'local' (legacy flat file).
255 top_srcdir = @top_srcdir@
256 +top_builddir = @top_builddir@
265 CYRUS_USER=@cyrus_user@
266 CYRUS_GROUP=@cyrus_group@
268 IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
269 LIB_WRAP = @LIB_WRAP@
270 LIBS = $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS)
271 -DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
272 +DEPLIBS = ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
275 LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
277 cyrus_prefix = @cyrus_prefix@
278 service_path = @service_path@
280 -LOBJS= append.o mailbox.o mboxlist.o mupdate-client.o mboxname.o message.o \
281 - global.o imap_err.o mupdate_err.o proc.o setproctitle.o \
282 - convert_code.o duplicate.o saslclient.o saslserver.o signals.o \
283 - annotate.o search_engines.o squat.o squat_internal.o mbdump.o \
284 - imapparse.o telemetry.o user.o notify.o idle.o quota_db.o \
285 - sync_log.o $(SEEN) mboxkey.o backend.o tls.o message_guid.o \
287 +LOBJS= append.lo mailbox.lo mboxlist.lo mupdate-client.lo mboxname.lo message.lo \
288 + global.lo imap_err.lo mupdate_err.lo proc.lo setproctitle.lo \
289 + convert_code.lo duplicate.lo saslclient.lo saslserver.lo signals.lo \
290 + annotate.lo search_engines.lo squat.lo squat_internal.lo mbdump.lo \
291 + imapparse.lo telemetry.lo user.lo notify.lo idle.lo quota_db.lo \
292 + sync_log.lo $(SEEN) mboxkey.lo backend.lo tls.lo message_guid.lo \
295 -IMAPDOBJS=pushstats.o imapd.o proxy.o imap_proxy.o index.o version.o
296 +IMAPDOBJS=pushstats.lo imapd.lo proxy.lo imap_proxy.lo index.lo version.lo
298 -LMTPOBJS=lmtpstats.o lmtpengine.o spool.o
299 +LMTPOBJS=lmtpstats.lo lmtpengine.lo spool.lo
301 # Your typical objects for the command line utilities
302 -CLIOBJS=cli_fatal.o mutex_fake.o
303 +CLIOBJS=cli_fatal.lo mutex_fake.lo
305 -SERVICE=../master/service.o
306 -SERVICETHREAD=../master/service-thread.o
307 +SERVICE=../master/service.lo
308 +SERVICETHREAD=../master/service-thread.lo
310 PROGS = imapd lmtpd pop3d \
311 fud smmapd reconstruct quota mbpath ipurge cyr_dbtool cyr_synclog \
312 @@ -139,23 +141,21 @@
313 ln -f $(DESTDIR)$(service_path)/imapd $(DESTDIR)$(service_path)/proxyd
314 ln -f $(DESTDIR)$(service_path)/lmtpd $(DESTDIR)$(service_path)/lmtpproxyd
317 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
319 + $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
326 - ar cr libimap.a $(LOBJS)
327 - $(RANLIB) libimap.a
328 +libimap.la: $(LOBJS)
329 + $(LIBTOOL) --mode=link --tag=CC $(CC) -o libimap.la $(LOBJS)
331 ### Built Source Files
334 AWK=$(AWK) $(srcdir)/xversion.sh
336 -version.o: xversion.h
337 +version.lo: xversion.h
339 pushstats.c: pushstats.snmp $(srcdir)/../snmp/snmpgen
340 $(srcdir)/../snmp/snmpgen $(srcdir)/pushstats.snmp
341 @@ -183,179 +183,179 @@
342 mupdate_err.h: mupdate_err.c
345 -idled: idled.o mutex_fake.o libimap.a $(DEPLIBS)
346 - $(CC) $(LDFLAGS) -o idled \
347 - idled.o mutex_fake.o libimap.a $(DEPLIBS) $(LIBS)
349 -lmtpd: lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.o \
350 - libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
351 - $(CC) $(LDFLAGS) -o lmtpd \
352 - $(SERVICE) lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \
353 - mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
355 -lmtpd.pure: lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \
356 - mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
357 - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o lmtpd.pure \
358 - $(SERVICE) lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \
359 - mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
361 -imapd: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
362 - $(CC) $(LDFLAGS) -o imapd \
363 - $(SERVICE) $(IMAPDOBJS) mutex_fake.o \
364 - libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
366 -imapd.pure: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
367 - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o imapd.pure \
368 - $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \
369 +idled: idled.lo mutex_fake.lo libimap.la $(DEPLIBS)
370 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o idled \
371 + idled.lo mutex_fake.lo libimap.la $(DEPLIBS) $(LIBS)
373 +lmtpd: lmtpd.lo proxy.lo $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.lo \
374 + libimap.la $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
375 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o lmtpd \
376 + $(SERVICE) lmtpd.lo proxy.lo $(LMTPOBJS) $(SIEVE_OBJS) \
377 + mutex_fake.lo libimap.la $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
379 +lmtpd.pure: lmtpd.lo proxy.lo $(LMTPOBJS) $(SIEVE_OBJS) \
380 + mutex_fake.lo libimap.la $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
381 + $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o lmtpd.pure \
382 + $(SERVICE) lmtpd.lo proxy.lo $(LMTPOBJS) $(SIEVE_OBJS) \
383 + mutex_fake.lo libimap.la $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
385 +imapd: $(IMAPDOBJS) mutex_fake.lo libimap.la $(DEPLIBS) $(SERVICE)
386 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o imapd \
387 + $(SERVICE) $(IMAPDOBJS) mutex_fake.lo \
388 + libimap.la $(DEPLIBS) $(LIBS) $(LIB_WRAP)
390 +imapd.pure: $(IMAPDOBJS) mutex_fake.lo libimap.la $(DEPLIBS) $(SERVICE)
391 + $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o imapd.pure \
392 + $(SERVICE) $(IMAPDOBJS) mutex_fake.lo libimap.la \
393 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
395 -imapd.quant: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
396 - $(QUANTIFY) $(QUANTOPT) $(CC) $(LDFLAGS) -o imapd.quant \
397 - $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \
398 +imapd.quant: $(IMAPDOBJS) mutex_fake.lo libimap.la $(DEPLIBS) $(SERVICE)
399 + $(QUANTIFY) $(QUANTOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o imapd.quant \
400 + $(SERVICE) $(IMAPDOBJS) mutex_fake.lo libimap.la \
401 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
403 -mupdate: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o tls.o \
404 - libimap.a $(DEPLIBS)
405 - $(CC) $(LDFLAGS) -o mupdate \
406 - $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
407 - mutex_pthread.o tls.o libimap.a \
408 +mupdate: mupdate.lo mupdate-slave.lo mupdate-client.lo mutex_pthread.lo tls.lo \
409 + libimap.la $(DEPLIBS)
410 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o mupdate \
411 + $(SERVICETHREAD) mupdate.lo mupdate-slave.lo mupdate-client.lo \
412 + mutex_pthread.lo tls.lo libimap.la \
413 $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
415 -mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o \
416 - libimap.a $(DEPLIBS)
417 - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o mupdate.pure \
418 - $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
419 - mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
420 +mupdate.pure: mupdate.lo mupdate-slave.lo mupdate-client.lo mutex_pthread.lo \
421 + libimap.la $(DEPLIBS)
422 + $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o mupdate.pure \
423 + $(SERVICETHREAD) mupdate.lo mupdate-slave.lo mupdate-client.lo \
424 + mutex_pthread.lo libimap.la $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
426 -pop3d: pop3d.o proxy.o backend.o tls.o mutex_fake.o libimap.a \
427 +pop3d: pop3d.lo proxy.lo backend.lo tls.lo mutex_fake.lo libimap.la \
428 $(DEPLIBS) $(SERVICE)
429 - $(CC) $(LDFLAGS) -o pop3d pop3d.o proxy.o backend.o tls.o $(SERVICE) \
430 - mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
431 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o pop3d pop3d.lo proxy.lo backend.lo tls.lo $(SERVICE) \
432 + mutex_fake.lo libimap.la $(DEPLIBS) $(LIBS) $(LIB_WRAP)
434 -nntpd: nntpd.o proxy.o backend.o index.o smtpclient.o spool.o tls.o \
435 - mutex_fake.o nntp_err.o libimap.a $(DEPLIBS) $(SERVICE)
436 - $(CC) $(LDFLAGS) -o nntpd nntpd.o proxy.o backend.o index.o spool.o \
437 - smtpclient.o tls.o $(SERVICE) mutex_fake.o nntp_err.o \
438 - libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
439 +nntpd: nntpd.lo proxy.lo backend.lo index.lo smtpclient.lo spool.lo tls.lo \
440 + mutex_fake.lo nntp_err.lo libimap.la $(DEPLIBS) $(SERVICE)
441 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o nntpd nntpd.lo proxy.lo backend.lo index.lo spool.lo \
442 + smtpclient.lo tls.lo $(SERVICE) mutex_fake.lo nntp_err.lo \
443 + libimap.la $(DEPLIBS) $(LIBS) $(LIB_WRAP)
445 -fud: fud.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE)
446 - $(CC) $(LDFLAGS) -o fud $(SERVICE) fud.o mutex_fake.o libimap.a \
447 +fud: fud.lo libimap.la mutex_fake.lo $(DEPLIBS) $(SERVICE)
448 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o fud $(SERVICE) fud.lo mutex_fake.lo libimap.la \
449 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
451 -smmapd: smmapd.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE)
452 - $(CC) $(LDFLAGS) -o smmapd $(SERVICE) smmapd.o mutex_fake.o libimap.a \
453 +smmapd: smmapd.lo libimap.la mutex_fake.lo $(DEPLIBS) $(SERVICE)
454 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o smmapd $(SERVICE) smmapd.lo mutex_fake.lo libimap.la \
455 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
457 -sync_server: sync_server.o sync_support.o sync_commit.o \
458 - imapparse.o tls.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE)
459 - $(CC) $(LDFLAGS) -o \
460 - sync_server sync_server.o sync_support.o sync_commit.o \
461 - imapparse.o tls.o $(SERVICE) libimap.a mutex_fake.o \
462 +sync_server: sync_server.lo sync_support.lo sync_commit.lo \
463 + imapparse.lo tls.lo libimap.la mutex_fake.lo $(DEPLIBS) $(SERVICE)
464 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
465 + sync_server sync_server.lo sync_support.lo sync_commit.lo \
466 + imapparse.lo tls.lo $(SERVICE) libimap.la mutex_fake.lo \
467 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
469 ### Command Line Utilities
470 -arbitron: arbitron.o $(CLIOBJS) libimap.a $(DEPLIBS)
471 - $(CC) $(LDFLAGS) -o arbitron arbitron.o $(CLIOBJS) \
472 - libimap.a $(DEPLIBS) $(LIBS)
474 -cyr_dbtool: cyr_dbtool.o mutex_fake.o libimap.a $(DEPLIBS)
475 - $(CC) $(LDFLAGS) -o cyr_dbtool cyr_dbtool.o $(CLIOBJS) \
476 - libimap.a $(DEPLIBS) $(LIBS)
478 -cyr_synclog: cyr_synclog.o mutex_fake.o libimap.a $(DEPLIBS)
479 - $(CC) $(LDFLAGS) -o cyr_synclog cyr_synclog.o $(CLIOBJS) \
480 - libimap.a $(DEPLIBS) $(LIBS)
482 -cvt_cyrusdb: cvt_cyrusdb.o mutex_fake.o libimap.a $(DEPLIBS)
483 - $(CC) $(LDFLAGS) -o cvt_cyrusdb cvt_cyrusdb.o $(CLIOBJS) \
484 - libimap.a $(DEPLIBS) $(LIBS)
486 -chk_cyrus: chk_cyrus.o mutex_fake.o libimap.a $(DEPLIBS)
487 - $(CC) $(LDFLAGS) -o chk_cyrus chk_cyrus.o $(CLIOBJS) \
488 - libimap.a $(DEPLIBS) $(LIBS)
490 -deliver: deliver.o $(LMTPOBJS) proxy.o mutex_fake.o libimap.a $(DEPLIBS)
491 - $(CC) $(LDFLAGS) -o deliver deliver.o $(LMTPOBJS) proxy.o \
492 - mutex_fake.o libimap.a $(DEPLIBS) $(LIBS)
494 -ctl_deliver: ctl_deliver.o $(CLIOBJS) libimap.a $(DEPLIBS)
495 - $(CC) $(LDFLAGS) -o \
496 - $@ ctl_deliver.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
498 -ctl_mboxlist: ctl_mboxlist.o mupdate-client.o $(CLIOBJS) libimap.a $(DEPLIBS)
499 - $(CC) $(LDFLAGS) -o $@ ctl_mboxlist.o mupdate-client.o $(CLIOBJS) \
500 - libimap.a $(DEPLIBS) $(LIBS)
502 -ctl_cyrusdb: ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS)
503 - $(CC) $(LDFLAGS) -o \
504 - $@ ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
506 -cyr_expire: cyr_expire.o $(CLIOBJS) libimap.a $(DEPLIBS)
507 - $(CC) $(LDFLAGS) -o $@ cyr_expire.o $(CLIOBJS) \
508 - libimap.a $(DEPLIBS) $(LIBS)
510 -fetchnews: fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS)
511 - $(CC) $(LDFLAGS) -o \
512 - $@ fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
514 -squatter: squatter.o index.o squat_build.o $(CLIOBJS) libimap.a $(DEPLIBS)
515 - $(CC) $(LDFLAGS) -o squatter squatter.o index.o squat_build.o \
516 - $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
517 +arbitron: arbitron.lo $(CLIOBJS) libimap.la $(DEPLIBS)
518 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o arbitron arbitron.lo $(CLIOBJS) \
519 + libimap.la $(DEPLIBS) $(LIBS)
521 +cyr_dbtool: cyr_dbtool.lo mutex_fake.lo libimap.la $(DEPLIBS)
522 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o cyr_dbtool cyr_dbtool.lo $(CLIOBJS) \
523 + libimap.la $(DEPLIBS) $(LIBS)
525 +cyr_synclog: cyr_synclog.lo mutex_fake.lo libimap.la $(DEPLIBS)
526 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o cyr_synclog cyr_synclog.lo $(CLIOBJS) \
527 + libimap.la $(DEPLIBS) $(LIBS)
529 +cvt_cyrusdb: cvt_cyrusdb.lo mutex_fake.lo libimap.la $(DEPLIBS)
530 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o cvt_cyrusdb cvt_cyrusdb.lo $(CLIOBJS) \
531 + libimap.la $(DEPLIBS) $(LIBS)
533 +chk_cyrus: chk_cyrus.lo mutex_fake.lo libimap.la $(DEPLIBS)
534 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o chk_cyrus chk_cyrus.lo $(CLIOBJS) \
535 + libimap.la $(DEPLIBS) $(LIBS)
537 +deliver: deliver.lo $(LMTPOBJS) proxy.lo mutex_fake.lo libimap.la $(DEPLIBS)
538 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o deliver deliver.lo $(LMTPOBJS) proxy.lo \
539 + mutex_fake.lo libimap.la $(DEPLIBS) $(LIBS)
541 +ctl_deliver: ctl_deliver.lo $(CLIOBJS) libimap.la $(DEPLIBS)
542 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
543 + $@ ctl_deliver.lo $(CLIOBJS) libimap.la $(DEPLIBS) $(LIBS)
545 +ctl_mboxlist: ctl_mboxlist.lo mupdate-client.lo $(CLIOBJS) libimap.la $(DEPLIBS)
546 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ctl_mboxlist.lo mupdate-client.lo $(CLIOBJS) \
547 + libimap.la $(DEPLIBS) $(LIBS)
549 +ctl_cyrusdb: ctl_cyrusdb.lo $(CLIOBJS) libimap.la $(DEPLIBS)
550 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
551 + $@ ctl_cyrusdb.lo $(CLIOBJS) libimap.la $(DEPLIBS) $(LIBS)
553 +cyr_expire: cyr_expire.lo $(CLIOBJS) libimap.la $(DEPLIBS)
554 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ cyr_expire.lo $(CLIOBJS) \
555 + libimap.la $(DEPLIBS) $(LIBS)
557 +fetchnews: fetchnews.lo $(CLIOBJS) libimap.la $(DEPLIBS)
558 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
559 + $@ fetchnews.lo $(CLIOBJS) libimap.la $(DEPLIBS) $(LIBS)
561 +squatter: squatter.lo index.lo squat_build.lo $(CLIOBJS) libimap.la $(DEPLIBS)
562 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o squatter squatter.lo index.lo squat_build.lo \
563 + $(CLIOBJS) libimap.la $(DEPLIBS) $(LIBS)
565 -mbpath: mbpath.o $(CLIOBJS) libimap.a $(DEPLIBS)
566 - $(CC) $(LDFLAGS) -o mbpath mbpath.o $(CLIOBJS) libimap.a \
567 +mbpath: mbpath.lo $(CLIOBJS) libimap.la $(DEPLIBS)
568 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o mbpath mbpath.lo $(CLIOBJS) libimap.la \
571 -ipurge: ipurge.o $(CLIOBJS) libimap.a $(DEPLIBS)
572 - $(CC) $(LDFLAGS) -o ipurge ipurge.o $(CLIOBJS) \
573 - libimap.a $(DEPLIBS) $(LIBS)
575 -cyrdump: cyrdump.o index.o $(CLIOBJS) libimap.a $(DEPLIBS)
576 - $(CC) $(LDFLAGS) -o cyrdump cyrdump.o index.o $(CLIOBJS) \
577 - libimap.a $(DEPLIBS) $(LIBS)
579 -mbexamine: mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS)
580 - $(CC) $(LDFLAGS) -o \
581 - mbexamine mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
583 -reconstruct: reconstruct.o $(CLIOBJS) libimap.a $(DEPLIBS)
584 - $(CC) $(LDFLAGS) -o \
585 - reconstruct reconstruct.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
587 -quota: quota.o $(CLIOBJS) libimap.a $(DEPLIBS)
588 - $(CC) $(LDFLAGS) -o quota quota.o $(CLIOBJS) \
589 - libimap.a $(DEPLIBS) $(LIBS)
591 -tls_prune: tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS)
592 - $(CC) $(LDFLAGS) -o \
593 - $@ tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
595 -unexpunge: unexpunge.o $(CLIOBJS) libimap.a $(DEPLIBS)
596 - $(CC) $(LDFLAGS) -o $@ unexpunge.o $(CLIOBJS) \
597 - libimap.a $(DEPLIBS) $(LIBS)
599 -make_md5: make_md5.o libimap.a mutex_fake.o $(DEPLIBS)
600 - $(CC) $(LDFLAGS) -o make_md5 make_md5.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS)
602 -make_sha1: make_sha1.o libimap.a mutex_fake.o $(DEPLIBS)
603 - $(CC) $(LDFLAGS) -o make_sha1 make_sha1.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS)
605 -sync_client: sync_client.o sync_support.o \
606 - backend.o tls.o imapparse.o libimap.a mutex_fake.o $(DEPLIBS)
607 - $(CC) $(LDFLAGS) -o \
608 - sync_client sync_client.o sync_support.o \
609 - backend.o tls.o imapparse.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS)
611 -sync_reset: sync_reset.o sync_support.o sync_commit.o \
612 - libimap.a mutex_fake.o $(DEPLIBS)
613 - $(CC) $(LDFLAGS) -o \
614 - sync_reset sync_reset.o sync_support.o sync_commit.o \
615 - libimap.a mutex_fake.o $(DEPLIBS) $(LIBS)
616 +ipurge: ipurge.lo $(CLIOBJS) libimap.la $(DEPLIBS)
617 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o ipurge ipurge.lo $(CLIOBJS) \
618 + libimap.la $(DEPLIBS) $(LIBS)
620 +cyrdump: cyrdump.lo index.lo $(CLIOBJS) libimap.la $(DEPLIBS)
621 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o cyrdump cyrdump.lo index.lo $(CLIOBJS) \
622 + libimap.la $(DEPLIBS) $(LIBS)
624 +mbexamine: mbexamine.lo $(CLIOBJS) libimap.la $(DEPLIBS)
625 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
626 + mbexamine mbexamine.lo $(CLIOBJS) libimap.la $(DEPLIBS) $(LIBS)
628 +reconstruct: reconstruct.lo $(CLIOBJS) libimap.la $(DEPLIBS)
629 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
630 + reconstruct reconstruct.lo $(CLIOBJS) libimap.la $(DEPLIBS) $(LIBS)
632 +quota: quota.lo $(CLIOBJS) libimap.la $(DEPLIBS)
633 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o quota quota.lo $(CLIOBJS) \
634 + libimap.la $(DEPLIBS) $(LIBS)
636 +tls_prune: tls_prune.lo tls.lo $(CLIOBJS) libimap.la $(DEPLIBS)
637 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
638 + $@ tls_prune.lo tls.lo $(CLIOBJS) libimap.la $(DEPLIBS) $(LIBS)
640 +unexpunge: unexpunge.lo $(CLIOBJS) libimap.la $(DEPLIBS)
641 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ unexpunge.lo $(CLIOBJS) \
642 + libimap.la $(DEPLIBS) $(LIBS)
644 +make_md5: make_md5.lo libimap.la mutex_fake.lo $(DEPLIBS)
645 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o make_md5 make_md5.lo libimap.la mutex_fake.lo $(DEPLIBS) $(LIBS)
647 +make_sha1: make_sha1.lo libimap.la mutex_fake.lo $(DEPLIBS)
648 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o make_sha1 make_sha1.lo libimap.la mutex_fake.lo $(DEPLIBS) $(LIBS)
650 +sync_client: sync_client.lo sync_support.lo \
651 + backend.lo tls.lo imapparse.lo libimap.la mutex_fake.lo $(DEPLIBS)
652 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
653 + sync_client sync_client.lo sync_support.lo \
654 + backend.lo tls.lo imapparse.lo libimap.la mutex_fake.lo $(DEPLIBS) $(LIBS)
656 +sync_reset: sync_reset.lo sync_support.lo sync_commit.lo \
657 + libimap.la mutex_fake.lo $(DEPLIBS)
658 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
659 + sync_reset sync_reset.lo sync_support.lo sync_commit.lo \
660 + libimap.la mutex_fake.lo $(DEPLIBS) $(LIBS)
662 ### Other Misc Targets
665 - rm -f *.o *.a Makefile.bak makedepend.log \
666 + rm -f *.lo *.la Makefile.bak makedepend.log \
667 $(BUILTSOURCES) $(PROGS) $(SUIDPROGS)
670 --- cyrus-imapd-2.3.8/installsieve/Makefile.in 2007-02-18 23:43:17.000000000 +0100
671 +++ cyrus-imapd-2.3.12p2/installsieve/Makefile.in 2008-09-23 21:33:10.055330477 +0300
677 +top_builddir = @top_builddir@
680 CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @SASLFLAGS@
683 IMAP_LIBS = @IMAP_LIBS@
685 -DEPLIBS= ../lib/libcyrus.a @DEPLIBS@
686 +DEPLIBS= ../lib/libcyrus.la @DEPLIBS@
689 exec_prefix = @exec_prefix@
692 $(LIBTOOL) --mode=install $(INSTALL) installsieve $(DESTDIR)$(exec_prefix)/bin
694 - $(INSTALL) -s -m 755 installsieve $(DESTDIR)$(exec_prefix)/bin
695 + $(LIBTOOL) --mode=install $(INSTALL) installsieve $(DESTDIR)$(exec_prefix)/bin
697 -OBJS=lex.o mystring.o request.o isieve.o
698 +OBJS=lex.lo mystring.lo request.lo isieve.lo
700 -libinstallsieve.a: $(OBJS)
701 - rm -f libinstallsieve.a
702 - ar cr libinstallsieve.a $(OBJS)
703 - $(RANLIB) libinstallsieve.a
704 +libinstallsieve.la: $(OBJS)
705 + $(LIBTOOL) --mode=link --tag=CC $(CC) -o libinstallsieve.la $(OBJS)
707 -installsieve: libinstallsieve.a installscript.o $(DEPLIBS)
708 - $(CC) $(LDFLAGS) -o installsieve libinstallsieve.a installscript.o $(DEPLIBS) $(IMAP_LIBS)
709 +installsieve: libinstallsieve.la installscript.lo $(DEPLIBS)
710 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o installsieve libinstallsieve.la installscript.lo $(DEPLIBS) $(IMAP_LIBS)
713 - rm -f *.o *.a Makefile.bak makedepend.log
714 + rm -f *.lo *.la Makefile.bak makedepend.log
717 rm -f Makefile installsieve
721 - $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I. $(CFLAGS) \
723 + $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I. $(CFLAGS) \
727 # DO NOT DELETE THIS LINE -- make depend depends on it.
728 --- cyrus-imapd-2.3.8/perl/sieve/managesieve/Makefile.PL.wiget 2006-11-30 18:11:24.000000000 +0100
729 +++ cyrus-imapd-2.3.8/perl/sieve/managesieve/Makefile.PL 2007-02-18 23:43:17.000000000 +0100
731 'NAME' => 'Cyrus::SIEVE::managesieve',
732 'ABSTRACT' => 'Cyurs Sieve management interface',
733 'VERSION_FROM' => 'managesieve.pm', # finds $VERSION
734 - 'MYEXTLIB' => '../lib/isieve.o ../lib/lex.o ../lib/mystring.o ../lib/request.o ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a',
735 - 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT -lssl -lcrypto"],
736 + 'MYEXTLIB' => '../lib/.libs/isieve.o ../lib/.libs/lex.o ../lib/.libs/mystring.o ../lib/.libs/request.o',
737 + 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT -lssl -lcrypto -L../../../lib/.libs -lcyrus -lcyrus_min"],
738 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING'
739 'INC' => "-I../lib/ -I../../../lib/ $SASL_INC $OPENSSL_INC",
741 --- cyrus-imapd-2.3.8/perl/sieve/managesieve/managesieve.xs.wiget 2006-11-30 18:11:24.000000000 +0100
742 +++ cyrus-imapd-2.3.8/perl/sieve/managesieve/managesieve.xs 2007-02-18 23:43:17.000000000 +0100
744 croak("failure: %s", s);
747 +const int config_need_data = 0;
750 perlsieve_getpass(conn, context, id, psecret)
751 --- cyrus-imapd-2.3.8/perl/sieve/lib/Makefile.in.wiget 2006-11-30 18:11:24.000000000 +0100
752 +++ cyrus-imapd-2.3.8/perl/sieve/lib/Makefile.in 2007-02-18 23:43:17.000000000 +0100
758 +top_builddir = @top_builddir@
760 DEFS = @DEFS@ @LOCALDEFS@ -Dbool=char -DHAS_BOOL
761 CPPFLAGS = -I. -I../../.. -I$(srcdir) -I$(srcdir)/../../../lib @CPPFLAGS@ @DYNSASLFLAGS@ @COM_ERR_CPPFLAGS@
762 -LIBS = ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a @LIB_DYN_SASL@ @LIBS@
763 +LIBS = ../../../lib/libcyrus.la ../../../lib/libcyrus_min.la @LIB_DYN_SASL@ @LIBS@
764 IMAP_LIBS = @IMAP_LIBS@
765 -DEPLIBS = ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a @DEPLIBS@
766 +DEPLIBS = ../../../lib/libcyrus.la ../../../lib/libcyrus_min.la @DEPLIBS@
768 MAKEDEPEND_CFLAGS = @CFLAGS@
769 CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
771 exec_prefix = @exec_prefix@
772 cyrus_prefix = @cyrus_prefix@
774 -OBJS=isieve.o lex.o mystring.o request.o
775 +OBJS=isieve.lo lex.lo mystring.lo request.lo
783 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
785 + $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
787 -libisieve.a: $(OBJS)
789 - ar cr libisieve.a $(OBJS)
790 - $(RANLIB) libisieve.a
791 +libisieve.la: $(OBJS)
792 + $(LIBTOOL) --mode=link --tag=CC $(CC) -o libisievie.la $(OBJS)
795 rm -f *.o Makefile.bak makedepend.log libisieve.a
796 --- cyrus-imapd-2.3.8/perl/imap/IMAP.xs.wiget 2006-11-30 18:11:23.000000000 +0100
797 +++ cyrus-imapd-2.3.8/perl/imap/IMAP.xs 2007-02-18 23:43:17.000000000 +0100
802 +const int config_need_data = 0;
805 * Decrement the refcounts of the Perl SV's in the passed rock, then free the
806 --- cyrus-imapd-2.3.8/perl/imap/Makefile.PL.wiget 2006-11-30 18:11:23.000000000 +0100
807 +++ cyrus-imapd-2.3.8/perl/imap/Makefile.PL 2007-02-18 23:43:17.000000000 +0100
809 'macro' => {'IMCLIENT_LIBS' => ''}, # hack
810 'clean' => {'FILES' => 'libcyrperl.a cyradm'},
811 'OBJECT' => 'IMAP.o',
812 - 'MYEXTLIB' => '../../lib/libcyrus.a ../../lib/libcyrus_min.a',
813 - 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT -lssl -lcrypto"],
814 + 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT -lssl -lcrypto -L../../lib/.libs -lcyrus -lcyrus_min"],
815 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING'
816 'INC' => "-I../../lib -I../.. -I../../et $SASL_INC $OPENSSL_INC",
817 'EXE_FILES' => [cyradm],
818 --- cyrus-imapd-2.3.8/imtest/imtest.c.wiget 2006-11-30 18:11:22.000000000 +0100
819 +++ cyrus-imapd-2.3.8/imtest/imtest.c 2007-02-18 23:43:17.000000000 +0100
824 +/* config.c stuff */
825 +const int config_need_data = 0;
827 int mysasl_config(void *context __attribute__((unused)),
828 const char *plugin_name,
830 --- cyrus-imapd-2.3.8/imtest/Makefile.in.wiget 2006-11-30 18:11:22.000000000 +0100
831 +++ cyrus-imapd-2.3.8/imtest/Makefile.in 2007-02-18 23:43:17.000000000 +0100
837 +top_builddir = @top_builddir@
839 DEFS = @DEFS@ @LOCALDEFS@
840 CPPFLAGS = -I.. -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
842 IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
843 -DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
844 +DEPLIBS = ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
847 LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
852 - $(INSTALL) -s -m 755 imtest $(DESTDIR)$(exec_prefix)/bin
853 + $(LIBTOOL) --mode=install $(INSTALL) imtest $(DESTDIR)$(exec_prefix)/bin
854 ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/pop3test
855 ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/nntptest
856 ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/lmtptest
858 $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
860 imtest: imtest.o $(DEPLIBS)
861 - $(CC) $(LDFLAGS) -o imtest imtest.o $(DEPLIBS) $(IMAP_LIBS)
862 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o imtest imtest.o $(DEPLIBS) $(IMAP_LIBS)
864 imtest.pure: imtest.o $(DEPLIBS)
865 - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o imtest $(OBJS) $(DEPLIBS) $(LIBS) $(IMAP_LIBS)
866 + $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o imtest $(OBJS) $(DEPLIBS) $(LIBS) $(IMAP_LIBS)
869 rm -f *.o Makefile.bak makedepend.log imtest
870 --- cyrus-imapd-2.3.8/notifyd/Makefile.in 2007-02-18 23:43:17.000000000 +0100
871 +++ cyrus-imapd-2.3.12p2/notifyd/Makefile.in 2008-09-23 21:41:12.911256605 +0300
877 +top_builddir = @top_builddir@
880 CYRUS_USER=@cyrus_user@
883 NOTIFYD_LIBS = @NOTIFYD_LIBS@
885 -SERVICE=../master/service.o
886 +SERVICE=../master/service.lo
888 IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
889 IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
890 LIB_WRAP = @LIB_WRAP@
891 LIBS = @ZEPHYR_LIBS@ @LIBS@ $(IMAP_COM_ERR_LIBS)
892 -DEPLIBS=../imap/mutex_fake.o ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
893 +DEPLIBS=../imap/mutex_fake.lo ../imap/libimap.la ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
895 PURIFY=/usr/local/bin/purify
899 - $(INSTALL) -m 755 notifyd $(DESTDIR)$(service_path)
900 + $(LIBTOOL) --mode=install $(INSTALL) notifyd $(DESTDIR)$(service_path)
902 OBJS= notifyd.o notify_null.o notify_log.o notify_mailto.o notify_zephyr.o
904 notifytest: notifytest.o
905 - $(CC) $(LDFLAGS) -o notifytest \
906 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o notifytest \
907 notifytest.o $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
909 notifyd: $(OBJS) $(SERVICE)
910 - $(CC) $(LDFLAGS) -o notifyd \
911 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o notifyd \
912 $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
914 notifyd.pure: $(OBJS) $(SERVICE)
915 $(PURIFY) $(PUREOPT) \
916 - $(CC) $(LDFLAGS) -o notifyd.pure \
917 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o notifyd.pure \
918 $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
920 $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
923 - rm -f notifyd notifytest *.o *.a *~ Makefile.bak makedepend.log
924 + rm -f notifyd notifytest *.lo *.la *~ Makefile.bak makedepend.log
930 ${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) *.c $(srcdir)/*.c 1>makedepend.log 2>&1
933 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
935 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
938 # DO NOT DELETE THIS LINE -- make depend depends on it.
939 --- cyrus-imapd-2.3.12p2/master/Makefile.in~ 2008-09-23 18:31:43.000000000 +0300
940 +++ cyrus-imapd-2.3.12p2/master/Makefile.in 2008-09-23 18:32:06.430769398 +0300
946 +top_builddir = @top_builddir@
948 CYRUS_USER=@cyrus_user@
949 CYRUS_GROUP=@cyrus_group@
953 LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
954 -LIBS = ../lib/libcyrus_min.a @LIB_UCDSNMP@ @LIBS@ @COM_ERR_LIBS@
955 +LIBS = ../lib/libcyrus_min.la @LIB_UCDSNMP@ @LIBS@ @COM_ERR_LIBS@
958 MAKEDEPEND = @MAKEDEPEND@
960 $(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
961 for file in $(PROGS); \
963 - $(INSTALL) -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
964 + $(LIBTOOL) --mode=install $(INSTALL) $$file $(DESTDIR)$(service_path) || exit 1; \
971 master: master.o masterconf.o cyrusMasterMIB.o ../lib/lock_@WITH_LOCK@.o
972 - $(CC) $(LDFLAGS) -o master master.o masterconf.o cyrusMasterMIB.o ../lib/lock_@WITH_LOCK@.o $(LIBS) $(DEPLIBS)
973 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o master master.o masterconf.o cyrusMasterMIB.o ../lib/lock_@WITH_LOCK@.o $(LIBS) $(DEPLIBS)
976 rm -f *.o *.a Makefile.bak $(PROGS)
977 --- cyrus-imapd-2.3.12p2/lib/Makefile.in~ 2008-09-23 18:31:43.000000000 +0300
978 +++ cyrus-imapd-2.3.12p2/lib/Makefile.in 2008-09-23 18:35:29.430522834 +0300
982 # Authorization namespace.
983 -AUTH=auth.o auth_krb.o auth_unix.o auth_krb5.o auth_pts.o
984 +AUTH=auth.lo auth_krb.lo auth_unix.lo auth_krb5.lo auth_pts.lo
986 # ACL interpretation. Only one choice for now:
991 top_srcdir = @top_srcdir@
997 +top_builddir = @top_builddir@
999 DEFS = @DEFS@ @LOCALDEFS@
1000 CPPFLAGS = -I.. @CPPFLAGS@ @COM_ERR_CPPFLAGS@ @SASLFLAGS@
1003 exec_prefix = @exec_prefix@
1004 cyrus_prefix = @cyrus_prefix@
1010 $(srcdir)/libcyr_cfg.h $(srcdir)/byteorder64.h \
1011 $(srcdir)/md5.h $(srcdir)/hmac-md5.h
1013 -LIBCYR_OBJS = acl.o bsearch.o charset.o glob.o retry.o util.o \
1014 - libcyr_cfg.o mkgmtime.o prot.o parseaddr.o imclient.o imparse.o \
1015 - lsort.o stristr.o rfc822date.o cyrusdb.o strhash.o \
1016 - chartable.o imapurl.o nonblock_@WITH_NONBLOCK@.o lock_@WITH_LOCK@.o \
1017 - gmtoff_@WITH_GMTOFF@.o map_@WITH_MAP@.o $(ACL) $(AUTH) \
1018 +LIBCYR_OBJS = acl.lo bsearch.lo charset.lo glob.lo retry.lo util.lo \
1019 + libcyr_cfg.lo mkgmtime.lo prot.lo parseaddr.lo imclient.lo imparse.lo \
1020 + lsort.lo stristr.lo rfc822date.lo cyrusdb.lo strhash.lo \
1021 + chartable.lo imapurl.lo nonblock_@WITH_NONBLOCK@.lo lock_@WITH_LOCK@.lo \
1022 + gmtoff_@WITH_GMTOFF@.lo map_@WITH_MAP@.lo $(ACL) $(AUTH) \
1023 @LIBOBJS@ @CYRUSDB_OBJS@ @MD5OBJ@ \
1024 - iptostring.o xmalloc.o wildmat.o byteorder64.o \
1025 - xstrlcat.o xstrlcpy.o
1026 + iptostring.lo xmalloc.lo wildmat.lo byteorder64.lo \
1027 + xstrlcat.lo xstrlcpy.lo
1029 LIBCYRM_HDRS = $(srcdir)/hash.h $(srcdir)/mpool.h $(srcdir)/xmalloc.h \
1030 $(srcdir)/xstrlcat.h $(srcdir)/xstrlcpy.h $(srcdir)/util.h \
1031 $(srcdir)/strhash.h $(srcdir)/libconfig.h $(srcdir)/assert.h \
1033 -LIBCYRM_OBJS = libconfig.o imapopts.o hash.o mpool.o xmalloc.o strhash.o \
1034 - xstrlcat.o xstrlcpy.o assert.o util.o @IPV6_OBJS@
1035 +LIBCYRM_OBJS = libconfig.lo imapopts.lo hash.lo mpool.lo xmalloc.lo strhash.lo \
1036 + xstrlcat.lo xstrlcpy.lo assert.lo util.lo @IPV6_OBJS@
1038 -all: $(BUILTSOURCES) libcyrus_min.a libcyrus.a
1039 +all: $(BUILTSOURCES) libcyrus_min.la libcyrus.la
1042 $(srcdir)/../install-sh -d $(DESTDIR)$(libdir)
1043 - $(INSTALL) -m 644 libcyrus.a $(DESTDIR)$(libdir)
1044 - $(INSTALL) -m 644 libcyrus_min.a $(DESTDIR)$(libdir)
1045 + $(LIBTOOL) --mode=install $(INSTALL) -m 644 libcyrus.la $(DESTDIR)$(libdir)
1046 + $(LIBTOOL) --mode=install $(INSTALL) -m 644 libcyrus_min.la $(DESTDIR)$(libdir)
1047 $(RANLIB) $(DESTDIR)$(libdir)/libcyrus.a
1048 for file in $(LIBCYR_HDRS); \
1050 @@ -120,19 +123,15 @@
1051 $(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/include/cyrus || exit 1; \
1055 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
1057 + $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
1060 -libcyrus.a: $(LIBCYR_OBJS)
1062 - ar cr libcyrus.a $(LIBCYR_OBJS)
1063 - $(RANLIB) libcyrus.a
1065 -libcyrus_min.a: $(LIBCYRM_OBJS)
1066 - rm -f libcyrus_min.a
1067 - ar cr libcyrus_min.a $(LIBCYRM_OBJS)
1068 - $(RANLIB) libcyrus_min.a
1069 +libcyrus.la: $(LIBCYR_OBJS) libcyrus_min.la
1070 + $(LIBTOOL) --mode=link --tag=CC $(CC) -o libcyrus.la $(LIBCYR_OBJS) libcyrus_min.la @LIBS@ @LIB_SASL@ -rpath $(libdir)
1072 +libcyrus_min.la: $(LIBCYRM_OBJS)
1073 + $(LIBTOOL) --mode=link --tag=CC $(CC) -o libcyrus_min.la $(LIBCYRM_OBJS) @IMAP_COM_ERR_LIBS@ -rpath $(libdir)
1075 imapopts.c: imapoptions $(srcdir)/../tools/config2header
1076 $(srcdir)/../tools/config2header CC="$(CC)" $(srcdir)/imapopts.c $(srcdir)/imapopts.h < $(srcdir)/imapoptions
1077 --- cyrus-imapd-2.3.8/depot/Makefile.in.wiget 2004-05-28 15:39:38.000000000 +0200
1078 +++ cyrus-imapd-2.3.8/depot/Makefile.in 2007-02-18 23:43:17.000000000 +0100
1081 CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@
1083 -DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
1084 +DEPLIBS = ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@