summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2005-11-03 11:46:57 +0000
committerSergey Poznyakoff <gray@gnu.org.ua>2005-11-03 11:46:57 +0000
commitd60d6a3bed703958e644602ae9988aa490f8fb36 (patch)
tree5ca5a5f407ee0d5fd9b887e6a45f437a06a69f2c
parentd31b8eee4d194b75bff5f4c36da6d016d68f6ad8 (diff)
downloadmailutils-d60d6a3bed703958e644602ae9988aa490f8fb36.tar.gz
mailutils-d60d6a3bed703958e644602ae9988aa490f8fb36.tar.bz2
Load libmuauth before libmailutils
-rw-r--r--comsat/Makefile.am2
-rw-r--r--dotlock/Makefile.am2
-rw-r--r--examples/Makefile.am16
-rw-r--r--frm/Makefile.am2
-rw-r--r--guimb/Makefile.am2
-rw-r--r--imap4d/Makefile.am2
-rw-r--r--mail.local/Makefile.am3
-rw-r--r--mail.remote/Makefile.am2
-rw-r--r--mapi/Makefile.am2
-rw-r--r--messages/Makefile.am2
-rw-r--r--mh/Makefile.am2
-rw-r--r--movemail/Makefile.am2
-rw-r--r--pop3d/Makefile.am4
-rw-r--r--readmsg/Makefile.am2
-rw-r--r--sieve/Makefile.am2
15 files changed, 24 insertions, 23 deletions
diff --git a/comsat/Makefile.am b/comsat/Makefile.am
index 56c0612ce..709e26c99 100644
--- a/comsat/Makefile.am
+++ b/comsat/Makefile.am
@@ -24,7 +24,7 @@ sbin_PROGRAMS = comsatd
comsatd_SOURCES = action.c cfg.c comsat.c comsat.h
comsatd_LDADD = \
+ ../lib/libmuaux.la\
../mailbox/mbox/libmu_mbox.la\
../mailbox/libmailutils.la\
- ../lib/libmuaux.la\
@MU_COMMON_LIBRARIES@
diff --git a/dotlock/Makefile.am b/dotlock/Makefile.am
index be2134172..63c4d6186 100644
--- a/dotlock/Makefile.am
+++ b/dotlock/Makefile.am
@@ -21,7 +21,7 @@ INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I${top_builddir}/include/mailutils/gn
bin_PROGRAMS = dotlock
-dotlock_LDADD = ../mailbox/libmailutils.la ../lib/libmuaux.la @MU_COMMON_LIBRARIES@
+dotlock_LDADD = ../lib/libmuaux.la ../mailbox/libmailutils.la @MU_COMMON_LIBRARIES@
install-exec-hook:
for i in $(bin_PROGRAMS); do\
diff --git a/examples/Makefile.am b/examples/Makefile.am
index e17aafbf6..76171bf2e 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -54,27 +54,28 @@ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib\
AM_LDFLAGS = ../mailbox/libmailutils.la ../lib/libmuaux.la @MU_COMMON_LIBRARIES@
argcv_LDADD =\
- ../mailbox/libmailutils.la\
- ../lib/libmuaux.la
+ ../lib/libmuaux.la\
+ ../mailbox/libmailutils.la
numaddr_la_SOURCES = numaddr.c
numaddr_la_LIBADD = ../libsieve/libsieve.la
numaddr_la_LDFLAGS = -module -avoid-version -no-undefined
mimetest_LDADD =\
+ ../lib/libmuaux.la\
../mailbox/mbox/libmu_mbox.la\
../mailbox/imap/libmu_imap.la\
../mailbox/pop/libmu_pop.la\
../mailbox/libmailutils.la\
- ../lib/libmuaux.la\
@AUTHLIBS@
mta_LDADD =\
+ ../lib/libmuaux.la\
../mailbox/mbox/libmu_mbox.la\
- ../mailbox/libmailutils.la\
- ../lib/libmuaux.la
+ ../mailbox/libmailutils.la
sfrom_LDADD =\
+ ../lib/libmuaux.la\
../mailbox/mbox/libmu_mbox.la\
../mailbox/imap/libmu_imap.la\
../mailbox/pop/libmu_pop.la\
@@ -82,19 +83,18 @@ sfrom_LDADD =\
../mailbox/mh/libmu_mh.la\
../mailbox/maildir/libmu_maildir.la\
../mailbox/libmailutils.la\
- ../lib/libmuaux.la\
@AUTHLIBS@
pop3client_LDADD = \
+ ../lib/libmuaux.la\
../mailbox/pop/libmu_pop.la\
../mailbox/libmailutils.la\
- ../lib/libmuaux.la\
@AUTHLIBS@ @READLINE_LIBS@
nntpclient_LDADD = \
+ ../lib/libmuaux.la\
../mailbox/nntp/libmu_nntp.la\
../mailbox/libmailutils.la\
- ../lib/libmuaux.la\
@AUTHLIBS@ @READLINE_LIBS@
lsf_LDADD = \
diff --git a/frm/Makefile.am b/frm/Makefile.am
index f9badea35..0e259e90c 100644
--- a/frm/Makefile.am
+++ b/frm/Makefile.am
@@ -30,6 +30,7 @@ frm_LDADD = $(common_ldadd)
from_LDADD = $(common_ldadd)
common_ldadd = \
+ ../lib/libmuaux.la\
../mailbox/mbox/libmu_mbox.la\
../mailbox/imap/libmu_imap.la\
../mailbox/pop/libmu_pop.la\
@@ -37,6 +38,5 @@ common_ldadd = \
../mailbox/mh/libmu_mh.la\
../mailbox/maildir/libmu_maildir.la\
../mailbox/libmailutils.la\
- ../lib/libmuaux.la\
@AUTHLIBS@ @FRIBIDI_LIBS@ @MU_COMMON_LIBRARIES@
diff --git a/guimb/Makefile.am b/guimb/Makefile.am
index 51dfa26ec..8efaec590 100644
--- a/guimb/Makefile.am
+++ b/guimb/Makefile.am
@@ -27,6 +27,7 @@ bin_PROGRAMS=@GUIMB@
EXTRA_PROGRAMS=guimb
guimb_SOURCES=main.c collect.c util.c guimb.h
guimb_LDADD = \
+ ../lib/libmuaux.la\
../libmu_scm/libmu_scm.la\
../mailbox/mbox/libmu_mbox.la\
../mailbox/imap/libmu_imap.la\
@@ -35,5 +36,4 @@ guimb_LDADD = \
../mailbox/mh/libmu_mh.la\
../mailbox/maildir/libmu_maildir.la\
../mailbox/libmailutils.la\
- ../lib/libmuaux.la\
@AUTHLIBS@ @GUILE_LIBS@ @MU_COMMON_LIBRARIES@
diff --git a/imap4d/Makefile.am b/imap4d/Makefile.am
index 330223f95..c211c518a 100644
--- a/imap4d/Makefile.am
+++ b/imap4d/Makefile.am
@@ -63,12 +63,12 @@ imap4d_SOURCES = \
imap4d_LDADD = \
@IMAP_AUTHOBJS@\
+ ../lib/libmuaux.la\
@AUTHLIBS@ \
../mailbox/mbox/libmu_mbox.la\
../mailbox/mh/libmu_mh.la\
../mailbox/maildir/libmu_maildir.la\
../mailbox/libmailutils.la\
- ../lib/libmuaux.la\
@SERV_AUTHLIBS@ @MU_COMMON_LIBRARIES@
## This kludge is necessary to correctly establish imap4d -> IMAP_AUTHOBJS
diff --git a/mail.local/Makefile.am b/mail.local/Makefile.am
index f04943492..ec09139f5 100644
--- a/mail.local/Makefile.am
+++ b/mail.local/Makefile.am
@@ -27,10 +27,11 @@ mail_local_LDADD = \
@LIBMU_SCM@ @GUILE_LIBS@\
@LIBMU_SCM_DEPS@\
@AUTHLIBS@\
+ ../lib/libmuaux.la \
../mailbox/mbox/libmu_mbox.la \
../mailbox/libmailutils.la \
../libsieve/libsieve.la\
- ../lib/libmuaux.la @MU_COMMON_LIBRARIES@
+ @MU_COMMON_LIBRARIES@
install-exec-hook:
for i in $(libexec_PROGRAMS); do\
diff --git a/mail.remote/Makefile.am b/mail.remote/Makefile.am
index f80b1bad2..578a272d6 100644
--- a/mail.remote/Makefile.am
+++ b/mail.remote/Makefile.am
@@ -27,7 +27,7 @@ libexec_PROGRAMS = @BUILD_SMTP_PROGRAMS@
mail_remote_SOURCES = mail.remote.c
mail_remote_LDADD = \
- ../mailbox/libmailutils.la\
../lib/libmuaux.la\
+ ../mailbox/libmailutils.la\
@MU_COMMON_LIBRARIES@\
@AUTHLIBS@
diff --git a/mapi/Makefile.am b/mapi/Makefile.am
index 8aa83d298..c15a461a9 100644
--- a/mapi/Makefile.am
+++ b/mapi/Makefile.am
@@ -26,7 +26,7 @@ lib_LTLIBRARIES = libmapi.la
/* FIXME: This should be part of the default includes. */
EXTRA_DIST = mapi.h
-libmapi_LDADD = ../mailbox/libmailutils.la ../lib/libmuaux.la
+libmapi_LDADD = ../lib/libmuaux.la ../mailbox/libmailutils.la
libmapi_la_SOURCES = \
MAPIAddress.c \
diff --git a/messages/Makefile.am b/messages/Makefile.am
index c8398657e..432453706 100644
--- a/messages/Makefile.am
+++ b/messages/Makefile.am
@@ -25,6 +25,7 @@ SUBDIRS = testsuite
bin_PROGRAMS = messages
messages_SOURCES = messages.c
messages_LDADD =\
+ ../lib/libmuaux.la\
../mailbox/mbox/libmu_mbox.la\
../mailbox/imap/libmu_imap.la\
../mailbox/pop/libmu_pop.la\
@@ -32,5 +33,4 @@ messages_LDADD =\
../mailbox/mh/libmu_mh.la\
../mailbox/maildir/libmu_maildir.la\
../mailbox/libmailutils.la\
- ../lib/libmuaux.la\
@AUTHLIBS@ @MU_COMMON_LIBRARIES@
diff --git a/mh/Makefile.am b/mh/Makefile.am
index 398eaa7ad..dfcf3f087 100644
--- a/mh/Makefile.am
+++ b/mh/Makefile.am
@@ -124,6 +124,7 @@ INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_builddir}/include
AM_CPPFLAGS = -DMHLIBDIR=\"$(mhlibdir)\" -DMHBINDIR=\"$(bindir)\"
mh_LIBS = \
./libmh.a\
+ ../lib/libmuaux.la\
../mailbox/mbox/libmu_mbox.la\
../mailbox/imap/libmu_imap.la\
../mailbox/pop/libmu_pop.la\
@@ -131,7 +132,6 @@ mh_LIBS = \
../mailbox/nntp/libmu_nntp.la\
../mailbox/maildir/libmu_maildir.la\
../mailbox/libmailutils.la\
- ../lib/libmuaux.la\
@AUTHLIBS@ @MU_COMMON_LIBRARIES@
LDADD = $(mh_LIBS)
scan_LDADD = $(mh_LIBS) @CURSES_LIBS@
diff --git a/movemail/Makefile.am b/movemail/Makefile.am
index 964c60c0e..bdb14b18b 100644
--- a/movemail/Makefile.am
+++ b/movemail/Makefile.am
@@ -21,6 +21,7 @@ INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_builddir}/include
bin_PROGRAMS = movemail
movemail_LDADD = \
+ ../lib/libmuaux.la\
../mailbox/mbox/libmu_mbox.la\
../mailbox/imap/libmu_imap.la\
../mailbox/pop/libmu_pop.la\
@@ -28,5 +29,4 @@ movemail_LDADD = \
../mailbox/mh/libmu_mh.la\
../mailbox/maildir/libmu_maildir.la\
../mailbox/libmailutils.la\
- ../lib/libmuaux.la\
@AUTHLIBS@ @MU_COMMON_LIBRARIES@
diff --git a/pop3d/Makefile.am b/pop3d/Makefile.am
index bf998e040..c9a823be9 100644
--- a/pop3d/Makefile.am
+++ b/pop3d/Makefile.am
@@ -30,15 +30,15 @@ pop3d_SOURCES = apop.c auth.c capa.c dele.c extra.c pop3d.c pop3d.h \
pop3d_LDADD = \
@AUTHLIBS@ \
+ ../lib/libmuaux.la\
../mailbox/mbox/libmu_mbox.la\
../mailbox/mh/libmu_mh.la\
../mailbox/maildir/libmu_maildir.la\
../mailbox/libmailutils.la\
- ../lib/libmuaux.la\
@MU_COMMON_LIBRARIES@
popauth_SOURCES = popauth.c
-popauth_LDADD = ../mailbox/libmailutils.la ../lib/libmuaux.la @MU_COMMON_LIBRARIES@
+popauth_LDADD = ../lib/libmuaux.la ../mailbox/libmailutils.la @MU_COMMON_LIBRARIES@
pop3d_DEPENDENCIES = \
@AUTHLIBS_DEPENDENCY@ \
../mailbox/mbox/libmu_mbox.la\
diff --git a/readmsg/Makefile.am b/readmsg/Makefile.am
index ecb8c1751..352283001 100644
--- a/readmsg/Makefile.am
+++ b/readmsg/Makefile.am
@@ -26,6 +26,7 @@ bin_PROGRAMS = readmsg
readmsg_SOURCES = readmsg.c msglist.c readmsg.h
readmsg_LDADD =\
+ ../lib/libmuaux.la\
../mailbox/mbox/libmu_mbox.la\
../mailbox/imap/libmu_imap.la\
../mailbox/pop/libmu_pop.la\
@@ -33,5 +34,4 @@ readmsg_LDADD =\
../mailbox/mh/libmu_mh.la\
../mailbox/maildir/libmu_maildir.la\
../mailbox/libmailutils.la\
- ../lib/libmuaux.la\
@AUTHLIBS@ @MU_COMMON_LIBRARIES@
diff --git a/sieve/Makefile.am b/sieve/Makefile.am
index a1cc57a04..5be0d3a91 100644
--- a/sieve/Makefile.am
+++ b/sieve/Makefile.am
@@ -23,6 +23,7 @@ SUBDIRS = testsuite
bin_PROGRAMS = sieve
sieve_SOURCES = sieve.c
sieve_LDADD =\
+ ../lib/libmuaux.la\
../libsieve/libsieve.la\
../mailbox/mbox/libmu_mbox.la\
../mailbox/imap/libmu_imap.la\
@@ -31,7 +32,6 @@ sieve_LDADD =\
../mailbox/mh/libmu_mh.la\
../mailbox/maildir/libmu_maildir.la\
../mailbox/libmailutils.la\
- ../lib/libmuaux.la\
@AUTHLIBS@ @MU_COMMON_LIBRARIES@
sieve_LDFLAGS = -export-dynamic

Return to:

Send suggestions and report system problems to the System administrator.