1 --- cyrus-imapd-2.4.4/com_err/et/Makefile.in 2010-11-30 07:53:22.181949458 +0200
2 +++ cyrus-imapd-2.4.4-shared-patch//com_err/et/Makefile.in 2010-11-29 09:02:12.537952808 +0200
7 +top_builddir = @top_builddir@
22 - $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I$(srcdir)/../../lib -I. -I../.. $(CFLAGS) $<
24 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I$(srcdir)/../../lib -I. -I../.. $(CFLAGS) $<
26 # solaris make loses on com_err.c but not on init_et.c, but this helps
29 $(CP) $(srcdir)/et_h.lawk et_h.lawk
32 - rm -f compile_et compile_et.lo error_table.lo
35 + rm -rf .libs *.la *.lo compile_et $(LIBOBJS)
38 - rm -f compile_et compile_et.lo error_table.lo
45 ## install_library_target(com_err,$(LIBOBJS),$(LINTFILES),)
47 libcom_err.la: $(LIBOBJS)
49 - $(ARCHIVE) $@ $(LIBOBJS)
51 + $(LIBTOOL) --mode=link --tag=CC $(CC) -o $@ $(LIBOBJS)
54 -# $(INSTALLLIB) libcom_err.la $(DESTDIR)$(LIBDIR)/libcom_err.la
55 -# $(CHMOD) 644 $(DESTDIR)$(LIBDIR)/libcom_err.la
56 -# $(RANLIB) $(DESTDIR)$(LIBDIR)/libcom_err.la
57 -# $(CHMOD) 444 $(DESTDIR)$(LIBDIR)/libcom_err.la
58 +# $(LIBTOOL) --mode=install $(INSTALL) -m 644 libcom_err.la $(DESTDIR)$(LIBDIR)
61 libcom_err.lo: $(LIBOBJS)
63 - chmod -x libcom_err.lo
64 + $(LIBTOOL) --mode=link --tag=CC ld -r -s -o $@ $?
66 TAGS: et_name.c error_message.c compile_et.c error_table.c \
68 --- cyrus-imapd-2.4.4/configure.in 2010-11-30 07:53:22.188617226 +0200
69 +++ cyrus-imapd-2.4.4-shared-patch//configure.in 2010-11-30 07:56:42.315002988 +0200
71 AC_DEFINE_UNQUOTED(SYSCONFDIR,"$sysconfdir",[Config File Location])
79 --- cyrus-imapd-2.4.4/depot/Makefile.in 2010-11-30 07:53:22.195284994 +0200
80 +++ cyrus-imapd-2.4.4-shared-patch//depot/Makefile.in 2010-11-29 09:03:17.505292828 +0200
85 +top_builddir = @top_builddir@
94 CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@
96 $(INSTALL) -m 644 $(srcdir)/rc.local.imap $(DESTDIR)etc
97 $(INSTALL) -m 644 $(srcdir)/rc.local.ptclient $(DESTDIR)etc
100 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
102 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
105 - rm -f *.lo Makefile.bak makedepend.log
106 + rm -rf .libs *.lo Makefile.bak makedepend.log
110 --- cyrus-imapd-2.4.4/imap/Makefile.in 2010-11-30 07:53:22.195284994 +0200
111 +++ cyrus-imapd-2.4.4-shared-patch//imap/Makefile.in 2010-11-29 08:33:40.489840319 +0200
115 top_srcdir = @top_srcdir@
116 +top_builddir = @top_builddir@
125 CYRUS_USER=@cyrus_user@
126 CYRUS_GROUP=@cyrus_group@
127 @@ -133,22 +135,20 @@
128 $(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
129 for file in $(PROGS); \
131 - $(INSTALL) -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
132 + $(LIBTOOL) --mode=install $(INSTALL) -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
134 ln -f $(DESTDIR)$(service_path)/pop3d $(DESTDIR)$(service_path)/pop3proxyd
135 ln -f $(DESTDIR)$(service_path)/imapd $(DESTDIR)$(service_path)/proxyd
136 ln -f $(DESTDIR)$(service_path)/lmtpd $(DESTDIR)$(service_path)/lmtpproxyd
139 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
141 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
148 - ar cr libimap.la $(LOBJS)
149 - $(RANLIB) libimap.la
150 + $(LIBTOOL) --mode=link --tag=CC $(CC) -o $@ $(LOBJS)
152 ### Built Source Files
154 @@ -181,185 +181,185 @@
157 idled: idled.lo mutex_fake.lo libimap.la $(DEPLIBS)
158 - $(CC) $(LDFLAGS) -o $@ $? \
159 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
162 lmtpd: lmtpd.lo proxy.lo $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.lo \
163 libimap.la $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
164 - $(CC) $(LDFLAGS) -o $@ $? \
165 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
168 lmtpd.pure: lmtpd.lo proxy.lo $(LMTPOBJS) $(SIEVE_OBJS) \
169 mutex_fake.lo libimap.la $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE)
170 - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o $@ $? \
171 + $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
174 imapd: $(IMAPDOBJS) mutex_fake.lo libimap.la $(DEPLIBS) $(SERVICE)
175 - $(CC) $(LDFLAGS) -o $@ $? \
176 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
179 imapd.pure: $(IMAPDOBJS) mutex_fake.lo libimap.la $(DEPLIBS) $(SERVICE)
180 - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o $@ $? \
181 + $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
184 imapd.quant: $(IMAPDOBJS) mutex_fake.lo libimap.la $(DEPLIBS) $(SERVICE)
185 - $(QUANTIFY) $(QUANTOPT) $(CC) $(LDFLAGS) -o $@ $? \
186 + $(QUANTIFY) $(QUANTOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
189 mupdate: mupdate.lo mupdate-slave.lo mupdate-client.lo mutex_pthread.lo tls.lo \
190 libimap.la $(DEPLIBS)
191 - $(CC) $(LDFLAGS) -o $@ $? \
192 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
194 $(LIBS) $(LIB_WRAP) -lpthread
196 mupdate.pure: mupdate.lo mupdate-slave.lo mupdate-client.lo mutex_pthread.lo \
197 libimap.la $(DEPLIBS)
198 - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o $@ $? \
199 + $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
201 $(LIBS) $(LIB_WRAP) -lpthread
203 pop3d: pop3d.lo proxy.lo backend.lo tls.lo mutex_fake.lo libimap.la \
204 $(DEPLIBS) $(SERVICE)
205 - $(CC) $(LDFLAGS) -o $@ $? \
206 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
209 nntpd: nntpd.lo proxy.lo backend.lo index.lo smtpclient.lo spool.lo tls.lo \
210 mutex_fake.lo nntp_err.lo libimap.la $(DEPLIBS) $(SERVICE)
211 - $(CC) $(LDFLAGS) -o $@ $? \
212 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
215 fud: fud.lo libimap.la mutex_fake.lo $(DEPLIBS) $(SERVICE)
216 - $(CC) $(LDFLAGS) -o $@ $? \
217 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
220 smmapd: smmapd.lo libimap.la mutex_fake.lo $(DEPLIBS) $(SERVICE)
221 - $(CC) $(LDFLAGS) -o $@ $? \
222 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
225 sync_server: sync_server.lo sync_support.lo \
226 imapparse.lo tls.lo libimap.la mutex_fake.lo $(DEPLIBS) $(SERVICE)
227 - $(CC) $(LDFLAGS) -o $@ $? \
228 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
231 ### Command Line Utilities
232 arbitron: arbitron.lo $(CLIOBJS) libimap.la $(DEPLIBS)
233 - $(CC) $(LDFLAGS) -o $@ $? \
234 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
237 cyr_userseen: cyr_userseen.lo mutex_fake.lo libimap.la $(CLIOBJS) $(DEPLIBS)
238 - $(CC) $(LDFLAGS) -o $@ $? \
239 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
242 cyr_sequence: cyr_sequence.lo mutex_fake.lo libimap.la $(CLIOBJS) $(DEPLIBS)
243 - $(CC) $(LDFLAGS) -o $@ $? \
244 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
247 cyr_dbtool: cyr_dbtool.lo mutex_fake.lo libimap.la $(CLIOBJS) $(DEPLIBS)
248 - $(CC) $(LDFLAGS) -o $@ $? \
249 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
252 cyr_synclog: cyr_synclog.lo mutex_fake.lo libimap.la $(CLIOBJS) $(DEPLIBS)
253 - $(CC) $(LDFLAGS) -o $@ $? \
254 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
257 cvt_cyrusdb: cvt_cyrusdb.lo mutex_fake.lo libimap.la $(CLIOBJS) $(DEPLIBS)
258 - $(CC) $(LDFLAGS) -o $@ $? \
259 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
262 chk_cyrus: chk_cyrus.lo mutex_fake.lo libimap.la $(CLIOBJS) $(DEPLIBS)
263 - $(CC) $(LDFLAGS) -o $@ $? \
264 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
267 deliver: deliver.lo $(LMTPOBJS) proxy.lo mutex_fake.lo libimap.la $(DEPLIBS)
268 - $(CC) $(LDFLAGS) -o $@ $? \
269 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
272 ctl_deliver: ctl_deliver.lo $(CLIOBJS) libimap.la $(DEPLIBS)
273 - $(CC) $(LDFLAGS) -o $@ $? \
274 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
277 ctl_mboxlist: ctl_mboxlist.lo mupdate-client.lo $(CLIOBJS) libimap.la $(DEPLIBS)
278 - $(CC) $(LDFLAGS) -o $@ $? \
279 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
282 ctl_cyrusdb: ctl_cyrusdb.lo $(CLIOBJS) libimap.la $(DEPLIBS)
283 - $(CC) $(LDFLAGS) -o $@ $? \
284 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
287 cyr_expire: cyr_expire.lo $(CLIOBJS) libimap.la $(DEPLIBS)
288 - $(CC) $(LDFLAGS) -o $@ $? \
289 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
292 fetchnews: fetchnews.lo $(CLIOBJS) libimap.la $(DEPLIBS)
293 - $(CC) $(LDFLAGS) -o $@ $? \
294 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
297 squatter: squatter.lo index.lo squat_build.lo $(CLIOBJS) libimap.la $(DEPLIBS)
298 - $(CC) $(LDFLAGS) -o $@ $? \
299 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
302 mbpath: mbpath.lo $(CLIOBJS) libimap.la $(DEPLIBS)
303 - $(CC) $(LDFLAGS) -o $@ $? \
304 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
307 ipurge: ipurge.lo $(CLIOBJS) libimap.la $(DEPLIBS)
308 - $(CC) $(LDFLAGS) -o $@ $? \
309 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
312 cyr_virusscan: cyr_virusscan.lo index.lo $(CLIOBJS) libimap.la $(DEPLIBS)
313 - $(CC) $(LDFLAGS) -o $@ $? \
314 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
317 cyrdump: cyrdump.lo index.lo $(CLIOBJS) libimap.la $(DEPLIBS)
318 - $(CC) $(LDFLAGS) -o $@ $? \
319 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
322 cyr_df: cyr_df.lo $(CLIOBJS) libimap.la $(DEPLIBS)
323 - $(CC) $(LDFLAGS) -o $@ $? \
324 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
327 mbexamine: mbexamine.lo $(CLIOBJS) libimap.la $(DEPLIBS)
328 - $(CC) $(LDFLAGS) -o $@ $? \
329 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
332 reconstruct: reconstruct.lo $(CLIOBJS) libimap.la $(DEPLIBS)
333 - $(CC) $(LDFLAGS) -o $@ $? \
334 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
337 quota: quota.lo $(CLIOBJS) libimap.la $(DEPLIBS)
338 - $(CC) $(LDFLAGS) -o $@ $? \
339 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
342 tls_prune: tls_prune.lo tls.lo $(CLIOBJS) libimap.la $(DEPLIBS)
343 - $(CC) $(LDFLAGS) -o $@ $? \
344 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
347 unexpunge: unexpunge.lo $(CLIOBJS) libimap.la $(DEPLIBS)
348 - $(CC) $(LDFLAGS) -o $@ $? \
349 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
352 make_md5: make_md5.lo libimap.la mutex_fake.lo $(DEPLIBS)
353 - $(CC) $(LDFLAGS) -o $@ $? \
354 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
357 make_sha1: make_sha1.lo libimap.la mutex_fake.lo $(DEPLIBS)
358 - $(CC) $(LDFLAGS) -o $@ $? \
359 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
362 sync_client: sync_client.lo sync_support.lo \
363 backend.lo tls.lo imapparse.lo libimap.la mutex_fake.lo $(DEPLIBS)
364 - $(CC) $(LDFLAGS) -o $@ $? \
365 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
368 sync_reset: sync_reset.lo sync_support.lo \
369 libimap.la mutex_fake.lo $(DEPLIBS)
370 - $(CC) $(LDFLAGS) -o $@ $? \
371 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
374 ### Other Misc Targets
377 - rm -f *.lo *.la Makefile.bak makedepend.log \
378 + rm -rf .libs *.a *.lo *.la Makefile.bak makedepend.log \
379 $(BUILTSOURCES) $(PROGS) $(SUIDPROGS) cyr_virusscan
382 --- cyrus-imapd-2.4.4/imtest/imtest.c 2010-11-30 07:53:22.205286646 +0200
383 +++ cyrus-imapd-2.4.4-shared-patch//imtest/imtest.c 2010-11-29 08:14:14.318040263 +0200
388 +/* config.c stuff */
389 +const int config_need_data = 0;
391 int mysasl_config(void *context __attribute__((unused)),
392 const char *plugin_name,
394 --- cyrus-imapd-2.4.4/imtest/Makefile.in 2010-11-30 07:53:22.205286646 +0200
395 +++ cyrus-imapd-2.4.4-shared-patch//imtest/Makefile.in 2010-11-29 08:56:17.502937602 +0200
399 top_srcdir = @top_srcdir@
400 +top_builddir = @top_builddir@
408 DEFS = @DEFS@ @LOCALDEFS@
409 CPPFLAGS = -I.. -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
414 - $(INSTALL) -s -m 755 imtest $(DESTDIR)$(exec_prefix)/bin
415 + $(LIBTOOL) --mode=install $(INSTALL) imtest $(DESTDIR)$(exec_prefix)/bin
416 ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/pop3test
417 ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/nntptest
418 ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/lmtptest
420 ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/sivtest
421 ln -f $(DESTDIR)$(exec_prefix)/bin/imtest $(DESTDIR)$(exec_prefix)/bin/synctest
424 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
426 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
428 imtest: imtest.lo $(DEPLIBS)
429 - $(CC) $(LDFLAGS) -o $@ $? \
430 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
433 imtest.pure: imtest.lo $(OBJS) $(DEPLIBS)
434 - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o $@ $? \
435 + $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
439 - rm -f *.lo Makefile.bak makedepend.log imtest
440 + rm -rf .libs *.lo Makefile.bak makedepend.log imtest
444 --- cyrus-imapd-2.4.4/installsieve/Makefile.in 2010-11-30 07:53:22.205286646 +0200
445 +++ cyrus-imapd-2.4.4-shared-patch//installsieve/Makefile.in 2010-11-29 08:23:07.319044464 +0200
451 +top_builddir = @top_builddir@
454 CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @SASLFLAGS@
459 - $(INSTALL) -s -m 755 installsieve $(DESTDIR)$(exec_prefix)/bin
460 + $(LIBTOOL) --mode=install $(INSTALL) installsieve $(DESTDIR)$(exec_prefix)/bin
462 OBJS=lex.lo mystring.lo request.lo isieve.lo
464 libinstallsieve.la: $(OBJS)
465 - rm -f libinstallsieve.la
466 - ar cr libinstallsieve.la $(OBJS)
467 - $(RANLIB) libinstallsieve.la
468 + $(LIBTOOL) --mode=link --tag=CC $(CC) -o $@ $(OBJS)
470 installsieve: libinstallsieve.la installscript.lo $(DEPLIBS)
471 - $(CC) $(LDFLAGS) -o $@ $? \
472 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
476 - rm -f *.lo *.la Makefile.bak makedepend.log
477 + rm -rf .libs *.a *.lo *.la Makefile.bak makedepend.log
480 rm -f Makefile installsieve
483 ${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) *.c $(srcdir)/*.c 1>makedepend.log 2>&1
486 - $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I. $(CFLAGS) \
488 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I. $(CFLAGS) \
492 --- cyrus-imapd-2.4.4/lib/Makefile.in 2010-11-30 07:53:22.205286646 +0200
493 +++ cyrus-imapd-2.4.4-shared-patch//lib/Makefile.in 2010-11-29 08:53:13.346000595 +0200
500 +top_builddir = @top_builddir@
502 DEFS = @DEFS@ @LOCALDEFS@
503 CPPFLAGS = -I.. @CPPFLAGS@ @COM_ERR_CPPFLAGS@ @SASLFLAGS@
507 $(srcdir)/../install-sh -d $(DESTDIR)$(libdir)
508 - $(INSTALL) -m 644 libcyrus.la $(DESTDIR)$(libdir)
509 - $(INSTALL) -m 644 libcyrus_min.la $(DESTDIR)$(libdir)
510 - $(RANLIB) $(DESTDIR)$(libdir)/libcyrus.la
511 + $(LIBTOOL) --mode=install $(INSTALL) -m 644 libcyrus_min.la $(DESTDIR)$(libdir)
512 + $(LIBTOOL) --mode=install $(INSTALL) -m 644 libcyrus.la $(DESTDIR)$(libdir)
513 for file in $(LIBCYR_HDRS); \
515 $(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/include/cyrus || exit 1; \
516 @@ -122,19 +122,15 @@
517 $(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/include/cyrus || exit 1; \
521 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
523 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
526 -libcyrus.la: $(LIBCYR_OBJS)
528 - ar cr libcyrus.la $(LIBCYR_OBJS)
529 - $(RANLIB) libcyrus.la
530 +libcyrus.la: $(LIBCYR_OBJS) libcyrus_min.la
531 + $(LIBTOOL) --mode=link --tag=CC $(CC) -o $@ $? @LIBS@ @LIB_SASL@ -rpath $(libdir) -release $(VERSION)
533 libcyrus_min.la: $(LIBCYRM_OBJS)
534 - rm -f libcyrus_min.la
535 - ar cr libcyrus_min.la $(LIBCYRM_OBJS)
536 - $(RANLIB) libcyrus_min.la
537 + $(LIBTOOL) --mode=link --tag=CC $(CC) -o $@ $? @IMAP_COM_ERR_LIBS@ -rpath $(libdir) -release $(VERSION)
539 imapopts.c: imapoptions $(srcdir)/../tools/config2header
540 $(srcdir)/../tools/config2header CC="$(CC)" $(srcdir)/imapopts.c $(srcdir)/imapopts.h < $(srcdir)/imapoptions
542 @echo "### Done building chartables."
545 - rm -f *.lo *.la chartable.c Makefile.bak makedepend.log \
546 + rm -rf .libs *.lo *.la *.a chartable.c Makefile.bak makedepend.log \
550 --- cyrus-imapd-2.4.4/makedepend/configure.in 2010-11-30 07:53:22.205286646 +0200
551 +++ cyrus-imapd-2.4.4-shared-patch//makedepend/configure.in 2010-11-29 08:14:14.308038617 +0200
559 AC_CHECK_HEADERS(stdarg.h)
561 --- cyrus-imapd-2.4.4/makedepend/Makefile.in 2010-11-30 07:53:22.205286646 +0200
562 +++ cyrus-imapd-2.4.4-shared-patch//makedepend/Makefile.in 2010-11-29 08:54:31.942253188 +0200
567 +top_builddir = @top_builddir@
576 CPPFLAGS = -I. -I$(srcdir) @CPPFLAGS@
582 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
584 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
586 makedepend: cppsetup.lo ifparser.lo include.lo main.lo parse.lo pr.lo $(DEPLIBS)
587 - $(CC) $(LDFLAGS) -o $@ $? \
588 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
592 - rm -f *.lo Makefile.bak makedepend
593 + rm -rf .libs *.lo Makefile.bak makedepend
597 --- cyrus-imapd-2.4.4/master/Makefile.in 2010-11-30 07:53:22.205286646 +0200
598 +++ cyrus-imapd-2.4.4-shared-patch//master/Makefile.in 2010-11-29 08:17:23.282457954 +0200
604 +top_builddir = @top_builddir@
606 CYRUS_USER=@cyrus_user@
607 CYRUS_GROUP=@cyrus_group@
609 $(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
610 for file in $(PROGS); \
612 - $(INSTALL) -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
613 + $(LIBTOOL) --mode=install $(INSTALL) $$file $(DESTDIR)$(service_path) || exit 1; \
617 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
619 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
622 master: master.lo masterconf.lo cyrusMasterMIB.lo ../lib/lock_@WITH_LOCK@.lo
623 - $(CC) $(LDFLAGS) -o $@ $? \
624 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
628 - rm -f *.lo *.la Makefile.bak $(PROGS)
629 + rm -f .libs *.a *.lo *.la Makefile.bak $(PROGS)
633 --- cyrus-imapd-2.4.4/netnews/Makefile.in 2010-11-30 07:53:22.208620530 +0200
634 +++ cyrus-imapd-2.4.4-shared-patch//netnews/Makefile.in 2010-11-29 08:37:19.582533564 +0200
641 +top_builddir = @top_builddir@
644 CPPFLAGS = -I.. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../com_err/et @CPPFLAGS@
649 - $(INSTALL) -s -m 755 remotepurge $(DESTDIR)$(service_path)
650 + $(LIBTOOL) --mode=install $(INSTALL) remotepurge $(DESTDIR)$(service_path)
653 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
655 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
657 remotepurge: $(OBJS) $(DEPLIBS)
658 - $(CC) $(LDFLAGS) -o $@ $? $(LIBS)
659 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? $(LIBS)
663 - rm -f *.lo Makefile.bak remotepurge makedepend.log
664 + rm -rf .libs *.lo Makefile.bak remotepurge makedepend.log
668 --- cyrus-imapd-2.4.4/notifyd/Makefile.in 2010-11-30 07:53:22.208620530 +0200
669 +++ cyrus-imapd-2.4.4-shared-patch//notifyd/Makefile.in 2010-11-29 08:20:28.862982985 +0200
675 +top_builddir = @top_builddir@
678 CYRUS_USER=@cyrus_user@
683 - $(INSTALL) -m 755 notifyd $(DESTDIR)$(service_path)
684 + $(LIBTOOL) --mode=install $(INSTALL) -m 755 notifyd $(DESTDIR)$(service_path)
686 OBJS= notifyd.lo notify_null.lo notify_log.lo notify_mailto.lo notify_zephyr.lo \
689 notifytest: notifytest.lo
690 - $(CC) $(LDFLAGS) -o $@ $? \
691 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
692 $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
694 notifyd: $(OBJS) $(SERVICE)
695 - $(CC) $(LDFLAGS) -o $@ $? \
696 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
697 $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
699 notifyd.pure: $(OBJS) $(SERVICE)
700 $(PURIFY) $(PUREOPT) \
701 - $(CC) $(LDFLAGS) -o $@ $? \
702 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
703 $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
706 - rm -f notifyd notifytest *.lo *.la *~ Makefile.bak makedepend.log
707 + rm -rf notifyd notifytest .libs *.a *.lo *.la *~ Makefile.bak makedepend.log
713 ${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) *.c $(srcdir)/*.c 1>makedepend.log 2>&1
716 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
718 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
721 # DO NOT DELETE THIS LINE -- make depend depends on it.
722 --- cyrus-imapd-2.4.4/perl/imap/IMAP.xs 2010-11-30 07:53:22.211954414 +0200
723 +++ cyrus-imapd-2.4.4-shared-patch//perl/imap/IMAP.xs 2010-11-29 08:14:14.301370855 +0200
728 +const int config_need_data = 0;
731 * Decrement the refcounts of the Perl SV's in the passed rock, then free the
732 --- cyrus-imapd-2.4.4/perl/imap/Makefile.PL 2010-11-30 07:53:22.211954414 +0200
733 +++ cyrus-imapd-2.4.4-shared-patch//perl/imap/Makefile.PL 2010-11-29 08:40:48.980296564 +0200
735 'clean' => {'FILES' => 'libcyrperl.la cyradm'},
736 'OBJECT' => 'IMAP.lo',
737 'MYEXTLIB' => '../../lib/libcyrus.la ../../lib/libcyrus_min.la',
738 - 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT $ZLIB -lssl -lcrypto"],
739 + 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT $ZLIB -lssl -lcrypto -L../../lib/.libs -lcyrus -lcyrus_min"],
740 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING'
741 'INC' => "-I../../lib -I../.. -I../../com_err/et $SASL_INC $OPENSSL_INC",
742 'EXE_FILES' => [cyradm],
743 --- cyrus-imapd-2.4.4/perl/sieve/lib/Makefile.in 2010-11-30 07:53:22.211954414 +0200
744 +++ cyrus-imapd-2.4.4-shared-patch//perl/sieve/lib/Makefile.in 2010-11-29 08:44:40.675056075 +0200
751 +top_builddir = @top_builddir@
753 DEFS = @DEFS@ @LOCALDEFS@ -Dbool=char -DHAS_BOOL
754 CPPFLAGS = -I. -I../../.. -I$(srcdir) -I$(srcdir)/../../../lib @CPPFLAGS@ @DYNSASLFLAGS@ @COM_ERR_CPPFLAGS@
760 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
762 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
764 libisieve.la: $(OBJS)
766 - ar cr libisieve.la $(OBJS)
767 - $(RANLIB) libisieve.la
768 + $(LIBTOOL) --mode=link --tag=CC $(CC) -o $@ $(OBJS)
771 - rm -f *.lo Makefile.bak makedepend.log libisieve.la
772 + rm -rf .libs *.la *.lo Makefile.bak makedepend.log
776 --- cyrus-imapd-2.4.4/perl/sieve/managesieve/Makefile.PL 2010-11-30 07:53:22.211954414 +0200
777 +++ cyrus-imapd-2.4.4-shared-patch//perl/sieve/managesieve/Makefile.PL 2010-11-29 08:46:22.825182931 +0200
779 'NAME' => 'Cyrus::SIEVE::managesieve',
780 'ABSTRACT' => 'Cyurs Sieve management interface',
781 'VERSION_FROM' => 'managesieve.pm', # finds $VERSION
782 - 'MYEXTLIB' => '../lib/isieve.lo ../lib/lex.lo ../lib/mystring.lo ../lib/request.lo ../../../lib/libcyrus.la ../../../lib/libcyrus_min.la',
783 - 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT $ZLIB -lssl -lcrypto"],
784 + 'MYEXTLIB' => '../lib/isieve.o ../lib/lex.o ../lib/mystring.o ../lib/request.o',
785 + 'LIBS' => ["$BDB_LIB $SASL_LIB $OPENSSL_LIB $LIB_RT $ZLIB -lssl -lcrypto -L../../../lib/.libs -lcyrus -lcyrus_min"],
786 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING'
787 'INC' => "-I../lib/ -I../../../lib/ $SASL_INC $OPENSSL_INC",
789 --- cyrus-imapd-2.4.4/perl/sieve/managesieve/managesieve.xs 2010-11-30 07:53:22.211954414 +0200
790 +++ cyrus-imapd-2.4.4-shared-patch//perl/sieve/managesieve/managesieve.xs 2010-11-29 08:14:14.304704736 +0200
792 croak("failure: %s", s);
795 +const int config_need_data = 0;
798 perlsieve_getpass(conn, context, id, psecret)
799 --- cyrus-imapd-2.4.4/ptclient/Makefile.in 2010-11-30 07:53:22.211954414 +0200
800 +++ cyrus-imapd-2.4.4-shared-patch//ptclient/Makefile.in 2010-11-29 08:58:33.885354117 +0200
807 +top_builddir = @top_builddir@
810 CPPFLAGS = -I.. -I$(srcdir)/../imap -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
815 - $(INSTALL) -m 755 ptloader $(DESTDIR)$(service_path)
816 - $(INSTALL) -m 755 ptexpire $(DESTDIR)$(service_path)
817 - $(INSTALL) -m 755 ptdump $(DESTDIR)$(service_path)
818 + $(LIBTOOL) --mode=install $(INSTALL) ptloader $(DESTDIR)$(service_path)
819 + $(LIBTOOL) --mode=install $(INSTALL) ptexpire $(DESTDIR)$(service_path)
820 + $(LIBTOOL) --mode=install $(INSTALL) ptdump $(DESTDIR)$(service_path)
823 - $(CC) -c $(CPPFLAGS) $(LDAP_CPPFLAGS) $(DEFS) $(CFLAGS) $<
825 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(LDAP_CPPFLAGS) $(DEFS) $(CFLAGS) $<
827 ptloader: ptloader.lo afskrb.lo ldap.lo ../imap/mutex_fake.lo $(DEPLIBS)
828 - $(CC) $(LDFLAGS) -o $@ $? $(SERVICETHREAD) ${AFS_LDFLAGS} ${LDAP_LDFLAGS} $(AFS_LIBS) ${LDAP_LIBS} $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
829 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? $(SERVICETHREAD) ${AFS_LDFLAGS} ${LDAP_LDFLAGS} $(AFS_LIBS) ${LDAP_LIBS} $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
831 ptloader.pure: ptloader.lo afskrb.lo ldap.lo ../imap/mutex_fake.lo $(DEPLIBS)
832 - $(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ $? $(SERVICETHREAD) ${AFS_LDFLAGS} ${LDAP_LDFLAGS} $(AFS_LIBS) ${LDAP_LIBS} $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
833 + $(PURIFY) $(PUREARGS) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? $(SERVICETHREAD) ${AFS_LDFLAGS} ${LDAP_LDFLAGS} $(AFS_LIBS) ${LDAP_LIBS} $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
835 ptexpire: ptexpire.lo $(DEPLIBS) $(UTIL_LIBS)
836 - $(CC) $(LDFLAGS) -o $@ $? $(LIB_SASL) $(LIBS) $(LIB_RT)
837 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? $(LIB_SASL) $(LIBS) $(LIB_RT)
839 ptexpire.pure: ptexpire.lo $(DEPLIBS) $(UTIL_LIBS)
840 - $(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ $? $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
841 + $(PURIFY) $(PUREARGS) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
843 ptdump: ptdump.lo $(DEPLIBS) $(UTIL_LIBS)
844 - $(CC) $(LDFLAGS) -o $@ $? $(LIB_SASL) $(LIBS) $(LIB_RT)
845 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? $(LIB_SASL) $(LIBS) $(LIB_RT)
847 ptdump.pure: ptdump.lo $(DEPLIBS) $(UTIL_LIBS)
848 - $(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ $? $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
849 + $(PURIFY) $(PUREARGS) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT)
851 ptextract: ptextract.lo $(DEPLIBS) $(UTIL_LIBS)
852 - $(CC) $(LDFLAGS) -o $@ $? $(LIBS)
853 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? $(LIBS)
856 - rm -f *.lo Makefile.bak $(PROGS) makedepend.log
857 + rm -rf .libs *.lo Makefile.bak $(PROGS) makedepend.log
861 --- cyrus-imapd-2.4.4/sieve/Makefile.in 2010-11-30 07:53:22.215288298 +0200
862 +++ cyrus-imapd-2.4.4-shared-patch//sieve/Makefile.in 2010-11-29 09:06:25.952918572 +0200
866 top_srcdir = @top_srcdir@
867 +top_builddir = @top_builddir@
872 service_path = @service_path@
881 COMPILE_ET = @COMPILE_ET@
883 DEFS = @DEFS@ @LOCALDEFS@
885 $(srcdir)/../install-sh -c -m 755 sieved $(DESTDIR)$(service_path) || exit
887 test: libsieve.la test.lo ../imap/message.lo $(DEPLIBS)
888 - $(CC) $(LDFLAGS) -o $@ $? \
889 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
892 OBJS = sieve_err.lo \
893 @@ -119,15 +121,13 @@
894 #libsieve.la: sieve.c sieve.h sieve_err.h sieve_err.c $(OBJS)
898 - ar cr libsieve.la $(OBJS)
899 - $(RANLIB) libsieve.la
900 + $(LIBTOOL) --mode=link --tag=CC $(CC) -o $@ $(OBJS)
902 sievec: sievec.lo libsieve.la $(DEPLIBS)
903 - $(CC) $(LDFLAGS) -o $@ $? $(LIBS)
904 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? $(LIBS)
906 sieved: sieved.lo libsieve.la $(DEPLIBS)
907 - $(CC) $(LDFLAGS) -o $@ $? $(LIBS)
908 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? $(LIBS)
911 sieve_interface.h: sieve_err.h
913 $(COMPILE_ET) $(srcdir)/sieve_err.et
916 - rm -f sievec sieved test *~ *.lo *.la Makefile.bak makedepend.log
917 + rm -rf .libs sievec sieved test *~ *.lo *.la *.a Makefile.bak makedepend.log
920 rm -f sieve_err.c sieve_err.h
923 ${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(MAKEDEPEND_CFLAGS) *.c *.y $(srcdir)/*.y $(srcdir)/*.c 1>makedepend.log 2>&1
927 + $(LIBTOOL) --mode=compile --tag=CC \
928 $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
931 --- cyrus-imapd-2.4.4/syslog/Makefile.in 2010-11-30 07:53:22.215288298 +0200
932 +++ cyrus-imapd-2.4.4-shared-patch//syslog/Makefile.in 2010-11-29 08:25:14.816679541 +0200
937 +top_builddir = @top_builddir@
947 CPPFLAGS = @CPPFLAGS@
950 @echo "Install syslogd and syslog.conf as appropriate"
953 - $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) $<
955 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) $<
957 libsyslog.la: syslog.lo
958 - ar cr libsyslog.la syslog.lo
959 - $(RANLIB) libsyslog.la
960 + $(LIBTOOL) --mode=link --tag=CC $(CC) -o $@ $<
963 - $(CC) $(LDFLAGS) -o $@ $? $(LIBS)
964 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? $(LIBS)
967 - rm -f *.lo *.la Makefile.bak
968 + rm -rf .libs *.a *.lo *.la Makefile.bak
972 --- cyrus-imapd-2.4.4/timsieved/Makefile.in 2010-11-30 07:53:22.215288298 +0200
973 +++ cyrus-imapd-2.4.4-shared-patch//timsieved/Makefile.in 2010-11-29 08:40:02.882717314 +0200
980 +top_builddir = @top_builddir@
983 CYRUS_USER=@cyrus_user@
988 - $(INSTALL) -m 755 timsieved $(DESTDIR)$(service_path)
989 + $(LIBTOOL) --mode=install $(INSTALL) -m 755 timsieved $(DESTDIR)$(service_path)
991 OBJS= actions.lo lex.lo mystring.lo scripttest.lo timsieved.lo parser.lo \
994 timsieved: $(OBJS) $(SERVICE)
995 - $(CC) $(LDFLAGS) -o $@ \
996 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ \
997 $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
999 timsieved.pure: $(OBJS) $(SERVICE)
1000 $(PURIFY) $(PUREOPT) \
1001 - $(CC) $(LDFLAGS) -o $@ \
1002 + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ \
1003 $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP)
1006 - rm -f timsieved *~ *.lo *.la Makefile.bak makedepend.log
1007 + rm -rf timsieved .libs *~ *.lo *.la *.a Makefile.bak makedepend.log
1013 ${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) *.c $(srcdir)/*.c 1>makedepend.log 2>&1
1016 - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
1018 + $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \
1021 # DO NOT DELETE THIS LINE -- make depend depends on it.