diff options
-rw-r--r-- | comsat/Makefile.am | 2 | ||||
-rw-r--r-- | dotlock/Makefile.am | 2 | ||||
-rw-r--r-- | examples/Makefile.am | 3 | ||||
-rw-r--r-- | frm/Makefile.am | 2 | ||||
-rw-r--r-- | from/Makefile.am | 2 | ||||
-rw-r--r-- | guimb/Makefile.am | 2 | ||||
-rw-r--r-- | imap4d/Makefile.am | 2 | ||||
-rw-r--r-- | mail.local/Makefile.am | 2 | ||||
-rw-r--r-- | mail.remote/Makefile.am | 2 | ||||
-rw-r--r-- | mail/Makefile.am | 2 | ||||
-rw-r--r-- | mailbox/Makefile.am | 6 | ||||
-rw-r--r-- | messages/Makefile.am | 2 | ||||
-rw-r--r-- | mh/Makefile.am | 2 | ||||
-rw-r--r-- | movemail/Makefile.am | 2 | ||||
-rw-r--r-- | pop3d/Makefile.am | 4 | ||||
-rw-r--r-- | readmsg/Makefile.am | 2 | ||||
-rw-r--r-- | sieve/Makefile.am | 2 |
17 files changed, 22 insertions, 19 deletions
diff --git a/comsat/Makefile.am b/comsat/Makefile.am index 38fdfbf71..7956b4915 100644 --- a/comsat/Makefile.am +++ b/comsat/Makefile.am @@ -27,4 +27,4 @@ comsatd_LDADD = \ ../mailbox/mbox/libmu_mbox.la\ ../mailbox/libmailbox.la\ ../lib/libmailutils.la\ - @LTLIBINTL@ + @MU_COMMON_LIBRARIES@ diff --git a/dotlock/Makefile.am b/dotlock/Makefile.am index 6210e6cba..4fec290b7 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/libmailbox.la ../lib/libmailutils.la @LTLIBINTL@ +dotlock_LDADD = ../mailbox/libmailbox.la ../lib/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 02f0259ea..76f48bf8f 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -22,6 +22,7 @@ noinst_PROGRAMS = \ listop\ url-parse\ sfrom\ + iconv\ mimetest\ murun\ muemail\ @@ -43,7 +44,7 @@ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib\ -I$(top_builddir)/include/mailutils/gnu\ -I$(top_srcdir)/mailbox @INTLINCS@ -AM_LDFLAGS = ../mailbox/libmailbox.la ../lib/libmailutils.la +AM_LDFLAGS = ../mailbox/libmailbox.la ../lib/libmailutils.la @MU_COMMON_LIBRARIES@ numaddr_la_SOURCES = numaddr.c numaddr_la_LIBADD = ../libsieve/libsieve.la diff --git a/frm/Makefile.am b/frm/Makefile.am index 9be55394c..bcf518efe 100644 --- a/frm/Makefile.am +++ b/frm/Makefile.am @@ -31,4 +31,4 @@ frm_LDADD = \ ../mailbox/maildir/libmu_maildir.la\ ../mailbox/libmailbox.la\ ../lib/libmailutils.la\ - @AUTHLIBS@ @LTLIBINTL@ + @AUTHLIBS@ @MU_COMMON_LIBRARIES@ diff --git a/from/Makefile.am b/from/Makefile.am index 7455be292..3aa5f7dc9 100644 --- a/from/Makefile.am +++ b/from/Makefile.am @@ -30,4 +30,4 @@ from_LDADD = \ ../mailbox/maildir/libmu_maildir.la\ ../mailbox/libmailbox.la\ ../lib/libmailutils.la\ - @AUTHLIBS@ @LTLIBINTL@ + @AUTHLIBS@ @MU_COMMON_LIBRARIES@ diff --git a/guimb/Makefile.am b/guimb/Makefile.am index 6f3a93d79..d5c9b90d8 100644 --- a/guimb/Makefile.am +++ b/guimb/Makefile.am @@ -35,4 +35,4 @@ guimb_LDADD = \ ../mailbox/maildir/libmu_maildir.la\ ../mailbox/libmailbox.la\ ../lib/libmailutils.la\ - @AUTHLIBS@ @GUILE_LIBS@ @LTLIBINTL@ + @AUTHLIBS@ @GUILE_LIBS@ @MU_COMMON_LIBRARIES@ diff --git a/imap4d/Makefile.am b/imap4d/Makefile.am index 4f2315ebd..458c53679 100644 --- a/imap4d/Makefile.am +++ b/imap4d/Makefile.am @@ -67,7 +67,7 @@ imap4d_LDADD = \ ../mailbox/maildir/libmu_maildir.la\ ../mailbox/libmailbox.la\ ../lib/libmailutils.la\ - @AUTHLIBS@ @SERV_AUTHLIBS@ @LTLIBINTL@ + @AUTHLIBS@ @SERV_AUTHLIBS@ @MU_COMMON_LIBRARIES@ ## This kludge is necessary to correctly establish imap4d -> IMAP_AUTHOBJS ## dependency. Think about better approach --gray diff --git a/mail.local/Makefile.am b/mail.local/Makefile.am index 4b1233c56..37c84b3f6 100644 --- a/mail.local/Makefile.am +++ b/mail.local/Makefile.am @@ -30,7 +30,7 @@ mail_local_LDADD = \ ../mailbox/libmailbox.la \ @AUTHLIBS@\ ../libsieve/libsieve.la\ - ../lib/libmailutils.la @LTLIBINTL@ + ../lib/libmailutils.la @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 dfdb86d7f..13df57640 100644 --- a/mail.remote/Makefile.am +++ b/mail.remote/Makefile.am @@ -29,5 +29,5 @@ mail_remote_SOURCES = mail.remote.c mail_remote_LDADD = \ ../mailbox/libmailbox.la\ ../lib/libmailutils.la\ - @LTLIBINTL@\ + @MU_COMMON_LIBRARIES@\ @AUTHLIBS@ diff --git a/mail/Makefile.am b/mail/Makefile.am index 161a644ce..f5c92287c 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -31,7 +31,7 @@ mail_LDADD = \ ../mailbox/maildir/libmu_maildir.la\ ../mailbox/libmailbox.la\ ../lib/libmailutils.la\ - @AUTHLIBS@ @READLINE_LIBS@ @LTLIBINTL@ + @AUTHLIBS@ @READLINE_LIBS@ @MU_COMMON_LIBRARIES@ EXTRA_DIST = msgset.c diff --git a/mailbox/Makefile.am b/mailbox/Makefile.am index efcc71d90..638e90be3 100644 --- a/mailbox/Makefile.am +++ b/mailbox/Makefile.am @@ -54,6 +54,7 @@ debug.c \ envelope.c \ file_stream.c \ filter.c \ +filter_iconv.c \ filter_rfc822.c \ filter_trans.c \ folder.c \ @@ -104,15 +105,16 @@ parsedate.c: $(srcdir)/parsedate.y -- -yy pd_yy libmailbox_la_DEPENDENCIES = @MU_LTLIBOBJS@ -libmailbox_la_LIBADD = @MU_LTLIBOBJS@ @LTLIBINTL@ +libmailbox_la_LIBADD = @MU_LTLIBOBJS@ @MU_COMMON_LIBRARIES@ libmailbox_la_LDFLAGS = -version-info 0:0:0 mailutils_config_SOURCES = mailutils-config.c -mailutils_config_LDADD = ./libmailbox.la ../lib/libmailutils.la @LTLIBINTL@ +mailutils_config_LDADD = ./libmailbox.la ../lib/libmailutils.la @MU_COMMON_LIBRARIES@ mailutils_config_CFLAGS = -DCOMPILE_FLAGS="\"-I$(includedir)\"" \ -I$(top_srcdir)/intl \ -I${top_srcdir}/lib \ -DLINK_FLAGS="\"-L$(libdir)\"" \ + -DLINK_POSTFLAGS="\"$(LTLIBICONV)\"" \ -DAUTHLIBS="\"`echo $(AUTHLIBS) | sed 's/.*libmuauth.la *//'`\"" \ -DGUILE_LIBS="\"$(GUILE_LIBS)\"" \ -DI18NLIBS="\"`test $(BUILD_INCLUDED_LIBINTL) = no && echo $(LIBINTL)`\"" diff --git a/messages/Makefile.am b/messages/Makefile.am index b1b8c4083..847247e6f 100644 --- a/messages/Makefile.am +++ b/messages/Makefile.am @@ -31,4 +31,4 @@ messages_LDADD =\ ../mailbox/maildir/libmu_maildir.la\ ../mailbox/libmailbox.la\ ../lib/libmailutils.la\ - @AUTHLIBS@ @LTLIBINTL@ + @AUTHLIBS@ @MU_COMMON_LIBRARIES@ diff --git a/mh/Makefile.am b/mh/Makefile.am index 24b8a0503..e96733183 100644 --- a/mh/Makefile.am +++ b/mh/Makefile.am @@ -131,7 +131,7 @@ mh_LIBS = \ ../mailbox/maildir/libmu_maildir.la\ ../mailbox/libmailbox.la\ ../lib/libmailutils.la\ - @AUTHLIBS@ @LTLIBINTL@ + @AUTHLIBS@ @MU_COMMON_LIBRARIES@ LDADD = $(mh_LIBS) scan_LDADD = $(mh_LIBS) @CURSES_LIBS@ pick_SOURCES = pick.c pick.h pick-gram.c pick-gram.h diff --git a/movemail/Makefile.am b/movemail/Makefile.am index 2fee6e6f1..3b51db231 100644 --- a/movemail/Makefile.am +++ b/movemail/Makefile.am @@ -28,4 +28,4 @@ movemail_LDADD = \ ../mailbox/maildir/libmu_maildir.la\ ../mailbox/libmailbox.la\ ../lib/libmailutils.la\ - @AUTHLIBS@ @LTLIBINTL@ + @AUTHLIBS@ @MU_COMMON_LIBRARIES@ diff --git a/pop3d/Makefile.am b/pop3d/Makefile.am index 0165d2693..c950b54c5 100644 --- a/pop3d/Makefile.am +++ b/pop3d/Makefile.am @@ -34,7 +34,7 @@ pop3d_LDADD = \ ../mailbox/maildir/libmu_maildir.la\ ../mailbox/libmailbox.la\ ../lib/libmailutils.la\ - @AUTHLIBS@ @LTLIBINTL@ + @AUTHLIBS@ @MU_COMMON_LIBRARIES@ popauth_SOURCES = popauth.c -popauth_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la @LTLIBINTL@ +popauth_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la @MU_COMMON_LIBRARIES@ diff --git a/readmsg/Makefile.am b/readmsg/Makefile.am index e56401ba3..b4f3b8f27 100644 --- a/readmsg/Makefile.am +++ b/readmsg/Makefile.am @@ -32,4 +32,4 @@ readmsg_LDADD =\ ../mailbox/maildir/libmu_maildir.la\ ../mailbox/libmailbox.la\ ../lib/libmailutils.la\ - @AUTHLIBS@ @LTLIBINTL@ + @AUTHLIBS@ @MU_COMMON_LIBRARIES@ diff --git a/sieve/Makefile.am b/sieve/Makefile.am index e1756cbba..c783e74cd 100644 --- a/sieve/Makefile.am +++ b/sieve/Makefile.am @@ -31,7 +31,7 @@ sieve_LDADD =\ ../mailbox/maildir/libmu_maildir.la\ ../mailbox/libmailbox.la\ ../lib/libmailutils.la\ - @AUTHLIBS@ @LTLIBINTL@ + @AUTHLIBS@ @MU_COMMON_LIBRARIES@ sieve_LDFLAGS = -export-dynamic |