From be79fb78ffafefd128eca32cff2b4af162166579 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Tue, 23 Sep 2008 18:48:14 +0000 Subject: [PATCH] - more libtool Changed files: cyrus-imapd-shared.patch -> 1.7 --- cyrus-imapd-shared.patch | 718 ++++++++++++++++++++++++++------------- 1 file changed, 489 insertions(+), 229 deletions(-) diff --git a/cyrus-imapd-shared.patch b/cyrus-imapd-shared.patch index f99a616..73ded08 100644 --- a/cyrus-imapd-shared.patch +++ b/cyrus-imapd-shared.patch @@ -1,5 +1,5 @@ ---- cyrus-imapd-2.3.8/ptclient/Makefile.in.wiget 2006-11-30 18:11:24.000000000 +0100 -+++ cyrus-imapd-2.3.8/ptclient/Makefile.in 2007-02-18 23:43:17.000000000 +0100 +--- cyrus-imapd-2.3.8/ptclient/Makefile.in 2007-02-18 23:43:17.000000000 +0100 ++++ cyrus-imapd-2.3.12p2/ptclient/Makefile.in 2008-09-23 21:36:44.543737168 +0300 @@ -51,6 +51,8 @@ CC = @CC@ INSTALL = @INSTALL@ @@ -9,16 +9,26 @@ DEFS = @DEFS@ CPPFLAGS = -I.. -I$(srcdir)/../imap -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@ -@@ -60,7 +62,7 @@ +@@ -60,8 +62,8 @@ LIBS = $(IMAP_LIBS) @COM_ERR_LIBS@ LIB_SASL = @LIB_SASL@ LIB_WRAP = @LIB_WRAP@ -DEPLIBS = ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@ -+DEPLIBS = ../imap/libimap.a ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@ - UTIL_LIBS = ../imap/mutex_fake.o ../imap/cli_fatal.o +-UTIL_LIBS = ../imap/mutex_fake.o ../imap/cli_fatal.o ++DEPLIBS = ../imap/libimap.la ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@ ++UTIL_LIBS = ../imap/mutex_fake.lo ../imap/cli_fatal.lo LDAP_LIBS=@LDAP_LIBS@ -@@ -89,33 +91,33 @@ + LDAP_CPPFLAGS=@LDAP_CPPFLAGS@ +@@ -83,42 +85,42 @@ + + LIB_RT = @LIB_RT@ + +-SERVICE=../master/service.o +-SERVICETHREAD=../master/service-thread.o ++SERVICE=../master/service.lo ++SERVICETHREAD=../master/service-thread.lo + all: $(PROGS) install: @@ -29,39 +39,52 @@ + $(LIBTOOL) --mode=install $(INSTALL) ptexpire $(DESTDIR)$(service_path) + $(LIBTOOL) --mode=install $(INSTALL) ptdump $(DESTDIR)$(service_path) - .c.o: - $(CC) -c $(CPPFLAGS) $(LDAP_CPPFLAGS) $(DEFS) $(CFLAGS) $< +-.c.o: +- $(CC) -c $(CPPFLAGS) $(LDAP_CPPFLAGS) $(DEFS) $(CFLAGS) $< ++%.lo: %.c ++ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(LDAP_CPPFLAGS) $(DEFS) $(CFLAGS) $< - ptloader: ptloader.o afskrb.o ldap.o ../imap/mutex_fake.o $(DEPLIBS) +-ptloader: ptloader.o afskrb.o ldap.o ../imap/mutex_fake.o $(DEPLIBS) - $(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) -+ $(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) ++ptloader: ptloader.lo afskrb.lo ldap.lo ../imap/mutex_fake.lo $(DEPLIBS) ++ $(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) - ptloader.pure: ptloader.o afskrb.o ldap.o ../imap/mutex_fake.o $(DEPLIBS) +-ptloader.pure: ptloader.o afskrb.o ldap.o ../imap/mutex_fake.o $(DEPLIBS) - $(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) -+ $(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) ++ptloader.pure: ptloader.lo afskrb.lo ldap.lo ../imap/mutex_fake.lo $(DEPLIBS) ++ $(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) - ptexpire: ptexpire.o $(DEPLIBS) $(UTIL_LIBS) +-ptexpire: ptexpire.o $(DEPLIBS) $(UTIL_LIBS) - $(CC) $(LDFLAGS) -o $@ ptexpire.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_RT) -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ ptexpire.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_RT) ++ptexpire: ptexpire.lo $(DEPLIBS) $(UTIL_LIBS) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ptexpire.lo $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_RT) - ptexpire.pure: ptexpire.o $(DEPLIBS) $(UTIL_LIBS) +-ptexpire.pure: ptexpire.o $(DEPLIBS) $(UTIL_LIBS) - $(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ ptexpire.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT) -+ $(PURIFY) $(PUREARGS) $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ ptexpire.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT) ++ptexpire.pure: ptexpire.lo $(DEPLIBS) $(UTIL_LIBS) ++ $(PURIFY) $(PUREARGS) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ptexpire.lo $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT) - ptdump: ptdump.o $(DEPLIBS) $(UTIL_LIBS) +-ptdump: ptdump.o $(DEPLIBS) $(UTIL_LIBS) - $(CC) $(LDFLAGS) -o $@ ptdump.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_RT) -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ ptdump.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_RT) ++ptdump: ptdump.lo $(DEPLIBS) $(UTIL_LIBS) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ptdump.lo $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_RT) - ptdump.pure: ptexpire.o $(DEPLIBS) $(UTIL_LIBS) +-ptdump.pure: ptexpire.o $(DEPLIBS) $(UTIL_LIBS) - $(PURIFY) $(PUREARGS) $(CC) $(LDFLAGS) -o $@ ptdump.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT) -+ $(PURIFY) $(PUREARGS) $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ ptdump.o $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT) ++ptdump.pure: ptexpire.lo $(DEPLIBS) $(UTIL_LIBS) ++ $(PURIFY) $(PUREARGS) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ptdump.lo $(UTIL_LIBS) $(DEPLIBS) $(LIB_SASL) $(LIBS) $(LIB_WRAP) $(LIB_RT) - ptextract: ptextract.o $(DEPLIBS) $(UTIL_LIBS) +-ptextract: ptextract.o $(DEPLIBS) $(UTIL_LIBS) - $(CC) $(LDFLAGS) -o $@ ptextract.o $(UTIL_LIBS) $(DEPLIBS) $(LIBS) -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ ptextract.o $(UTIL_LIBS) $(DEPLIBS) $(LIBS) ++ptextract: ptextract.lo $(DEPLIBS) $(UTIL_LIBS) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ptextract.lo $(UTIL_LIBS) $(DEPLIBS) $(LIBS) clean: - rm -f *.o Makefile.bak $(PROGS) makedepend.log +- rm -f *.o Makefile.bak $(PROGS) makedepend.log ++ rm -f *.lo Makefile.bak $(PROGS) makedepend.log + + distclean: clean + rm -f Makefile --- cyrus-imapd-2.3.8/sieve/Makefile.in.wiget 2006-11-30 18:11:24.000000000 +0100 +++ cyrus-imapd-2.3.8/sieve/Makefile.in 2007-02-18 23:43:17.000000000 +0100 @@ -35,6 +35,8 @@ @@ -91,7 +114,7 @@ test: $(DEPLIBS) libsieve.a test.o ../imap/message.o - $(CC) $(LDFLAGS) -o test test.o ../imap/message.o \ -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o test test.o ../imap/message.o \ ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o test test.o ../imap/message.o \ libsieve.a $(DEPLIBS) $(LIBS) OBJS = sieve_err.o \ @@ -100,11 +123,11 @@ sievec: sievec.o libsieve.a - $(CC) $(LDFLAGS) -o sievec sievec.o libsieve.a $(DEPLIBS) $(LIBS) -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o sievec sievec.o libsieve.a $(DEPLIBS) $(LIBS) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o sievec sievec.o libsieve.a $(DEPLIBS) $(LIBS) sieved: sieved.o libsieve.a - $(CC) $(LDFLAGS) -o sieved sieved.o libsieve.a $(DEPLIBS) $(LIBS) -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o sieved sieved.o libsieve.a $(DEPLIBS) $(LIBS) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o sieved sieved.o libsieve.a $(DEPLIBS) $(LIBS) sieve_interface.h: sieve_err.h @@ -137,12 +160,12 @@ remotepurge: $(OBJS) $(DEPLIBS) - $(CC) $(LDFLAGS) -o remotepurge $(OBJS) \ -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o remotepurge $(OBJS) \ ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o remotepurge $(OBJS) \ $(DEPLIBS) $(LIBS) ---- cyrus-imapd-2.3.8/timsieved/Makefile.in.wiget 2006-11-30 18:11:25.000000000 +0100 -+++ cyrus-imapd-2.3.8/timsieved/Makefile.in 2007-02-18 23:43:17.000000000 +0100 +--- cyrus-imapd-2.3.8/timsieved/Makefile.in 2007-02-18 23:43:17.000000000 +0100 ++++ cyrus-imapd-2.3.12p2/timsieved/Makefile.in 2008-09-23 21:34:25.039668022 +0300 @@ -47,6 +47,8 @@ CC = @CC@ @@ -152,37 +175,17 @@ INSTALL = @INSTALL@ CYRUS_USER=@cyrus_user@ -@@ -72,7 +74,7 @@ - IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@ - LIB_WRAP = @LIB_WRAP@ - LIBS = $(IMAP_COM_ERR_LIBS) --DEPLIBS=../sieve/libsieve.a ../imap/mutex_fake.o ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@ -+DEPLIBS=../sieve/libsieve.a ../imap/mutex_fake.o ../imap/libimap.a ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@ +@@ -105,8 +107,8 @@ + depend: + ${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) *.c $(srcdir)/*.c 1>makedepend.log 2>&1 - PURIFY=/usr/local/bin/purify - PUREOPT=-best-effort -@@ -80,18 +82,18 @@ - all: timsieved - - install: -- $(INSTALL) -m 755 timsieved $(DESTDIR)$(service_path) -+ $(LIBTOOL) --mode=install $(INSTALL) -m 755 timsieved $(DESTDIR)$(service_path) - - OBJS= actions.o lex.o mystring.o scripttest.o timsieved.o parser.o \ - ../imap/proxy.o - - timsieved: $(OBJS) $(SERVICE) -- $(CC) $(LDFLAGS) -o timsieved \ -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o timsieved \ - $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP) - - timsieved.pure: $(OBJS) $(SERVICE) - $(PURIFY) $(PUREOPT) \ -- $(CC) $(LDFLAGS) -o timsieved.pure \ -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o timsieved.pure \ - $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP) +-.c.o: +- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \ ++%.lo: %.c ++ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \ + $< - clean: + # DO NOT DELETE THIS LINE -- make depend depends on it. --- cyrus-imapd-2.3.8/configure.in.wiget 2007-02-18 23:43:17.000000000 +0100 +++ cyrus-imapd-2.3.8/configure.in 2007-02-18 23:43:17.000000000 +0100 @@ -87,7 +87,7 @@ @@ -239,219 +242,433 @@ AC_SUBST(MD5OBJ) dnl snmp ---- cyrus-imapd-2.3.12p2/imap/Makefile.in~ 2008-09-23 18:02:00.000000000 +0300 -+++ cyrus-imapd-2.3.12p2/imap/Makefile.in 2008-09-23 18:30:40.169774729 +0300 -@@ -186,171 +186,171 @@ +--- cyrus-imapd-2.3.12p2/imap/Makefile.in 2008-09-23 21:18:02.070806071 +0300 ++++ cyrus-imapd-2.3.12p2/imap/Makefile.in 2008-09-23 21:20:01.537715249 +0300 +@@ -45,16 +45,18 @@ + + # \Seen state database. Either 'db' (berkeley db) or + # 'local' (legacy flat file). +-SEEN=seen_db.o ++SEEN=seen_db.lo + + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ ++top_builddir = @top_builddir@ + VPATH = @srcdir@ + + CC = @CC@ + INSTALL = @INSTALL@ + RANLIB = @RANLIB@ + AWK = @AWK@ ++LIBTOOL = @LIBTOOL@ + + CYRUS_USER=@cyrus_user@ + CYRUS_GROUP=@cyrus_group@ +@@ -67,7 +69,7 @@ + IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@ + LIB_WRAP = @LIB_WRAP@ + LIBS = $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS) +-DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@ ++DEPLIBS = ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@ + + CFLAGS = @CFLAGS@ + LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@ +@@ -96,23 +98,23 @@ + cyrus_prefix = @cyrus_prefix@ + service_path = @service_path@ + +-LOBJS= append.o mailbox.o mboxlist.o mupdate-client.o mboxname.o message.o \ +- global.o imap_err.o mupdate_err.o proc.o setproctitle.o \ +- convert_code.o duplicate.o saslclient.o saslserver.o signals.o \ +- annotate.o search_engines.o squat.o squat_internal.o mbdump.o \ +- imapparse.o telemetry.o user.o notify.o idle.o quota_db.o \ +- sync_log.o $(SEEN) mboxkey.o backend.o tls.o message_guid.o \ +- statuscache_db.o ++LOBJS= append.lo mailbox.lo mboxlist.lo mupdate-client.lo mboxname.lo message.lo \ ++ global.lo imap_err.lo mupdate_err.lo proc.lo setproctitle.lo \ ++ convert_code.lo duplicate.lo saslclient.lo saslserver.lo signals.lo \ ++ annotate.lo search_engines.lo squat.lo squat_internal.lo mbdump.lo \ ++ imapparse.lo telemetry.lo user.lo notify.lo idle.lo quota_db.lo \ ++ sync_log.lo $(SEEN) mboxkey.lo backend.lo tls.lo message_guid.lo \ ++ statuscache_db.lo + +-IMAPDOBJS=pushstats.o imapd.o proxy.o imap_proxy.o index.o version.o ++IMAPDOBJS=pushstats.lo imapd.lo proxy.lo imap_proxy.lo index.lo version.lo + +-LMTPOBJS=lmtpstats.o lmtpengine.o spool.o ++LMTPOBJS=lmtpstats.lo lmtpengine.lo spool.lo + + # Your typical objects for the command line utilities +-CLIOBJS=cli_fatal.o mutex_fake.o ++CLIOBJS=cli_fatal.lo mutex_fake.lo + +-SERVICE=../master/service.o +-SERVICETHREAD=../master/service-thread.o ++SERVICE=../master/service.lo ++SERVICETHREAD=../master/service-thread.lo + + PROGS = imapd lmtpd pop3d \ + fud smmapd reconstruct quota mbpath ipurge cyr_dbtool cyr_synclog \ +@@ -139,23 +141,21 @@ + ln -f $(DESTDIR)$(service_path)/imapd $(DESTDIR)$(service_path)/proxyd + ln -f $(DESTDIR)$(service_path)/lmtpd $(DESTDIR)$(service_path)/lmtpproxyd + +-.c.o: +- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \ ++%.lo: %.c ++ $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \ + $< + + ### libimap + +-libimap.a: $(LOBJS) +- rm -f libimap.a +- ar cr libimap.a $(LOBJS) +- $(RANLIB) libimap.a ++libimap.la: $(LOBJS) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) -o libimap.la $(LOBJS) + + ### Built Source Files + + xversion xversion.h: + AWK=$(AWK) $(srcdir)/xversion.sh + +-version.o: xversion.h ++version.lo: xversion.h + + pushstats.c: pushstats.snmp $(srcdir)/../snmp/snmpgen + $(srcdir)/../snmp/snmpgen $(srcdir)/pushstats.snmp +@@ -183,179 +183,179 @@ + mupdate_err.h: mupdate_err.c ### Services - idled: idled.o mutex_fake.o libimap.a $(DEPLIBS) +-idled: idled.o mutex_fake.o libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o idled \ -+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o idled \ - idled.o mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) - - lmtpd: lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.o \ - libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) +- idled.o mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) +- +-lmtpd: lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.o \ +- libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) - $(CC) $(LDFLAGS) -o lmtpd \ -+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o lmtpd \ - $(SERVICE) lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \ - mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) - - lmtpd.pure: lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \ - mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) +- $(SERVICE) lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \ +- mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) +- +-lmtpd.pure: lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \ +- mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o lmtpd.pure \ -+ $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o lmtpd.pure \ - $(SERVICE) lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \ - mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) - - imapd: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE) +- $(SERVICE) lmtpd.o proxy.o $(LMTPOBJS) $(SIEVE_OBJS) \ +- mutex_fake.o libimap.a $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) +- +-imapd: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE) - $(CC) $(LDFLAGS) -o imapd \ -+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o imapd \ - $(SERVICE) $(IMAPDOBJS) mutex_fake.o \ - libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) - - imapd.pure: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE) +- $(SERVICE) $(IMAPDOBJS) mutex_fake.o \ +- libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) +- +-imapd.pure: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE) - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o imapd.pure \ +- $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \ ++idled: idled.lo mutex_fake.lo libimap.la $(DEPLIBS) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o idled \ ++ idled.lo mutex_fake.lo libimap.la $(DEPLIBS) $(LIBS) ++ ++lmtpd: lmtpd.lo proxy.lo $(LMTPOBJS) $(SIEVE_OBJS) mutex_fake.lo \ ++ libimap.la $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o lmtpd \ ++ $(SERVICE) lmtpd.lo proxy.lo $(LMTPOBJS) $(SIEVE_OBJS) \ ++ mutex_fake.lo libimap.la $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) ++ ++lmtpd.pure: lmtpd.lo proxy.lo $(LMTPOBJS) $(SIEVE_OBJS) \ ++ mutex_fake.lo libimap.la $(SIEVE_LIBS) $(DEPLIBS) $(SERVICE) ++ $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o lmtpd.pure \ ++ $(SERVICE) lmtpd.lo proxy.lo $(LMTPOBJS) $(SIEVE_OBJS) \ ++ mutex_fake.lo libimap.la $(SIEVE_LIBS) $(DEPLIBS) $(LIBS) $(LIB_WRAP) ++ ++imapd: $(IMAPDOBJS) mutex_fake.lo libimap.la $(DEPLIBS) $(SERVICE) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o imapd \ ++ $(SERVICE) $(IMAPDOBJS) mutex_fake.lo \ ++ libimap.la $(DEPLIBS) $(LIBS) $(LIB_WRAP) ++ ++imapd.pure: $(IMAPDOBJS) mutex_fake.lo libimap.la $(DEPLIBS) $(SERVICE) + $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o imapd.pure \ - $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \ ++ $(SERVICE) $(IMAPDOBJS) mutex_fake.lo libimap.la \ $(DEPLIBS) $(LIBS) $(LIB_WRAP) - imapd.quant: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE) +-imapd.quant: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE) - $(QUANTIFY) $(QUANTOPT) $(CC) $(LDFLAGS) -o imapd.quant \ +- $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \ ++imapd.quant: $(IMAPDOBJS) mutex_fake.lo libimap.la $(DEPLIBS) $(SERVICE) + $(QUANTIFY) $(QUANTOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o imapd.quant \ - $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \ ++ $(SERVICE) $(IMAPDOBJS) mutex_fake.lo libimap.la \ $(DEPLIBS) $(LIBS) $(LIB_WRAP) - mupdate: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o tls.o \ - libimap.a $(DEPLIBS) +-mupdate: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o tls.o \ +- libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o mupdate \ +- $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \ +- mutex_pthread.o tls.o libimap.a \ ++mupdate: mupdate.lo mupdate-slave.lo mupdate-client.lo mutex_pthread.lo tls.lo \ ++ libimap.la $(DEPLIBS) + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o mupdate \ - $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \ - mutex_pthread.o tls.o libimap.a \ ++ $(SERVICETHREAD) mupdate.lo mupdate-slave.lo mupdate-client.lo \ ++ mutex_pthread.lo tls.lo libimap.la \ $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread - mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o \ - libimap.a $(DEPLIBS) +-mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o \ +- libimap.a $(DEPLIBS) - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o mupdate.pure \ +- $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \ +- mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread ++mupdate.pure: mupdate.lo mupdate-slave.lo mupdate-client.lo mutex_pthread.lo \ ++ libimap.la $(DEPLIBS) + $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o mupdate.pure \ - $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \ - mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread ++ $(SERVICETHREAD) mupdate.lo mupdate-slave.lo mupdate-client.lo \ ++ mutex_pthread.lo libimap.la $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread - pop3d: pop3d.o proxy.o backend.o tls.o mutex_fake.o libimap.a \ +-pop3d: pop3d.o proxy.o backend.o tls.o mutex_fake.o libimap.a \ ++pop3d: pop3d.lo proxy.lo backend.lo tls.lo mutex_fake.lo libimap.la \ $(DEPLIBS) $(SERVICE) - $(CC) $(LDFLAGS) -o pop3d pop3d.o proxy.o backend.o tls.o $(SERVICE) \ -+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o pop3d pop3d.o proxy.o backend.o tls.o $(SERVICE) \ - mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) +- mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o pop3d pop3d.lo proxy.lo backend.lo tls.lo $(SERVICE) \ ++ mutex_fake.lo libimap.la $(DEPLIBS) $(LIBS) $(LIB_WRAP) - nntpd: nntpd.o proxy.o backend.o index.o smtpclient.o spool.o tls.o \ - mutex_fake.o nntp_err.o libimap.a $(DEPLIBS) $(SERVICE) +-nntpd: nntpd.o proxy.o backend.o index.o smtpclient.o spool.o tls.o \ +- mutex_fake.o nntp_err.o libimap.a $(DEPLIBS) $(SERVICE) - $(CC) $(LDFLAGS) -o nntpd nntpd.o proxy.o backend.o index.o spool.o \ -+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o nntpd nntpd.o proxy.o backend.o index.o spool.o \ - smtpclient.o tls.o $(SERVICE) mutex_fake.o nntp_err.o \ - libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) - - fud: fud.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE) +- smtpclient.o tls.o $(SERVICE) mutex_fake.o nntp_err.o \ +- libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) ++nntpd: nntpd.lo proxy.lo backend.lo index.lo smtpclient.lo spool.lo tls.lo \ ++ mutex_fake.lo nntp_err.lo libimap.la $(DEPLIBS) $(SERVICE) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o nntpd nntpd.lo proxy.lo backend.lo index.lo spool.lo \ ++ smtpclient.lo tls.lo $(SERVICE) mutex_fake.lo nntp_err.lo \ ++ libimap.la $(DEPLIBS) $(LIBS) $(LIB_WRAP) + +-fud: fud.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE) - $(CC) $(LDFLAGS) -o fud $(SERVICE) fud.o mutex_fake.o libimap.a \ -+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o fud $(SERVICE) fud.o mutex_fake.o libimap.a \ ++fud: fud.lo libimap.la mutex_fake.lo $(DEPLIBS) $(SERVICE) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o fud $(SERVICE) fud.lo mutex_fake.lo libimap.la \ $(DEPLIBS) $(LIBS) $(LIB_WRAP) - smmapd: smmapd.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE) +-smmapd: smmapd.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE) - $(CC) $(LDFLAGS) -o smmapd $(SERVICE) smmapd.o mutex_fake.o libimap.a \ -+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o smmapd $(SERVICE) smmapd.o mutex_fake.o libimap.a \ ++smmapd: smmapd.lo libimap.la mutex_fake.lo $(DEPLIBS) $(SERVICE) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o smmapd $(SERVICE) smmapd.lo mutex_fake.lo libimap.la \ $(DEPLIBS) $(LIBS) $(LIB_WRAP) - sync_server: sync_server.o sync_support.o sync_commit.o \ - imapparse.o tls.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE) +-sync_server: sync_server.o sync_support.o sync_commit.o \ +- imapparse.o tls.o libimap.a mutex_fake.o $(DEPLIBS) $(SERVICE) - $(CC) $(LDFLAGS) -o \ +- sync_server sync_server.o sync_support.o sync_commit.o \ +- imapparse.o tls.o $(SERVICE) libimap.a mutex_fake.o \ ++sync_server: sync_server.lo sync_support.lo sync_commit.lo \ ++ imapparse.lo tls.lo libimap.la mutex_fake.lo $(DEPLIBS) $(SERVICE) + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \ - sync_server sync_server.o sync_support.o sync_commit.o \ - imapparse.o tls.o $(SERVICE) libimap.a mutex_fake.o \ ++ sync_server sync_server.lo sync_support.lo sync_commit.lo \ ++ imapparse.lo tls.lo $(SERVICE) libimap.la mutex_fake.lo \ $(DEPLIBS) $(LIBS) $(LIB_WRAP) ### Command Line Utilities - arbitron: arbitron.o $(CLIOBJS) libimap.a $(DEPLIBS) +-arbitron: arbitron.o $(CLIOBJS) libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o arbitron arbitron.o $(CLIOBJS) \ -+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o arbitron arbitron.o $(CLIOBJS) \ - libimap.a $(DEPLIBS) $(LIBS) - - cyr_dbtool: cyr_dbtool.o mutex_fake.o libimap.a $(DEPLIBS) +- libimap.a $(DEPLIBS) $(LIBS) +- +-cyr_dbtool: cyr_dbtool.o mutex_fake.o libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o cyr_dbtool cyr_dbtool.o $(CLIOBJS) \ -+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o cyr_dbtool cyr_dbtool.o $(CLIOBJS) \ - libimap.a $(DEPLIBS) $(LIBS) - - cyr_synclog: cyr_synclog.o mutex_fake.o libimap.a $(DEPLIBS) +- libimap.a $(DEPLIBS) $(LIBS) +- +-cyr_synclog: cyr_synclog.o mutex_fake.o libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o cyr_synclog cyr_synclog.o $(CLIOBJS) \ -+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o cyr_synclog cyr_synclog.o $(CLIOBJS) \ - libimap.a $(DEPLIBS) $(LIBS) - - cvt_cyrusdb: cvt_cyrusdb.o mutex_fake.o libimap.a $(DEPLIBS) +- libimap.a $(DEPLIBS) $(LIBS) +- +-cvt_cyrusdb: cvt_cyrusdb.o mutex_fake.o libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o cvt_cyrusdb cvt_cyrusdb.o $(CLIOBJS) \ -+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o cvt_cyrusdb cvt_cyrusdb.o $(CLIOBJS) \ - libimap.a $(DEPLIBS) $(LIBS) - - chk_cyrus: chk_cyrus.o mutex_fake.o libimap.a $(DEPLIBS) +- libimap.a $(DEPLIBS) $(LIBS) +- +-chk_cyrus: chk_cyrus.o mutex_fake.o libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o chk_cyrus chk_cyrus.o $(CLIOBJS) \ -+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o chk_cyrus chk_cyrus.o $(CLIOBJS) \ - libimap.a $(DEPLIBS) $(LIBS) - - deliver: deliver.o $(LMTPOBJS) proxy.o mutex_fake.o libimap.a $(DEPLIBS) +- libimap.a $(DEPLIBS) $(LIBS) +- +-deliver: deliver.o $(LMTPOBJS) proxy.o mutex_fake.o libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o deliver deliver.o $(LMTPOBJS) proxy.o \ -+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o deliver deliver.o $(LMTPOBJS) proxy.o \ - mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) - - ctl_deliver: ctl_deliver.o $(CLIOBJS) libimap.a $(DEPLIBS) +- mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) +- +-ctl_deliver: ctl_deliver.o $(CLIOBJS) libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o \ -+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \ - $@ ctl_deliver.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) - - ctl_mboxlist: ctl_mboxlist.o mupdate-client.o $(CLIOBJS) libimap.a $(DEPLIBS) +- $@ ctl_deliver.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) +- +-ctl_mboxlist: ctl_mboxlist.o mupdate-client.o $(CLIOBJS) libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o $@ ctl_mboxlist.o mupdate-client.o $(CLIOBJS) \ -+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ctl_mboxlist.o mupdate-client.o $(CLIOBJS) \ - libimap.a $(DEPLIBS) $(LIBS) - - ctl_cyrusdb: ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS) +- libimap.a $(DEPLIBS) $(LIBS) +- +-ctl_cyrusdb: ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o \ -+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \ - $@ ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) - - cyr_expire: cyr_expire.o $(CLIOBJS) libimap.a $(DEPLIBS) +- $@ ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) +- +-cyr_expire: cyr_expire.o $(CLIOBJS) libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o $@ cyr_expire.o $(CLIOBJS) \ -+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ cyr_expire.o $(CLIOBJS) \ - libimap.a $(DEPLIBS) $(LIBS) - - fetchnews: fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS) +- libimap.a $(DEPLIBS) $(LIBS) +- +-fetchnews: fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o \ -+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \ - $@ fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) - - squatter: squatter.o index.o squat_build.o $(CLIOBJS) libimap.a $(DEPLIBS) +- $@ fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) +- +-squatter: squatter.o index.o squat_build.o $(CLIOBJS) libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o squatter squatter.o index.o squat_build.o \ -+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o squatter squatter.o index.o squat_build.o \ - $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) +- $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) ++arbitron: arbitron.lo $(CLIOBJS) libimap.la $(DEPLIBS) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o arbitron arbitron.lo $(CLIOBJS) \ ++ libimap.la $(DEPLIBS) $(LIBS) ++ ++cyr_dbtool: cyr_dbtool.lo mutex_fake.lo libimap.la $(DEPLIBS) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o cyr_dbtool cyr_dbtool.lo $(CLIOBJS) \ ++ libimap.la $(DEPLIBS) $(LIBS) ++ ++cyr_synclog: cyr_synclog.lo mutex_fake.lo libimap.la $(DEPLIBS) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o cyr_synclog cyr_synclog.lo $(CLIOBJS) \ ++ libimap.la $(DEPLIBS) $(LIBS) ++ ++cvt_cyrusdb: cvt_cyrusdb.lo mutex_fake.lo libimap.la $(DEPLIBS) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o cvt_cyrusdb cvt_cyrusdb.lo $(CLIOBJS) \ ++ libimap.la $(DEPLIBS) $(LIBS) ++ ++chk_cyrus: chk_cyrus.lo mutex_fake.lo libimap.la $(DEPLIBS) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o chk_cyrus chk_cyrus.lo $(CLIOBJS) \ ++ libimap.la $(DEPLIBS) $(LIBS) ++ ++deliver: deliver.lo $(LMTPOBJS) proxy.lo mutex_fake.lo libimap.la $(DEPLIBS) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o deliver deliver.lo $(LMTPOBJS) proxy.lo \ ++ mutex_fake.lo libimap.la $(DEPLIBS) $(LIBS) ++ ++ctl_deliver: ctl_deliver.lo $(CLIOBJS) libimap.la $(DEPLIBS) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \ ++ $@ ctl_deliver.lo $(CLIOBJS) libimap.la $(DEPLIBS) $(LIBS) ++ ++ctl_mboxlist: ctl_mboxlist.lo mupdate-client.lo $(CLIOBJS) libimap.la $(DEPLIBS) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ ctl_mboxlist.lo mupdate-client.lo $(CLIOBJS) \ ++ libimap.la $(DEPLIBS) $(LIBS) ++ ++ctl_cyrusdb: ctl_cyrusdb.lo $(CLIOBJS) libimap.la $(DEPLIBS) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \ ++ $@ ctl_cyrusdb.lo $(CLIOBJS) libimap.la $(DEPLIBS) $(LIBS) ++ ++cyr_expire: cyr_expire.lo $(CLIOBJS) libimap.la $(DEPLIBS) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ cyr_expire.lo $(CLIOBJS) \ ++ libimap.la $(DEPLIBS) $(LIBS) ++ ++fetchnews: fetchnews.lo $(CLIOBJS) libimap.la $(DEPLIBS) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \ ++ $@ fetchnews.lo $(CLIOBJS) libimap.la $(DEPLIBS) $(LIBS) ++ ++squatter: squatter.lo index.lo squat_build.lo $(CLIOBJS) libimap.la $(DEPLIBS) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o squatter squatter.lo index.lo squat_build.lo \ ++ $(CLIOBJS) libimap.la $(DEPLIBS) $(LIBS) - mbpath: mbpath.o $(CLIOBJS) libimap.a $(DEPLIBS) +-mbpath: mbpath.o $(CLIOBJS) libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o mbpath mbpath.o $(CLIOBJS) libimap.a \ -+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o mbpath mbpath.o $(CLIOBJS) libimap.a \ ++mbpath: mbpath.lo $(CLIOBJS) libimap.la $(DEPLIBS) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o mbpath mbpath.lo $(CLIOBJS) libimap.la \ $(DEPLIBS) $(LIBS) - ipurge: ipurge.o $(CLIOBJS) libimap.a $(DEPLIBS) +-ipurge: ipurge.o $(CLIOBJS) libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o ipurge ipurge.o $(CLIOBJS) \ -+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o ipurge ipurge.o $(CLIOBJS) \ - libimap.a $(DEPLIBS) $(LIBS) - - cyrdump: cyrdump.o index.o $(CLIOBJS) libimap.a $(DEPLIBS) +- libimap.a $(DEPLIBS) $(LIBS) +- +-cyrdump: cyrdump.o index.o $(CLIOBJS) libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o cyrdump cyrdump.o index.o $(CLIOBJS) \ -+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o cyrdump cyrdump.o index.o $(CLIOBJS) \ - libimap.a $(DEPLIBS) $(LIBS) - - mbexamine: mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS) +- libimap.a $(DEPLIBS) $(LIBS) +- +-mbexamine: mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o \ -+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \ - mbexamine mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) - - reconstruct: reconstruct.o $(CLIOBJS) libimap.a $(DEPLIBS) +- mbexamine mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) +- +-reconstruct: reconstruct.o $(CLIOBJS) libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o \ -+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \ - reconstruct reconstruct.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) - - quota: quota.o $(CLIOBJS) libimap.a $(DEPLIBS) +- reconstruct reconstruct.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) +- +-quota: quota.o $(CLIOBJS) libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o quota quota.o $(CLIOBJS) \ -+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o quota quota.o $(CLIOBJS) \ - libimap.a $(DEPLIBS) $(LIBS) - - tls_prune: tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS) +- libimap.a $(DEPLIBS) $(LIBS) +- +-tls_prune: tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o \ -+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \ - $@ tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) - - unexpunge: unexpunge.o $(CLIOBJS) libimap.a $(DEPLIBS) +- $@ tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS) +- +-unexpunge: unexpunge.o $(CLIOBJS) libimap.a $(DEPLIBS) - $(CC) $(LDFLAGS) -o $@ unexpunge.o $(CLIOBJS) \ -+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ unexpunge.o $(CLIOBJS) \ - libimap.a $(DEPLIBS) $(LIBS) - - make_md5: make_md5.o libimap.a mutex_fake.o $(DEPLIBS) +- libimap.a $(DEPLIBS) $(LIBS) +- +-make_md5: make_md5.o libimap.a mutex_fake.o $(DEPLIBS) - $(CC) $(LDFLAGS) -o make_md5 make_md5.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS) -+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o make_md5 make_md5.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS) - - make_sha1: make_sha1.o libimap.a mutex_fake.o $(DEPLIBS) +- +-make_sha1: make_sha1.o libimap.a mutex_fake.o $(DEPLIBS) - $(CC) $(LDFLAGS) -o make_sha1 make_sha1.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS) -+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o make_sha1 make_sha1.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS) - - sync_client: sync_client.o sync_support.o \ - backend.o tls.o imapparse.o libimap.a mutex_fake.o $(DEPLIBS) +- +-sync_client: sync_client.o sync_support.o \ +- backend.o tls.o imapparse.o libimap.a mutex_fake.o $(DEPLIBS) - $(CC) $(LDFLAGS) -o \ -+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \ - sync_client sync_client.o sync_support.o \ - backend.o tls.o imapparse.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS) - - sync_reset: sync_reset.o sync_support.o sync_commit.o \ - libimap.a mutex_fake.o $(DEPLIBS) +- sync_client sync_client.o sync_support.o \ +- backend.o tls.o imapparse.o libimap.a mutex_fake.o $(DEPLIBS) $(LIBS) +- +-sync_reset: sync_reset.o sync_support.o sync_commit.o \ +- libimap.a mutex_fake.o $(DEPLIBS) - $(CC) $(LDFLAGS) -o \ +- sync_reset sync_reset.o sync_support.o sync_commit.o \ +- libimap.a mutex_fake.o $(DEPLIBS) $(LIBS) ++ipurge: ipurge.lo $(CLIOBJS) libimap.la $(DEPLIBS) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o ipurge ipurge.lo $(CLIOBJS) \ ++ libimap.la $(DEPLIBS) $(LIBS) ++ ++cyrdump: cyrdump.lo index.lo $(CLIOBJS) libimap.la $(DEPLIBS) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o cyrdump cyrdump.lo index.lo $(CLIOBJS) \ ++ libimap.la $(DEPLIBS) $(LIBS) ++ ++mbexamine: mbexamine.lo $(CLIOBJS) libimap.la $(DEPLIBS) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \ ++ mbexamine mbexamine.lo $(CLIOBJS) libimap.la $(DEPLIBS) $(LIBS) ++ ++reconstruct: reconstruct.lo $(CLIOBJS) libimap.la $(DEPLIBS) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \ ++ reconstruct reconstruct.lo $(CLIOBJS) libimap.la $(DEPLIBS) $(LIBS) ++ ++quota: quota.lo $(CLIOBJS) libimap.la $(DEPLIBS) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o quota quota.lo $(CLIOBJS) \ ++ libimap.la $(DEPLIBS) $(LIBS) ++ ++tls_prune: tls_prune.lo tls.lo $(CLIOBJS) libimap.la $(DEPLIBS) + $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \ - sync_reset sync_reset.o sync_support.o sync_commit.o \ - libimap.a mutex_fake.o $(DEPLIBS) $(LIBS) ++ $@ tls_prune.lo tls.lo $(CLIOBJS) libimap.la $(DEPLIBS) $(LIBS) ++ ++unexpunge: unexpunge.lo $(CLIOBJS) libimap.la $(DEPLIBS) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ unexpunge.lo $(CLIOBJS) \ ++ libimap.la $(DEPLIBS) $(LIBS) ++ ++make_md5: make_md5.lo libimap.la mutex_fake.lo $(DEPLIBS) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o make_md5 make_md5.lo libimap.la mutex_fake.lo $(DEPLIBS) $(LIBS) ++ ++make_sha1: make_sha1.lo libimap.la mutex_fake.lo $(DEPLIBS) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o make_sha1 make_sha1.lo libimap.la mutex_fake.lo $(DEPLIBS) $(LIBS) ++ ++sync_client: sync_client.lo sync_support.lo \ ++ backend.lo tls.lo imapparse.lo libimap.la mutex_fake.lo $(DEPLIBS) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \ ++ sync_client sync_client.lo sync_support.lo \ ++ backend.lo tls.lo imapparse.lo libimap.la mutex_fake.lo $(DEPLIBS) $(LIBS) ++ ++sync_reset: sync_reset.lo sync_support.lo sync_commit.lo \ ++ libimap.la mutex_fake.lo $(DEPLIBS) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o \ ++ sync_reset sync_reset.lo sync_support.lo sync_commit.lo \ ++ libimap.la mutex_fake.lo $(DEPLIBS) $(LIBS) + + ### Other Misc Targets ---- cyrus-imapd-2.3.8/installsieve/Makefile.in.wiget 2003-10-22 20:50:11.000000000 +0200 -+++ cyrus-imapd-2.3.8/installsieve/Makefile.in 2007-02-18 23:43:17.000000000 +0100 + clean: +- rm -f *.o *.a Makefile.bak makedepend.log \ ++ rm -f *.lo *.la Makefile.bak makedepend.log \ + $(BUILTSOURCES) $(PROGS) $(SUIDPROGS) + + distclean: clean +--- cyrus-imapd-2.3.8/installsieve/Makefile.in 2007-02-18 23:43:17.000000000 +0100 ++++ cyrus-imapd-2.3.12p2/installsieve/Makefile.in 2008-09-23 21:33:10.055330477 +0300 @@ -45,6 +45,8 @@ CC = @CC@ @@ -470,24 +687,44 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ -@@ -66,7 +68,7 @@ - all: installsieve - +@@ -68,20 +70,18 @@ + install: + $(LIBTOOL) --mode=install $(INSTALL) installsieve $(DESTDIR)$(exec_prefix)/bin install: - $(INSTALL) -s -m 755 installsieve $(DESTDIR)$(exec_prefix)/bin + $(LIBTOOL) --mode=install $(INSTALL) installsieve $(DESTDIR)$(exec_prefix)/bin - OBJS=lex.o mystring.o request.o isieve.o +-OBJS=lex.o mystring.o request.o isieve.o ++OBJS=lex.lo mystring.lo request.lo isieve.lo -@@ -76,7 +78,7 @@ - $(RANLIB) libinstallsieve.a +-libinstallsieve.a: $(OBJS) +- rm -f libinstallsieve.a +- ar cr libinstallsieve.a $(OBJS) +- $(RANLIB) libinstallsieve.a ++libinstallsieve.la: $(OBJS) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) -o libinstallsieve.la $(OBJS) - installsieve: libinstallsieve.a installscript.o $(DEPLIBS) +-installsieve: libinstallsieve.a installscript.o $(DEPLIBS) - $(CC) $(LDFLAGS) -o installsieve libinstallsieve.a installscript.o $(DEPLIBS) $(IMAP_LIBS) -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o installsieve libinstallsieve.a installscript.o $(DEPLIBS) $(IMAP_LIBS) ++installsieve: libinstallsieve.la installscript.lo $(DEPLIBS) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o installsieve libinstallsieve.la installscript.lo $(DEPLIBS) $(IMAP_LIBS) clean: - rm -f *.o *.a Makefile.bak makedepend.log +- rm -f *.o *.a Makefile.bak makedepend.log ++ rm -f *.lo *.la Makefile.bak makedepend.log + + distclean: clean + rm -f Makefile installsieve +@@ -91,7 +91,6 @@ + +-.c.o: +- $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I. $(CFLAGS) \ ++%.lo: %.c ++ $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I. $(CFLAGS) \ + $< + +- + # DO NOT DELETE THIS LINE -- make depend depends on it. --- cyrus-imapd-2.3.8/perl/sieve/managesieve/Makefile.PL.wiget 2006-11-30 18:11:24.000000000 +0100 +++ cyrus-imapd-2.3.8/perl/sieve/managesieve/Makefile.PL 2007-02-18 23:43:17.000000000 +0100 @@ -59,8 +59,8 @@ @@ -552,7 +789,7 @@ - ar cr libisieve.a $(OBJS) - $(RANLIB) libisieve.a +libisieve.la: $(OBJS) -+ $(LIBTOOL) --mode=link $(CC) -o libisievie.la $(OBJS) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) -o libisievie.la $(OBJS) clean: rm -f *.o Makefile.bak makedepend.log libisieve.a @@ -622,16 +859,16 @@ imtest: imtest.o $(DEPLIBS) - $(CC) $(LDFLAGS) -o imtest imtest.o $(DEPLIBS) $(IMAP_LIBS) -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o imtest imtest.o $(DEPLIBS) $(IMAP_LIBS) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o imtest imtest.o $(DEPLIBS) $(IMAP_LIBS) imtest.pure: imtest.o $(DEPLIBS) - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o imtest $(OBJS) $(DEPLIBS) $(LIBS) $(IMAP_LIBS) -+ $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o imtest $(OBJS) $(DEPLIBS) $(LIBS) $(IMAP_LIBS) ++ $(PURIFY) $(PUREOPT) $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o imtest $(OBJS) $(DEPLIBS) $(LIBS) $(IMAP_LIBS) clean: rm -f *.o Makefile.bak makedepend.log imtest ---- cyrus-imapd-2.3.8/notifyd/Makefile.in.wiget 2006-11-30 18:11:23.000000000 +0100 -+++ cyrus-imapd-2.3.8/notifyd/Makefile.in 2007-02-18 23:43:17.000000000 +0100 +--- cyrus-imapd-2.3.8/notifyd/Makefile.in 2007-02-18 23:43:17.000000000 +0100 ++++ cyrus-imapd-2.3.12p2/notifyd/Makefile.in 2008-09-23 21:41:12.911256605 +0300 @@ -47,6 +47,8 @@ CC = @CC@ @@ -641,17 +878,22 @@ INSTALL = @INSTALL@ CYRUS_USER=@cyrus_user@ -@@ -72,7 +74,7 @@ +@@ -68,39 +70,39 @@ + + NOTIFYD_LIBS = @NOTIFYD_LIBS@ + +-SERVICE=../master/service.o ++SERVICE=../master/service.lo + + IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@ IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@ LIB_WRAP = @LIB_WRAP@ LIBS = @ZEPHYR_LIBS@ @LIBS@ $(IMAP_COM_ERR_LIBS) -DEPLIBS=../imap/mutex_fake.o ../imap/libimap.a ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@ -+DEPLIBS=../imap/mutex_fake.o ../imap/libimap.a ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@ ++DEPLIBS=../imap/mutex_fake.lo ../imap/libimap.la ../lib/libcyrus.la ../lib/libcyrus_min.la @DEPLIBS@ PURIFY=/usr/local/bin/purify PUREOPT=-best-effort -@@ -80,21 +82,21 @@ - all: notifyd install: - $(INSTALL) -m 755 notifyd $(DESTDIR)$(service_path) @@ -661,21 +903,39 @@ notifytest: notifytest.o - $(CC) $(LDFLAGS) -o notifytest \ -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o notifytest \ ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o notifytest \ notifytest.o $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP) notifyd: $(OBJS) $(SERVICE) - $(CC) $(LDFLAGS) -o notifyd \ -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o notifyd \ ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o notifyd \ $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP) notifyd.pure: $(OBJS) $(SERVICE) $(PURIFY) $(PUREOPT) \ - $(CC) $(LDFLAGS) -o notifyd.pure \ -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o notifyd.pure \ ++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o notifyd.pure \ + $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP) + $(SERVICE) $(OBJS) $(DEPLIBS) $(IMAP_LIBS) $(LIBS) $(LIB_WRAP) clean: +- rm -f notifyd notifytest *.o *.a *~ Makefile.bak makedepend.log ++ rm -f notifyd notifytest *.lo *.la *~ Makefile.bak makedepend.log + + distclean: clean + rm -f Makefile +@@ -108,8 +110,8 @@ + depend: + ${MAKEDEPEND} $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) *.c $(srcdir)/*.c 1>makedepend.log 2>&1 + +-.c.o: +- $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \ ++%.lo: %.c ++ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) \ + $< + + # DO NOT DELETE THIS LINE -- make depend depends on it. --- cyrus-imapd-2.3.12p2/master/Makefile.in~ 2008-09-23 18:31:43.000000000 +0300 +++ cyrus-imapd-2.3.12p2/master/Makefile.in 2008-09-23 18:32:06.430769398 +0300 @@ -49,6 +49,8 @@ @@ -807,10 +1067,10 @@ - ar cr libcyrus_min.a $(LIBCYRM_OBJS) - $(RANLIB) libcyrus_min.a +libcyrus.la: $(LIBCYR_OBJS) libcyrus_min.la -+ $(LIBTOOL) --mode=link $(CC) -o libcyrus.la $(LIBCYR_OBJS) libcyrus_min.la @LIBS@ @LIB_SASL@ -rpath $(libdir) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) -o libcyrus.la $(LIBCYR_OBJS) libcyrus_min.la @LIBS@ @LIB_SASL@ -rpath $(libdir) + +libcyrus_min.la: $(LIBCYRM_OBJS) -+ $(LIBTOOL) --mode=link $(CC) -o libcyrus_min.la $(LIBCYRM_OBJS) @IMAP_COM_ERR_LIBS@ -rpath $(libdir) ++ $(LIBTOOL) --mode=link --tag=CC $(CC) -o libcyrus_min.la $(LIBCYRM_OBJS) @IMAP_COM_ERR_LIBS@ -rpath $(libdir) imapopts.c: imapoptions $(srcdir)/../tools/config2header $(srcdir)/../tools/config2header CC="$(CC)" $(srcdir)/imapopts.c $(srcdir)/imapopts.h < $(srcdir)/imapoptions -- 2.44.0