summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--comsat/Makefile.am6
-rw-r--r--dotlock/Makefile.am1
-rw-r--r--examples/Makefile.am21
-rw-r--r--frm/Makefile.am10
-rw-r--r--from/Makefile.am10
-rw-r--r--guimb/Makefile.am13
-rw-r--r--imap4d/Makefile.am57
-rw-r--r--mail.local/Makefile.am11
-rw-r--r--mail/Makefile.am13
-rw-r--r--mailbox/Makefile.am17
-rw-r--r--messages/Makefile.am7
-rw-r--r--mh/Makefile.am11
-rw-r--r--pop3d/Makefile.am6
-rw-r--r--readmsg/Makefile.am10
-rw-r--r--sieve/Makefile.am12
15 files changed, 164 insertions, 41 deletions
diff --git a/comsat/Makefile.am b/comsat/Makefile.am
index 6fbd4d2c2..17ad8e0d9 100644
--- a/comsat/Makefile.am
+++ b/comsat/Makefile.am
@@ -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@
diff --git a/dotlock/Makefile.am b/dotlock/Makefile.am
index 5ee77bc38..95a22ab33 100644
--- a/dotlock/Makefile.am
+++ b/dotlock/Makefile.am
@@ -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@
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 6d74e240a..120b11af8 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -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
diff --git a/frm/Makefile.am b/frm/Makefile.am
index 443cf1f82..ccc65e8bc 100644
--- a/frm/Makefile.am
+++ b/frm/Makefile.am
@@ -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@
diff --git a/from/Makefile.am b/from/Makefile.am
index f27b2e80c..1eff747ec 100644
--- a/from/Makefile.am
+++ b/from/Makefile.am
@@ -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@
diff --git a/guimb/Makefile.am b/guimb/Makefile.am
index 1cc4da351..2a6450b31 100644
--- a/guimb/Makefile.am
+++ b/guimb/Makefile.am
@@ -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@
diff --git a/imap4d/Makefile.am b/imap4d/Makefile.am
index 407827f04..590bfa93f 100644
--- a/imap4d/Makefile.am
+++ b/imap4d/Makefile.am
@@ -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
diff --git a/mail.local/Makefile.am b/mail.local/Makefile.am
index 856e68b89..b43aa023f 100644
--- a/mail.local/Makefile.am
+++ b/mail.local/Makefile.am
@@ -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\
diff --git a/mail/Makefile.am b/mail/Makefile.am
index c63de70fa..d29f8e5c5 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -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
diff --git a/mailbox/Makefile.am b/mailbox/Makefile.am
index 064e6d9bd..4af7eb2d8 100644
--- a/mailbox/Makefile.am
+++ b/mailbox/Makefile.am
@@ -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
diff --git a/messages/Makefile.am b/messages/Makefile.am
index e4a41366e..ecb88c4f6 100644
--- a/messages/Makefile.am
+++ b/messages/Makefile.am
@@ -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@
diff --git a/mh/Makefile.am b/mh/Makefile.am
index dcc7fe281..a334e8276 100644
--- a/mh/Makefile.am
+++ b/mh/Makefile.am
@@ -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
diff --git a/pop3d/Makefile.am b/pop3d/Makefile.am
index a8806ab3f..d96bc4be9 100644
--- a/pop3d/Makefile.am
+++ b/pop3d/Makefile.am
@@ -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@
diff --git a/readmsg/Makefile.am b/readmsg/Makefile.am
index b90f15c70..7d9b9b0be 100644
--- a/readmsg/Makefile.am
+++ b/readmsg/Makefile.am
@@ -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@
diff --git a/sieve/Makefile.am b/sieve/Makefile.am
index f19f8f30d..305d8bf96 100644
--- a/sieve/Makefile.am
+++ b/sieve/Makefile.am
@@ -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

Return to:

Send suggestions and report system problems to the System administrator.