1 --- cyrus-imapd-2.3.8/ptclient/Makefile.in.wiget 2006-11-30 18:11:24.000000000 +0100
2 +++ cyrus-imapd-2.3.8/ptclient/Makefile.in 2007-02-18 23:43:17.000000000 +0100
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 +DEPLIBS = ../imap/libimap.a ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
18 UTIL_LIBS = ../imap/mutex_fake.o ../imap/cli_fatal.o
25 - $(INSTALL) -m 755 ptloader $(DESTDIR)$(service_path)
26 - $(INSTALL) -m 755 ptexpire $(DESTDIR)$(service_path)
27 - $(INSTALL) -m 755 ptdump $(DESTDIR)$(service_path)
28 + $(LIBTOOL) --mode=install $(INSTALL) ptloader $(DESTDIR)$(service_path)
29 + $(LIBTOOL) --mode=install $(INSTALL) ptexpire $(DESTDIR)$(service_path)
30 + $(LIBTOOL) --mode=install $(INSTALL) ptdump $(DESTDIR)$(service_path)
33 $(CC) -c $(CPPFLAGS) $(LDAP_CPPFLAGS) $(DEFS) $(CFLAGS) $<
35 ptloader: ptloader.o afskrb.o ldap.o ../imap/mutex_fake.o $(DEPLIBS)
36 - $(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)
37 + $(LIBTOOL) --mode=link $(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)
39 ptloader.pure: ptloader.o afskrb.o ldap.o ../imap/mutex_fake.o $(DEPLIBS)
40 - $(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)
41 + $(PURIFY) $(PUREARGS) $(LIBTOOL) --mode=link $(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)
43 ptexpire: ptexpire.o $(DEPLIBS) $(UTIL_LIBS)
44 - $(CC) $(LDFLAGS) -o $@ ptexpire.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_RT)
45 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ ptexpire.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_RT)
47 ptexpire.pure: ptexpire.o $(DEPLIBS) $(UTIL_LIBS)
48 - $(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ ptexpire.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
49 + $(PURIFY) $(PUREARGS) $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ ptexpire.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
51 ptdump: ptdump.o $(DEPLIBS) $(UTIL_LIBS)
52 - $(CC) $(LDFLAGS) -o $@ ptdump.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_RT)
53 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ ptdump.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_RT)
55 ptdump.pure: ptexpire.o $(DEPLIBS) $(UTIL_LIBS)
56 - $(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ ptdump.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
57 + $(PURIFY) $(PUREARGS) $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ ptdump.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
59 ptextract: ptextract.o $(DEPLIBS) $(UTIL_LIBS)
60 - $(CC) $(LDFLAGS) -o $@ ptextract.o $(UTIL_LIBS) $(DEPLIBS) $(LIBS)
61 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ ptextract.o $(UTIL_LIBS) $(DEPLIBS) $(LIBS)
64 rm -f *.o Makefile.bak $(PROGS) makedepend.log
65 --- cyrus-imapd-2.3.8/sieve/Makefile.in.wiget 2006-11-30 18:11:24.000000000 +0100
66 +++ cyrus-imapd-2.3.8/sieve/Makefile.in 2007-02-18 23:43:17.000000000 +0100
72 +top_builddir = @top_builddir@
73 COMPILE_ET = @COMPILE_ET@
75 DEFS = @DEFS@ @LOCALDEFS@
77 IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
78 IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
79 LIBS = libsieve.a $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS)
80 -DEPLIBS=../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
81 +DEPLIBS=../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
83 BUILT_SOURCES = addr.c addr.h addr-lex.c \
84 sieve.c sieve.h sieve-lex.c \
88 $(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
89 - $(srcdir)/../install-sh -c -m 755 sievec $(DESTDIR)$(service_path) || exit
90 + $(LIBTOOL) --mode=install $(srcdir)/../install-sh -c -m 755 sievec $(DESTDIR)$(service_path) || exit
92 test: $(DEPLIBS) libsieve.a test.o ../imap/message.o
93 - $(CC) $(LDFLAGS) -o test test.o ../imap/message.o \
94 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o test test.o ../imap/message.o \
95 libsieve.a $(DEPLIBS) $(LIBS)
101 sievec: sievec.o libsieve.a
102 - $(CC) $(LDFLAGS) -o sievec sievec.o libsieve.a $(DEPLIBS) $(LIBS)
103 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o sievec sievec.o libsieve.a $(DEPLIBS) $(LIBS)
105 sieved: sieved.o libsieve.a
106 - $(CC) $(LDFLAGS) -o sieved sieved.o libsieve.a $(DEPLIBS) $(LIBS)
107 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o sieved sieved.o libsieve.a $(DEPLIBS) $(LIBS)
110 sieve_interface.h: sieve_err.h
111 --- cyrus-imapd-2.3.12p2/netnews/Makefile.in~ 2008-09-23 18:00:16.000000000 +0300
112 +++ cyrus-imapd-2.3.12p2/netnews/Makefile.in 2008-09-23 18:01:26.824280572 +0300
118 +top_builddir = @top_builddir@
121 CPPFLAGS = -I.. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../com_err/et @CPPFLAGS@
122 LIBS = @IMAP_LIBS@ @LIB_RT@
123 -DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
124 +DEPLIBS = ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
132 - $(INSTALL) -s -m 755 remotepurge $(DESTDIR)$(service_path)
133 + $(LIBTOOL) --mode=install $(INSTALL) remotepurge $(DESTDIR)$(service_path)
136 $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
138 remotepurge: $(OBJS) $(DEPLIBS)
139 - $(CC) $(LDFLAGS) -o remotepurge $(OBJS) \
140 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o remotepurge $(OBJS) \
144 --- cyrus-imapd-2.3.8/timsieved/Makefile.in.wiget 2006-11-30 18:11:25.000000000 +0100
145 +++ cyrus-imapd-2.3.8/timsieved/Makefile.in 2007-02-18 23:43:17.000000000 +0100
151 +top_builddir = @top_builddir@
154 CYRUS_USER=@cyrus_user@
156 IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
157 LIB_WRAP = @LIB_WRAP@
158 LIBS = $(IMAP_COM_ERR_LIBS)
159 -DEPLIBS=../sieve/libsieve.a ../imap/mutex_fake.o ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
160 +DEPLIBS=../sieve/libsieve.a ../imap/mutex_fake.o ../imap/libimap.a ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
162 PURIFY=/usr/local/bin/purify
168 - $(INSTALL) -m 755 timsieved $(DESTDIR)$(service_path)
169 + $(LIBTOOL) --mode=install $(INSTALL) -m 755 timsieved $(DESTDIR)$(service_path)
171 OBJS= actions.o lex.o mystring.o scripttest.o timsieved.o parser.o \
174 timsieved: $(OBJS) $(SERVICE)
175 - $(CC) $(LDFLAGS) -o timsieved \
176 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o timsieved \
177 $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
179 timsieved.pure: $(OBJS) $(SERVICE)
180 $(PURIFY) $(PUREOPT) \
181 - $(CC) $(LDFLAGS) -o timsieved.pure \
182 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o timsieved.pure \
183 $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
186 --- cyrus-imapd-2.3.8/configure.in.wiget 2007-02-18 23:43:17.000000000 +0100
187 +++ cyrus-imapd-2.3.8/configure.in 2007-02-18 23:43:17.000000000 +0100
189 AC_DEFINE_UNQUOTED(SYSCONFDIR,"$sysconfdir",[Config File Location])
198 cyrus_cv_getaddrinfo=no)], cyrus_cv_getaddrinfo=no)
200 if test $cyrus_cv_getaddrinfo = no; then
201 - IPV6_OBJS="getaddrinfo.o"
202 + IPV6_OBJS="getaddrinfo.lo"
205 cyrus_cv_getnameinfo=yes
207 cyrus_cv_getnameinfo=no)
209 if test $cyrus_cv_getnameinfo = no; then
210 - IPV6_OBJS="$IPV6_OBJS getnameinfo.o"
211 + IPV6_OBJS="$IPV6_OBJS getnameinfo.lo"
214 IPv6_CHECK_SS_FAMILY()
216 dnl function for doing each of the database backends
217 dnl parameters: backend name, variable to set, withval
219 -CYRUSDB_OBJS="cyrusdb_flat.o cyrusdb_skiplist.o cyrusdb_quotalegacy.o"
220 +CYRUSDB_OBJS="cyrusdb_flat.lo cyrusdb_skiplist.lo cyrusdb_quotalegacy.lo"
222 dnl Berkeley DB Detection
225 LIBS="${LIBS} ${BDB_LIBADD}"
226 CPPFLAGS="${BDB_INCADD} ${CPPFLAGS}"
228 - CYRUSDB_OBJS="$CYRUSDB_OBJS cyrusdb_berkeley.o"
229 + CYRUSDB_OBJS="$CYRUSDB_OBJS cyrusdb_berkeley.lo"
230 AC_DEFINE(HAVE_BDB,[],[Build in Berkeley DB support?])
234 dnl Check for MD5 functions
235 AC_FUNC_CHECK(MD5Init,,
236 AC_CHECK_LIB(md, MD5Init, LIBS="${LIBS} -lmd",
242 --- cyrus-imapd-2.3.12p2/imap/Makefile.in~ 2008-09-23 18:02:00.000000000 +0300
243 +++ cyrus-imapd-2.3.12p2/imap/Makefile.in 2008-09-23 18:30:40.169774729 +0300
244 @@ -186,171 +186,171 @@
247 idled: idled.o mutex_fake.o libimap.a $(DEPLIBS)
248 - $(CC) $(LDFLAGS) -o idled \
249 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o idled \
250 idled.o mutex_fake.o libimap.a $(DEPLIBS) $(LIBS)
252 lmtpd: lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.o \
253 libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
254 - $(CC) $(LDFLAGS) -o lmtpd \
255 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o lmtpd \
256 $(SERVICE) lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \
257 mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
259 lmtpd.pure: lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \
260 mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
261 - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o lmtpd.pure \
262 + $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o lmtpd.pure \
263 $(SERVICE) lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \
264 mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP)
266 imapd: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
267 - $(CC) $(LDFLAGS) -o imapd \
268 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o imapd \
269 $(SERVICE) $(IMAPDOBJS) mutex_fake.o \
270 libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
272 imapd.pure: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
273 - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o imapd.pure \
274 + $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o imapd.pure \
275 $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \
276 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
278 imapd.quant: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
279 - $(QUANTIFY) $(QUANTOPT) $(CC) $(LDFLAGS) -o imapd.quant \
280 + $(QUANTIFY) $(QUANTOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o imapd.quant \
281 $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \
282 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
284 mupdate: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o tls.o \
286 - $(CC) $(LDFLAGS) -o mupdate \
287 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o mupdate \
288 $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
289 mutex_pthread.o tls.o libimap.a \
290 $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
292 mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o \
294 - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o mupdate.pure \
295 + $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o mupdate.pure \
296 $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
297 mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
299 pop3d: pop3d.o proxy.o backend.o tls.o mutex_fake.o libimap.a \
300 $(DEPLIBS) $(SERVICE)
301 - $(CC) $(LDFLAGS) -o pop3d pop3d.o proxy.o backend.o tls.o $(SERVICE) \
302 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o pop3d pop3d.o proxy.o backend.o tls.o $(SERVICE) \
303 mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
305 nntpd: nntpd.o proxy.o backend.o index.o smtpclient.o spool.o tls.o \
306 mutex_fake.o nntp_err.o libimap.a $(DEPLIBS) $(SERVICE)
307 - $(CC) $(LDFLAGS) -o nntpd nntpd.o proxy.o backend.o index.o spool.o \
308 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o nntpd nntpd.o proxy.o backend.o index.o spool.o \
309 smtpclient.o tls.o $(SERVICE) mutex_fake.o nntp_err.o \
310 libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
312 fud: fud.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE)
313 - $(CC) $(LDFLAGS) -o fud $(SERVICE) fud.o mutex_fake.o libimap.a \
314 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o fud $(SERVICE) fud.o mutex_fake.o libimap.a \
315 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
317 smmapd: smmapd.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE)
318 - $(CC) $(LDFLAGS) -o smmapd $(SERVICE) smmapd.o mutex_fake.o libimap.a \
319 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o smmapd $(SERVICE) smmapd.o mutex_fake.o libimap.a \
320 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
322 sync_server: sync_server.o sync_support.o sync_commit.o \
323 imapparse.o tls.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE)
324 - $(CC) $(LDFLAGS) -o \
325 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
326 sync_server sync_server.o sync_support.o sync_commit.o \
327 imapparse.o tls.o $(SERVICE) libimap.a mutex_fake.o \
328 $(DEPLIBS) $(LIBS) $(LIB_WRAP)
330 ### Command Line Utilities
331 arbitron: arbitron.o $(CLIOBJS) libimap.a $(DEPLIBS)
332 - $(CC) $(LDFLAGS) -o arbitron arbitron.o $(CLIOBJS) \
333 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o arbitron arbitron.o $(CLIOBJS) \
334 libimap.a $(DEPLIBS) $(LIBS)
336 cyr_dbtool: cyr_dbtool.o mutex_fake.o libimap.a $(DEPLIBS)
337 - $(CC) $(LDFLAGS) -o cyr_dbtool cyr_dbtool.o $(CLIOBJS) \
338 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o cyr_dbtool cyr_dbtool.o $(CLIOBJS) \
339 libimap.a $(DEPLIBS) $(LIBS)
341 cyr_synclog: cyr_synclog.o mutex_fake.o libimap.a $(DEPLIBS)
342 - $(CC) $(LDFLAGS) -o cyr_synclog cyr_synclog.o $(CLIOBJS) \
343 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o cyr_synclog cyr_synclog.o $(CLIOBJS) \
344 libimap.a $(DEPLIBS) $(LIBS)
346 cvt_cyrusdb: cvt_cyrusdb.o mutex_fake.o libimap.a $(DEPLIBS)
347 - $(CC) $(LDFLAGS) -o cvt_cyrusdb cvt_cyrusdb.o $(CLIOBJS) \
348 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o cvt_cyrusdb cvt_cyrusdb.o $(CLIOBJS) \
349 libimap.a $(DEPLIBS) $(LIBS)
351 chk_cyrus: chk_cyrus.o mutex_fake.o libimap.a $(DEPLIBS)
352 - $(CC) $(LDFLAGS) -o chk_cyrus chk_cyrus.o $(CLIOBJS) \
353 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o chk_cyrus chk_cyrus.o $(CLIOBJS) \
354 libimap.a $(DEPLIBS) $(LIBS)
356 deliver: deliver.o $(LMTPOBJS) proxy.o mutex_fake.o libimap.a $(DEPLIBS)
357 - $(CC) $(LDFLAGS) -o deliver deliver.o $(LMTPOBJS) proxy.o \
358 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o deliver deliver.o $(LMTPOBJS) proxy.o \
359 mutex_fake.o libimap.a $(DEPLIBS) $(LIBS)
361 ctl_deliver: ctl_deliver.o $(CLIOBJS) libimap.a $(DEPLIBS)
362 - $(CC) $(LDFLAGS) -o \
363 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
364 $@ ctl_deliver.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
366 ctl_mboxlist: ctl_mboxlist.o mupdate-client.o $(CLIOBJS) libimap.a $(DEPLIBS)
367 - $(CC) $(LDFLAGS) -o $@ ctl_mboxlist.o mupdate-client.o $(CLIOBJS) \
368 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ctl_mboxlist.o mupdate-client.o $(CLIOBJS) \
369 libimap.a $(DEPLIBS) $(LIBS)
371 ctl_cyrusdb: ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS)
372 - $(CC) $(LDFLAGS) -o \
373 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
374 $@ ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
376 cyr_expire: cyr_expire.o $(CLIOBJS) libimap.a $(DEPLIBS)
377 - $(CC) $(LDFLAGS) -o $@ cyr_expire.o $(CLIOBJS) \
378 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ cyr_expire.o $(CLIOBJS) \
379 libimap.a $(DEPLIBS) $(LIBS)
381 fetchnews: fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS)
382 - $(CC) $(LDFLAGS) -o \
383 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
384 $@ fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
386 squatter: squatter.o index.o squat_build.o $(CLIOBJS) libimap.a $(DEPLIBS)
387 - $(CC) $(LDFLAGS) -o squatter squatter.o index.o squat_build.o \
388 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o squatter squatter.o index.o squat_build.o \
389 $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
391 mbpath: mbpath.o $(CLIOBJS) libimap.a $(DEPLIBS)
392 - $(CC) $(LDFLAGS) -o mbpath mbpath.o $(CLIOBJS) libimap.a \
393 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o mbpath mbpath.o $(CLIOBJS) libimap.a \
396 ipurge: ipurge.o $(CLIOBJS) libimap.a $(DEPLIBS)
397 - $(CC) $(LDFLAGS) -o ipurge ipurge.o $(CLIOBJS) \
398 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o ipurge ipurge.o $(CLIOBJS) \
399 libimap.a $(DEPLIBS) $(LIBS)
401 cyrdump: cyrdump.o index.o $(CLIOBJS) libimap.a $(DEPLIBS)
402 - $(CC) $(LDFLAGS) -o cyrdump cyrdump.o index.o $(CLIOBJS) \
403 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o cyrdump cyrdump.o index.o $(CLIOBJS) \
404 libimap.a $(DEPLIBS) $(LIBS)
406 mbexamine: mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS)
407 - $(CC) $(LDFLAGS) -o \
408 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
409 mbexamine mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
411 reconstruct: reconstruct.o $(CLIOBJS) libimap.a $(DEPLIBS)
412 - $(CC) $(LDFLAGS) -o \
413 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
414 reconstruct reconstruct.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
416 quota: quota.o $(CLIOBJS) libimap.a $(DEPLIBS)
417 - $(CC) $(LDFLAGS) -o quota quota.o $(CLIOBJS) \
418 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o quota quota.o $(CLIOBJS) \
419 libimap.a $(DEPLIBS) $(LIBS)
421 tls_prune: tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS)
422 - $(CC) $(LDFLAGS) -o \
423 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
424 $@ tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
426 unexpunge: unexpunge.o $(CLIOBJS) libimap.a $(DEPLIBS)
427 - $(CC) $(LDFLAGS) -o $@ unexpunge.o $(CLIOBJS) \
428 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ unexpunge.o $(CLIOBJS) \
429 libimap.a $(DEPLIBS) $(LIBS)
431 make_md5: make_md5.o libimap.a mutex_fake.o $(DEPLIBS)
432 - $(CC) $(LDFLAGS) -o make_md5 make_md5.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS)
433 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o make_md5 make_md5.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS)
435 make_sha1: make_sha1.o libimap.a mutex_fake.o $(DEPLIBS)
436 - $(CC) $(LDFLAGS) -o make_sha1 make_sha1.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS)
437 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o make_sha1 make_sha1.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS)
439 sync_client: sync_client.o sync_support.o \
440 backend.o tls.o imapparse.o libimap.a mutex_fake.o $(DEPLIBS)
441 - $(CC) $(LDFLAGS) -o \
442 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
443 sync_client sync_client.o sync_support.o \
444 backend.o tls.o imapparse.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS)
446 sync_reset: sync_reset.o sync_support.o sync_commit.o \
447 libimap.a mutex_fake.o $(DEPLIBS)
448 - $(CC) $(LDFLAGS) -o \
449 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \
450 sync_reset sync_reset.o sync_support.o sync_commit.o \
451 libimap.a mutex_fake.o $(DEPLIBS) $(LIBS)
453 --- cyrus-imapd-2.3.8/installsieve/Makefile.in.wiget 2003-10-22 20:50:11.000000000 +0200
454 +++ cyrus-imapd-2.3.8/installsieve/Makefile.in 2007-02-18 23:43:17.000000000 +0100
460 +top_builddir = @top_builddir@
463 CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @SASLFLAGS@
466 IMAP_LIBS = @IMAP_LIBS@
468 -DEPLIBS= ../lib/libcyrus.a @DEPLIBS@
469 +DEPLIBS= ../lib/libcyrus.la @DEPLIBS@
472 exec_prefix = @exec_prefix@
477 - $(INSTALL) -s -m 755 installsieve $(DESTDIR)$(exec_prefix)/bin
478 + $(LIBTOOL) --mode=install $(INSTALL) installsieve $(DESTDIR)$(exec_prefix)/bin
480 OBJS=lex.o mystring.o request.o isieve.o
483 $(RANLIB) libinstallsieve.a
485 installsieve: libinstallsieve.a installscript.o $(DEPLIBS)
486 - $(CC) $(LDFLAGS) -o installsieve libinstallsieve.a installscript.o $(DEPLIBS) $(IMAP_LIBS)
487 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o installsieve libinstallsieve.a installscript.o $(DEPLIBS) $(IMAP_LIBS)
490 rm -f *.o *.a Makefile.bak makedepend.log
491 --- cyrus-imapd-2.3.8/perl/sieve/managesieve/Makefile.PL.wiget 2006-11-30 18:11:24.000000000 +0100
492 +++ cyrus-imapd-2.3.8/perl/sieve/managesieve/Makefile.PL 2007-02-18 23:43:17.000000000 +0100
494 'NAME' => 'Cyrus::SIEVE::managesieve',
495 'ABSTRACT' => 'Cyurs Sieve management interface',
496 'VERSION_FROM' => 'managesieve.pm', # finds $VERSION
497 - 'MYEXTLIB' => '../lib/isieve.o ../lib/lex.o ../lib/mystring.o ../lib/request.o ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a',
498 - 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT -lssl -lcrypto"],
499 + 'MYEXTLIB' => '../lib/.libs/isieve.o ../lib/.libs/lex.o ../lib/.libs/mystring.o ../lib/.libs/request.o',
500 + 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT -lssl -lcrypto -L../../../lib/.libs -lcyrus -lcyrus_min"],
501 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING'
502 'INC' => "-I../lib/ -I../../../lib/ $SASL_INC $OPENSSL_INC",
504 --- cyrus-imapd-2.3.8/perl/sieve/managesieve/managesieve.xs.wiget 2006-11-30 18:11:24.000000000 +0100
505 +++ cyrus-imapd-2.3.8/perl/sieve/managesieve/managesieve.xs 2007-02-18 23:43:17.000000000 +0100
507 croak("failure: %s", s);
510 +const int config_need_data = 0;
513 perlsieve_getpass(conn, context, id, psecret)
514 --- cyrus-imapd-2.3.8/perl/sieve/lib/Makefile.in.wiget 2006-11-30 18:11:24.000000000 +0100
515 +++ cyrus-imapd-2.3.8/perl/sieve/lib/Makefile.in 2007-02-18 23:43:17.000000000 +0100
521 +top_builddir = @top_builddir@
523 DEFS = @DEFS@ @LOCALDEFS@ -Dbool=char -DHAS_BOOL
524 CPPFLAGS = -I. -I../../.. -I$(srcdir) -I$(srcdir)/../../../lib @CPPFLAGS@ @DYNSASLFLAGS@ @COM_ERR_CPPFLAGS@
525 -LIBS = ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a @LIB_DYN_SASL@ @LIBS@
526 +LIBS = ../../../lib/libcyrus.la ../../../lib/libcyrus_min.la @LIB_DYN_SASL@ @LIBS@
527 IMAP_LIBS = @IMAP_LIBS@
528 -DEPLIBS = ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a @DEPLIBS@
529 +DEPLIBS = ../../../lib/libcyrus.la ../../../lib/libcyrus_min.la @DEPLIBS@
531 MAKEDEPEND_CFLAGS = @CFLAGS@
532 CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
534 exec_prefix = @exec_prefix@
535 cyrus_prefix = @cyrus_prefix@
537 -OBJS=isieve.o lex.o mystring.o request.o
538 +OBJS=isieve.lo lex.lo mystring.lo request.lo
546 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
548 + $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
550 -libisieve.a: $(OBJS)
552 - ar cr libisieve.a $(OBJS)
553 - $(RANLIB) libisieve.a
554 +libisieve.la: $(OBJS)
555 + $(LIBTOOL) --mode=link $(CC) -o libisievie.la $(OBJS)
558 rm -f *.o Makefile.bak makedepend.log libisieve.a
559 --- cyrus-imapd-2.3.8/perl/imap/IMAP.xs.wiget 2006-11-30 18:11:23.000000000 +0100
560 +++ cyrus-imapd-2.3.8/perl/imap/IMAP.xs 2007-02-18 23:43:17.000000000 +0100
565 +const int config_need_data = 0;
568 * Decrement the refcounts of the Perl SV's in the passed rock, then free the
569 --- cyrus-imapd-2.3.8/perl/imap/Makefile.PL.wiget 2006-11-30 18:11:23.000000000 +0100
570 +++ cyrus-imapd-2.3.8/perl/imap/Makefile.PL 2007-02-18 23:43:17.000000000 +0100
572 'macro' => {'IMCLIENT_LIBS' => ''}, # hack
573 'clean' => {'FILES' => 'libcyrperl.a cyradm'},
574 'OBJECT' => 'IMAP.o',
575 - 'MYEXTLIB' => '../../lib/libcyrus.a ../../lib/libcyrus_min.a',
576 - 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT -lssl -lcrypto"],
577 + 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT -lssl -lcrypto -L../../lib/.libs -lcyrus -lcyrus_min"],
578 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING'
579 'INC' => "-I../../lib -I../.. -I../../et $SASL_INC $OPENSSL_INC",
580 'EXE_FILES' => [cyradm],
581 --- cyrus-imapd-2.3.8/imtest/imtest.c.wiget 2006-11-30 18:11:22.000000000 +0100
582 +++ cyrus-imapd-2.3.8/imtest/imtest.c 2007-02-18 23:43:17.000000000 +0100
587 +/* config.c stuff */
588 +const int config_need_data = 0;
590 int mysasl_config(void *context __attribute__((unused)),
591 const char *plugin_name,
593 --- cyrus-imapd-2.3.8/imtest/Makefile.in.wiget 2006-11-30 18:11:22.000000000 +0100
594 +++ cyrus-imapd-2.3.8/imtest/Makefile.in 2007-02-18 23:43:17.000000000 +0100
600 +top_builddir = @top_builddir@
602 DEFS = @DEFS@ @LOCALDEFS@
603 CPPFLAGS = -I.. -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
605 IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
606 -DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
607 +DEPLIBS = ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
610 LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
615 - $(INSTALL) -s -m 755 imtest $(DESTDIR)$(exec_prefix)/bin
616 + $(LIBTOOL) --mode=install $(INSTALL) imtest $(DESTDIR)$(exec_prefix)/bin
617 ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/pop3test
618 ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/nntptest
619 ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/lmtptest
621 $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
623 imtest: imtest.o $(DEPLIBS)
624 - $(CC) $(LDFLAGS) -o imtest imtest.o $(DEPLIBS) $(IMAP_LIBS)
625 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o imtest imtest.o $(DEPLIBS) $(IMAP_LIBS)
627 imtest.pure: imtest.o $(DEPLIBS)
628 - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o imtest $(OBJS) $(DEPLIBS) $(LIBS) $(IMAP_LIBS)
629 + $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o imtest $(OBJS) $(DEPLIBS) $(LIBS) $(IMAP_LIBS)
632 rm -f *.o Makefile.bak makedepend.log imtest
633 --- cyrus-imapd-2.3.8/notifyd/Makefile.in.wiget 2006-11-30 18:11:23.000000000 +0100
634 +++ cyrus-imapd-2.3.8/notifyd/Makefile.in 2007-02-18 23:43:17.000000000 +0100
640 +top_builddir = @top_builddir@
643 CYRUS_USER=@cyrus_user@
645 IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
646 LIB_WRAP = @LIB_WRAP@
647 LIBS = @ZEPHYR_LIBS@ @LIBS@ $(IMAP_COM_ERR_LIBS)
648 -DEPLIBS=../imap/mutex_fake.o ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
649 +DEPLIBS=../imap/mutex_fake.o ../imap/libimap.a ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@
651 PURIFY=/usr/local/bin/purify
657 - $(INSTALL) -m 755 notifyd $(DESTDIR)$(service_path)
658 + $(LIBTOOL) --mode=install $(INSTALL) notifyd $(DESTDIR)$(service_path)
660 OBJS= notifyd.o notify_null.o notify_log.o notify_mailto.o notify_zephyr.o
662 notifytest: notifytest.o
663 - $(CC) $(LDFLAGS) -o notifytest \
664 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o notifytest \
665 notifytest.o $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
667 notifyd: $(OBJS) $(SERVICE)
668 - $(CC) $(LDFLAGS) -o notifyd \
669 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o notifyd \
670 $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
672 notifyd.pure: $(OBJS) $(SERVICE)
673 $(PURIFY) $(PUREOPT) \
674 - $(CC) $(LDFLAGS) -o notifyd.pure \
675 + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o notifyd.pure \
676 $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
679 --- cyrus-imapd-2.3.12p2/master/Makefile.in~ 2008-09-23 18:31:43.000000000 +0300
680 +++ cyrus-imapd-2.3.12p2/master/Makefile.in 2008-09-23 18:32:06.430769398 +0300
686 +top_builddir = @top_builddir@
688 CYRUS_USER=@cyrus_user@
689 CYRUS_GROUP=@cyrus_group@
693 LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
694 -LIBS = ../lib/libcyrus_min.a @LIB_UCDSNMP@ @LIBS@ @COM_ERR_LIBS@
695 +LIBS = ../lib/libcyrus_min.la @LIB_UCDSNMP@ @LIBS@ @COM_ERR_LIBS@
698 MAKEDEPEND = @MAKEDEPEND@
700 $(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
701 for file in $(PROGS); \
703 - $(INSTALL) -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
704 + $(LIBTOOL) --mode=install $(INSTALL) $$file $(DESTDIR)$(service_path) || exit 1; \
711 master: master.o masterconf.o cyrusMasterMIB.o ../lib/lock_@WITH_LOCK@.o
712 - $(CC) $(LDFLAGS) -o master master.o masterconf.o cyrusMasterMIB.o ../lib/lock_@WITH_LOCK@.o $(LIBS) $(DEPLIBS)
713 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o master master.o masterconf.o cyrusMasterMIB.o ../lib/lock_@WITH_LOCK@.o $(LIBS) $(DEPLIBS)
716 rm -f *.o *.a Makefile.bak $(PROGS)
717 --- cyrus-imapd-2.3.12p2/lib/Makefile.in~ 2008-09-23 18:31:43.000000000 +0300
718 +++ cyrus-imapd-2.3.12p2/lib/Makefile.in 2008-09-23 18:35:29.430522834 +0300
722 # Authorization namespace.
723 -AUTH=auth.o auth_krb.o auth_unix.o auth_krb5.o auth_pts.o
724 +AUTH=auth.lo auth_krb.lo auth_unix.lo auth_krb5.lo auth_pts.lo
726 # ACL interpretation. Only one choice for now:
731 top_srcdir = @top_srcdir@
737 +top_builddir = @top_builddir@
739 DEFS = @DEFS@ @LOCALDEFS@
740 CPPFLAGS = -I.. @CPPFLAGS@ @COM_ERR_CPPFLAGS@ @SASLFLAGS@
743 exec_prefix = @exec_prefix@
744 cyrus_prefix = @cyrus_prefix@
750 $(srcdir)/libcyr_cfg.h $(srcdir)/byteorder64.h \
751 $(srcdir)/md5.h $(srcdir)/hmac-md5.h
753 -LIBCYR_OBJS = acl.o bsearch.o charset.o glob.o retry.o util.o \
754 - libcyr_cfg.o mkgmtime.o prot.o parseaddr.o imclient.o imparse.o \
755 - lsort.o stristr.o rfc822date.o cyrusdb.o strhash.o \
756 - chartable.o imapurl.o nonblock_@WITH_NONBLOCK@.o lock_@WITH_LOCK@.o \
757 - gmtoff_@WITH_GMTOFF@.o map_@WITH_MAP@.o $(ACL) $(AUTH) \
758 +LIBCYR_OBJS = acl.lo bsearch.lo charset.lo glob.lo retry.lo util.lo \
759 + libcyr_cfg.lo mkgmtime.lo prot.lo parseaddr.lo imclient.lo imparse.lo \
760 + lsort.lo stristr.lo rfc822date.lo cyrusdb.lo strhash.lo \
761 + chartable.lo imapurl.lo nonblock_@WITH_NONBLOCK@.lo lock_@WITH_LOCK@.lo \
762 + gmtoff_@WITH_GMTOFF@.lo map_@WITH_MAP@.lo $(ACL) $(AUTH) \
763 @LIBOBJS@ @CYRUSDB_OBJS@ @MD5OBJ@ \
764 - iptostring.o xmalloc.o wildmat.o byteorder64.o \
765 - xstrlcat.o xstrlcpy.o
766 + iptostring.lo xmalloc.lo wildmat.lo byteorder64.lo \
767 + xstrlcat.lo xstrlcpy.lo
769 LIBCYRM_HDRS = $(srcdir)/hash.h $(srcdir)/mpool.h $(srcdir)/xmalloc.h \
770 $(srcdir)/xstrlcat.h $(srcdir)/xstrlcpy.h $(srcdir)/util.h \
771 $(srcdir)/strhash.h $(srcdir)/libconfig.h $(srcdir)/assert.h \
773 -LIBCYRM_OBJS = libconfig.o imapopts.o hash.o mpool.o xmalloc.o strhash.o \
774 - xstrlcat.o xstrlcpy.o assert.o util.o @IPV6_OBJS@
775 +LIBCYRM_OBJS = libconfig.lo imapopts.lo hash.lo mpool.lo xmalloc.lo strhash.lo \
776 + xstrlcat.lo xstrlcpy.lo assert.lo util.lo @IPV6_OBJS@
778 -all: $(BUILTSOURCES) libcyrus_min.a libcyrus.a
779 +all: $(BUILTSOURCES) libcyrus_min.la libcyrus.la
782 $(srcdir)/../install-sh -d $(DESTDIR)$(libdir)
783 - $(INSTALL) -m 644 libcyrus.a $(DESTDIR)$(libdir)
784 - $(INSTALL) -m 644 libcyrus_min.a $(DESTDIR)$(libdir)
785 + $(LIBTOOL) --mode=install $(INSTALL) -m 644 libcyrus.la $(DESTDIR)$(libdir)
786 + $(LIBTOOL) --mode=install $(INSTALL) -m 644 libcyrus_min.la $(DESTDIR)$(libdir)
787 $(RANLIB) $(DESTDIR)$(libdir)/libcyrus.a
788 for file in $(LIBCYR_HDRS); \
790 @@ -120,19 +123,15 @@
791 $(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/include/cyrus || exit 1; \
795 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
797 + $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
800 -libcyrus.a: $(LIBCYR_OBJS)
802 - ar cr libcyrus.a $(LIBCYR_OBJS)
803 - $(RANLIB) libcyrus.a
805 -libcyrus_min.a: $(LIBCYRM_OBJS)
806 - rm -f libcyrus_min.a
807 - ar cr libcyrus_min.a $(LIBCYRM_OBJS)
808 - $(RANLIB) libcyrus_min.a
809 +libcyrus.la: $(LIBCYR_OBJS) libcyrus_min.la
810 + $(LIBTOOL) --mode=link $(CC) -o libcyrus.la $(LIBCYR_OBJS) libcyrus_min.la @LIBS@ @LIB_SASL@ -rpath $(libdir)
812 +libcyrus_min.la: $(LIBCYRM_OBJS)
813 + $(LIBTOOL) --mode=link $(CC) -o libcyrus_min.la $(LIBCYRM_OBJS) @IMAP_COM_ERR_LIBS@ -rpath $(libdir)
815 imapopts.c: imapoptions $(srcdir)/../tools/config2header
816 $(srcdir)/../tools/config2header CC="$(CC)" $(srcdir)/imapopts.c $(srcdir)/imapopts.h < $(srcdir)/imapoptions
817 --- cyrus-imapd-2.3.8/depot/Makefile.in.wiget 2004-05-28 15:39:38.000000000 +0200
818 +++ cyrus-imapd-2.3.8/depot/Makefile.in 2007-02-18 23:43:17.000000000 +0100
821 CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@
823 -DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
824 +DEPLIBS = ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@