Adopted _LDADD for the new library layout.

@@ -23,4 +23,8 @@ sbin_PROGRAMS = comsatd
 
 comsatd_SOURCES = action.c cfg.c comsat.c comsat.h
 
-comsatd_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la @LTLIBINTL@
+comsatd_LDADD = \
+ ../mailbox/mbox/libmu_mbox.la\
+ ../mailbox/libmailbox.la\
+ ../lib/libmailutils.la\
+ @LTLIBINTL@

@@ -20,7 +20,6 @@
 INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir)/libmu_scm @INTLINCS@
 
 bin_PROGRAMS = dotlock
-#dotlock_SOURCES = dotlock.c
 
 dotlock_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la @LTLIBINTL@
 

@@ -41,6 +41,27 @@ numaddr_la_SOURCES = numaddr.c
 numaddr_la_LIBADD = ../libsieve/libsieve.la 
 numaddr_la_LDFLAGS = -module -avoid-version -no-undefined 
 
+mimetest_LDADD =\
+ ../mailbox/mbox/libmu_mbox.la\
+ ../mailbox/imap/libmu_imap.la\
+ ../mailbox/pop/libmu_pop.la\
+ ../mailbox/libmailbox.la\
+ ../lib/libmailutils.la\
+ @AUTHLIBS@ 
+
+mta_LDADD =\
+ ../mailbox/mbox/libmu_mbox.la\
+ ../mailbox/libmailbox.la\
+ ../lib/libmailutils.la
+
+sfrom_LDADD =\
+ ../mailbox/mbox/libmu_mbox.la\
+ ../mailbox/imap/libmu_imap.la\
+ ../mailbox/pop/libmu_pop.la\
+ ../mailbox/libmailbox.la\
+ ../lib/libmailutils.la\
+ @AUTHLIBS@ 
+
 EXTRA_DIST = comsat.conf dot.biffrc gnu-imap4d.pam gnu-pop3d.pam\
  mailutils.rc reply.scm
 

@@ -22,4 +22,12 @@ SUBDIRS = testsuite
 
 bin_PROGRAMS = frm
 frm_SOURCES = frm.c
-frm_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la @LTLIBINTL@
+frm_LDADD = \
+ ../mailbox/mbox/libmu_mbox.la\
+ ../mailbox/imap/libmu_imap.la\
+ ../mailbox/pop/libmu_pop.la\
+ ../mailbox/mh/libmu_mh.la\
+ ../mailbox/maildir/libmu_maildir.la\
+ ../mailbox/libmailbox.la\
+ ../lib/libmailutils.la\
+ @AUTHLIBS@ @LTLIBINTL@

@@ -22,4 +22,12 @@ SUBDIRS = testsuite
 
 bin_PROGRAMS = from
 
-from_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la @LTLIBINTL@
+from_LDADD = \
+ ../mailbox/mbox/libmu_mbox.la\
+ ../mailbox/imap/libmu_imap.la\
+ ../mailbox/pop/libmu_pop.la\
+ ../mailbox/mh/libmu_mh.la\
+ ../mailbox/maildir/libmu_maildir.la\
+ ../mailbox/libmailbox.la\
+ ../lib/libmailutils.la\
+ @AUTHLIBS@ @LTLIBINTL@

@@ -25,6 +25,13 @@ SUBDIRS=scm
 bin_PROGRAMS=@GUIMB@
 EXTRA_PROGRAMS=guimb
 guimb_SOURCES=main.c collect.c util.c guimb.h 
-guimb_LDADD = ../libmu_scm/libmu_scm.la ../mailbox/libmailbox.la \
- ../lib/libmailutils.la @GUILE_LIBS@ @LTLIBINTL@
-
+guimb_LDADD = \
+ ../libmu_scm/libmu_scm.la\
+ ../mailbox/mbox/libmu_mbox.la\
+ ../mailbox/imap/libmu_imap.la\
+ ../mailbox/pop/libmu_pop.la\
+ ../mailbox/mh/libmu_mh.la\
+ ../mailbox/maildir/libmu_maildir.la\
+ ../mailbox/libmailbox.la\
+ ../lib/libmailutils.la\
+ @AUTHLIBS@ @GUILE_LIBS@ @LTLIBINTL@

@@ -17,20 +17,61 @@
 ##   Foundation, Inc.
 ##   59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/include @AUTHINCS@ @INTLINCS@
+INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/include @AUTHINCS@ @SERV_AUTHINCS@ @INTLINCS@
 SUBDIRS = testsuite
 
 sbin_PROGRAMS =	imap4d
 
-imap4d_LDADD = @IMAP_AUTHOBJS@ ../mailbox/libmailbox.la  @AUTHLIBS@ ../lib/libmailutils.la @LTLIBINTL@
-imap4d_SOURCES = append.c authenticate.c bye.c capability.c check.c close.c \
- commands.c copy.c create.c delete.c examine.c expunge.c fetch.c idle.c\
- imap4d.c imap4d.h list.c logout.c login.c lsub.c namespace.c noop.c \
- rename.c search.c select.c signal.c starttls.c status.c store.c \
- subscribe.c sync.c uid.c unsubscribe.c util.c version.c
+imap4d_SOURCES = \
+ append.c\
+ authenticate.c\
+ bye.c\
+ capability.c\
+ check.c\
+ close.c\
+ commands.c\
+ copy.c\
+ create.c\
+ delete.c\
+ examine.c\
+ expunge.c\
+ fetch.c\
+ idle.c\
+ imap4d.c\
+ imap4d.h\
+ list.c\
+ logout.c\
+ login.c\
+ lsub.c\
+ namespace.c\
+ noop.c\
+ rename.c\
+ search.c\
+ select.c\
+ signal.c\
+ starttls.c\
+ status.c\
+ store.c\
+ subscribe.c\
+ sync.c\
+ uid.c\
+ unsubscribe.c\
+ util.c\
+ version.c
+
+imap4d_LDADD = \
+ @IMAP_AUTHOBJS@\
+ ../mailbox/mbox/libmu_mbox.la\
+ ../mailbox/libmailbox.la\
+ ../lib/libmailutils.la\
+ @AUTHLIBS@ @SERV_AUTHLIBS@ @LTLIBINTL@
 
 ## This kludge is necessary to correctly establish imap4d -> IMAP_AUTHOBJS
 ## dependency. Think about better approach         --gray
-imap4d_DEPENDENCIES = @IMAP_AUTHOBJS@ ../mailbox/libmailbox.la ../lib/libmailutils.la
+imap4d_DEPENDENCIES = \
+ @IMAP_AUTHOBJS@\
+ ../mailbox/mbox/libmu_mbox.la\
+ ../mailbox/libmailbox.la\
+ ../lib/libmailutils.la
 
 EXTRA_DIST=auth_gss.c auth_gsasl.c

@@ -23,9 +23,14 @@ SUBDIRS = testsuite
 libexec_PROGRAMS = mail.local
 mail_local_SOURCES = main.c mailquota.c script.c mail.local.h
 
-mail_local_LDADD = @LIBMU_SCM@ @GUILE_LIBS@ ../mailbox/libmailbox.la \
- @AUTHLIBS@ ../libsieve/libsieve.la ../lib/libmailutils.la @LTLIBINTL@
- 
+mail_local_LDADD = \
+ @LIBMU_SCM@ @GUILE_LIBS@\
+ @LIBMU_SCM_DEPS@\
+ ../mailbox/mbox/libmu_mbox.la \
+ ../mailbox/libmailbox.la \
+ @AUTHLIBS@\
+ ../libsieve/libsieve.la\
+ ../lib/libmailutils.la @LTLIBINTL@
 
 install-exec-hook:
 	for i in $(libexec_PROGRAMS); do\

@@ -18,13 +18,20 @@
 ##   59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 AM_YFLAGS=-vt
-INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_srcdir}/mailbox @INTLINCS@
+INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_srcdir}/mailbox @INTLINCS@ @AUTHINCS@ 
 AM_CFLAGS = -DSITE_MAIL_RC=\"@SITE_MAIL_RC@\"
 
 bin_PROGRAMS = mail
 
-mail_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la \
-             @READLINE_LIBS@ @LTLIBINTL@
+mail_LDADD = \
+ ../mailbox/mbox/libmu_mbox.la\
+ ../mailbox/imap/libmu_imap.la\
+ ../mailbox/pop/libmu_pop.la\
+ ../mailbox/mh/libmu_mh.la\
+ ../mailbox/maildir/libmu_maildir.la\
+ ../mailbox/libmailbox.la\
+ ../lib/libmailutils.la\
+ @AUTHLIBS@ @READLINE_LIBS@ @LTLIBINTL@
 
 EXTRA_DIST = msgset.c
 

@@ -61,7 +61,6 @@ mailcap.c \
 mailer.c \
 mapfile_stream.c \
 mbx_default.c \
-mbx_file.c \
 md5.c \
 message.c \
 memory_stream.c \
@@ -99,20 +98,8 @@ parsedate.c: $(srcdir)/parsedate.y
 	          y.tab.c parsedate.c y.output parsedate.y.output \
                   -- -yy pd_yy
 
-libmailbox_la_DEPENDENCIES = \
- mbox/libmbox.la\
- pop/libpop.la\
- imap/libimap.la\
- mh/libmh.la\
- maildir/libmaildir.la\
- @MU_LTLIBOBJS@
-libmailbox_la_LIBADD = \
- mbox/libmbox.la\
- pop/libpop.la\
- imap/libimap.la\
- mh/libmh.la\
- maildir/libmaildir.la\
- @MU_LTLIBOBJS@ @LTLIBINTL@
+libmailbox_la_DEPENDENCIES = @MU_LTLIBOBJS@
+libmailbox_la_LIBADD = @MU_LTLIBOBJS@ @LTLIBINTL@
 libmailbox_la_LDFLAGS = -version-info 0:0:0
 
 mailutils_config_SOURCES = mailutils-config.c

@@ -22,4 +22,9 @@ SUBDIRS = testsuite
 
 bin_PROGRAMS = messages
 
-messages_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la @LTLIBINTL@
+messages_LDADD =\
+ ../mailbox/mbox/libmu_mbox.la\
+ ../mailbox/imap/libmu_imap.la\
+ ../mailbox/pop/libmu_pop.la\
+ ../mailbox/libmailbox.la\
+ ../lib/libmailutils.la @AUTHLIBS@ @LTLIBINTL@

@@ -122,7 +122,16 @@ mailutils-mh.el: mailutils-mh.eli
 
 INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_srcdir}/mailbox @INTLINCS@
 AM_CPPFLAGS = -DMHLIBDIR=\"$(mhlibdir)\" -DMHBINDIR=\"$(bindir)\"
-mh_LIBS = ./libmh.a ../mailbox/libmailbox.la ../lib/libmailutils.la @LTLIBINTL@
+mh_LIBS = \
+ ./libmh.a\
+ ../mailbox/mbox/libmu_mbox.la\
+ ../mailbox/imap/libmu_imap.la\
+ ../mailbox/pop/libmu_pop.la\
+ ../mailbox/mh/libmu_mh.la\
+ ../mailbox/maildir/libmu_maildir.la\
+ ../mailbox/libmailbox.la\
+ ../lib/libmailutils.la\
+ @AUTHLIBS@ @LTLIBINTL@
 LDADD = $(mh_LIBS)
 scan_LDADD = $(mh_LIBS) @CURSES_LIBS@
 pick_SOURCES = pick.c pick.h pick-gram.c pick-gram.h

@@ -28,7 +28,11 @@ pop3d_SOURCES = apop.c auth.c capa.c dele.c extra.c pop3d.c pop3d.h \
  list.c lock.c noop.c quit.c retr.c rset.c stat.c stls.c signal.c top.c \
  uidl.c user.c 
 
-pop3d_LDADD = ../mailbox/libmailbox.la @AUTHLIBS@ ../lib/libmailutils.la @LTLIBINTL@
+pop3d_LDADD = \
+ ../mailbox/mbox/libmu_mbox.la\
+ ../mailbox/libmailbox.la\
+ ../lib/libmailutils.la\
+ @AUTHLIBS@ @LTLIBINTL@
 
 popauth_SOURCES = popauth.c
 popauth_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la @LTLIBINTL@

@@ -23,4 +23,12 @@ SUBDIRS = testsuite
 bin_PROGRAMS = readmsg
 
 readmsg_SOURCES = readmsg.c msglist.c readmsg.h
-readmsg_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la @LTLIBINTL@
+readmsg_LDADD =\
+ ../mailbox/mbox/libmu_mbox.la\
+ ../mailbox/imap/libmu_imap.la\
+ ../mailbox/pop/libmu_pop.la\
+ ../mailbox/mh/libmu_mh.la\
+ ../mailbox/maildir/libmu_maildir.la\
+ ../mailbox/libmailbox.la\
+ ../lib/libmailutils.la\
+ @AUTHLIBS@ @LTLIBINTL@

@@ -22,6 +22,16 @@ SUBDIRS  = testsuite
 
 bin_PROGRAMS = sieve
 sieve_SOURCES = sieve.c
-sieve_LDADD = ../libsieve/libsieve.la ../mailbox/libmailbox.la ../lib/libmailutils.la @LTLIBINTL@
+sieve_LDADD =\
+ ../libsieve/libsieve.la\
+ ../mailbox/mbox/libmu_mbox.la\
+ ../mailbox/imap/libmu_imap.la\
+ ../mailbox/pop/libmu_pop.la\
+ ../mailbox/mh/libmu_mh.la\
+ ../mailbox/maildir/libmu_maildir.la\
+ ../mailbox/libmailbox.la\
+ ../lib/libmailutils.la\
+ @AUTHLIBS@ @LTLIBINTL@
+
 sieve_LDFLAGS = -export-dynamic