--arbitron: arbitron.o $(CLIOBJS) libimap.a $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o arbitron arbitron.o $(CLIOBJS) \
-- libimap.a $(DEPLIBS) $(LIBS)
--
--cyr_dbtool: cyr_dbtool.o mutex_fake.o libimap.a $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o cyr_dbtool cyr_dbtool.o $(CLIOBJS) \
-- libimap.a $(DEPLIBS) $(LIBS)
--
--cyr_synclog: cyr_synclog.o mutex_fake.o libimap.a $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o cyr_synclog cyr_synclog.o $(CLIOBJS) \
-- libimap.a $(DEPLIBS) $(LIBS)
--
--cvt_cyrusdb: cvt_cyrusdb.o mutex_fake.o libimap.a $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o cvt_cyrusdb cvt_cyrusdb.o $(CLIOBJS) \
-- libimap.a $(DEPLIBS) $(LIBS)
--
--chk_cyrus: chk_cyrus.o mutex_fake.o libimap.a $(DEPLIBS)
-- $(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)
-- $(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)
-- $(CC) $(LDFLAGS) -o \
-- $@ 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) \
-- libimap.a $(DEPLIBS) $(LIBS)
--
--ctl_cyrusdb: ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o \
-- $@ ctl_cyrusdb.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
--
--cyr_expire: cyr_expire.o $(CLIOBJS) libimap.a $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o $@ cyr_expire.o $(CLIOBJS) \
-- libimap.a $(DEPLIBS) $(LIBS)
--
--fetchnews: fetchnews.o $(CLIOBJS) libimap.a $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o \
-- $@ 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 \
-- $(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)
-- $(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)
-- $(CC) $(LDFLAGS) -o ipurge ipurge.o $(CLIOBJS) \
-- libimap.a $(DEPLIBS) $(LIBS)
--
--cyrdump: cyrdump.o index.o $(CLIOBJS) libimap.a $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o cyrdump cyrdump.o index.o $(CLIOBJS) \
-- libimap.a $(DEPLIBS) $(LIBS)
--
--mbexamine: mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o \
-- mbexamine mbexamine.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
--
--reconstruct: reconstruct.o $(CLIOBJS) libimap.a $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o \
-- reconstruct reconstruct.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
--
--quota: quota.o $(CLIOBJS) libimap.a $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o quota quota.o $(CLIOBJS) \
-- libimap.a $(DEPLIBS) $(LIBS)
--
--tls_prune: tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o \
-- $@ tls_prune.o tls.o $(CLIOBJS) libimap.a $(DEPLIBS) $(LIBS)
--
--unexpunge: unexpunge.o $(CLIOBJS) libimap.a $(DEPLIBS)
-- $(CC) $(LDFLAGS) -o $@ unexpunge.o $(CLIOBJS) \
-- 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)
--
--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)
--
--sync_client: sync_client.o sync_support.o \
-- backend.o tls.o imapparse.o libimap.a mutex_fake.o $(DEPLIBS)
-- $(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)
-- $(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 \
-+ $@ 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)
+ arbitron: arbitron.lo $(CLIOBJS) libimap.la $(DEPLIBS)
+- $(CC) $(LDFLAGS) -o $@ $? \
++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
+ $(LIBS)
+
+ cyr_userseen: cyr_userseen.lo mutex_fake.lo libimap.la $(CLIOBJS) $(DEPLIBS)
+- $(CC) $(LDFLAGS) -o $@ $? \
++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
+ $(LIBS)
+
+ cyr_sequence: cyr_sequence.lo mutex_fake.lo libimap.la $(CLIOBJS) $(DEPLIBS)
+- $(CC) $(LDFLAGS) -o $@ $? \
++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
+ $(LIBS)
+
+ cyr_dbtool: cyr_dbtool.lo mutex_fake.lo libimap.la $(CLIOBJS) $(DEPLIBS)
+- $(CC) $(LDFLAGS) -o $@ $? \
++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
+ $(LIBS)
+
+ cyr_synclog: cyr_synclog.lo mutex_fake.lo libimap.la $(CLIOBJS) $(DEPLIBS)
+- $(CC) $(LDFLAGS) -o $@ $? \
++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
+ $(LIBS)
+
+ cvt_cyrusdb: cvt_cyrusdb.lo mutex_fake.lo libimap.la $(CLIOBJS) $(DEPLIBS)
+- $(CC) $(LDFLAGS) -o $@ $? \
++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
+ $(LIBS)
+
+ chk_cyrus: chk_cyrus.lo mutex_fake.lo libimap.la $(CLIOBJS) $(DEPLIBS)
+- $(CC) $(LDFLAGS) -o $@ $? \
++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
+ $(LIBS)
+
+ deliver: deliver.lo $(LMTPOBJS) proxy.lo mutex_fake.lo libimap.la $(DEPLIBS)
+- $(CC) $(LDFLAGS) -o $@ $? \
++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
+ $(LIBS)
+
+ ctl_deliver: ctl_deliver.lo $(CLIOBJS) libimap.la $(DEPLIBS)
+- $(CC) $(LDFLAGS) -o $@ $? \
++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
+ $(LIBS)
+
+ ctl_mboxlist: ctl_mboxlist.lo mupdate-client.lo $(CLIOBJS) libimap.la $(DEPLIBS)
+- $(CC) $(LDFLAGS) -o $@ $? \
++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
+ $(LIBS)
+
+ ctl_cyrusdb: ctl_cyrusdb.lo $(CLIOBJS) libimap.la $(DEPLIBS)
+- $(CC) $(LDFLAGS) -o $@ $? \
++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
+ $(LIBS)
+
+ cyr_expire: cyr_expire.lo $(CLIOBJS) libimap.la $(DEPLIBS)
+- $(CC) $(LDFLAGS) -o $@ $? \
++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
+ $(LIBS)
+
+ fetchnews: fetchnews.lo $(CLIOBJS) libimap.la $(DEPLIBS)
+- $(CC) $(LDFLAGS) -o $@ $? \
++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
+ $(LIBS)
+
+ squatter: squatter.lo index.lo squat_build.lo $(CLIOBJS) libimap.la $(DEPLIBS)
+- $(CC) $(LDFLAGS) -o $@ $? \
++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
+ $(LIBS)
+
+ mbpath: mbpath.lo $(CLIOBJS) libimap.la $(DEPLIBS)
+- $(CC) $(LDFLAGS) -o $@ $? \
++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
+ $(LIBS)
+
+ ipurge: ipurge.lo $(CLIOBJS) libimap.la $(DEPLIBS)
+- $(CC) $(LDFLAGS) -o $@ $? \
++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
+ $(LIBS)
+
+ cyr_virusscan: cyr_virusscan.lo index.lo $(CLIOBJS) libimap.la $(DEPLIBS)
+- $(CC) $(LDFLAGS) -o $@ $? \
++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
+ $(LIBS) -lclamav
+
+ cyrdump: cyrdump.lo index.lo $(CLIOBJS) libimap.la $(DEPLIBS)
+- $(CC) $(LDFLAGS) -o $@ $? \
++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
+ $(LIBS)
+
+ cyr_df: cyr_df.lo $(CLIOBJS) libimap.la $(DEPLIBS)
+- $(CC) $(LDFLAGS) -o $@ $? \
++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
+ $(LIBS)
+
+ mbexamine: mbexamine.lo $(CLIOBJS) libimap.la $(DEPLIBS)
+- $(CC) $(LDFLAGS) -o $@ $? \
++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
+ $(LIBS)
+
+ reconstruct: reconstruct.lo $(CLIOBJS) libimap.la $(DEPLIBS)
+- $(CC) $(LDFLAGS) -o $@ $? \
++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
+ $(LIBS)
+
+ quota: quota.lo $(CLIOBJS) libimap.la $(DEPLIBS)
+- $(CC) $(LDFLAGS) -o $@ $? \
++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
+ $(LIBS)
+
+ tls_prune: tls_prune.lo tls.lo $(CLIOBJS) libimap.la $(DEPLIBS)
+- $(CC) $(LDFLAGS) -o $@ $? \
++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
+ $(LIBS)
+
+ unexpunge: unexpunge.lo $(CLIOBJS) libimap.la $(DEPLIBS)
+- $(CC) $(LDFLAGS) -o $@ $? \
++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
+ $(LIBS)
+
+ make_md5: make_md5.lo libimap.la mutex_fake.lo $(DEPLIBS)
+- $(CC) $(LDFLAGS) -o $@ $? \
++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
+ $(LIBS)
+
+ make_sha1: make_sha1.lo libimap.la mutex_fake.lo $(DEPLIBS)
+- $(CC) $(LDFLAGS) -o $@ $? \
++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
+ $(LIBS)
+
+ sync_client: sync_client.lo sync_support.lo \
+ backend.lo tls.lo imapparse.lo libimap.la mutex_fake.lo $(DEPLIBS)
+- $(CC) $(LDFLAGS) -o $@ $? \
++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
+ $(LIBS)
+
+ sync_reset: sync_reset.lo sync_support.lo \
+ libimap.la mutex_fake.lo $(DEPLIBS)
+- $(CC) $(LDFLAGS) -o $@ $? \
++ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -o $@ $? \
+ $(LIBS)