diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2004-06-04 23:21:11 +0000 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2004-06-04 23:21:11 +0000 |
commit | b85aa07ee10b880880661a9eedadb7d08fc5a24e (patch) | |
tree | 952186d955bb3d5ad7b22a6e9c74accaba3742cc | |
parent | 2ed43469bc88f18badd0560f2ba610f5562d2b0c (diff) | |
download | mailutils-b85aa07ee10b880880661a9eedadb7d08fc5a24e.tar.gz mailutils-b85aa07ee10b880880661a9eedadb7d08fc5a24e.tar.bz2 |
Use MU_COMMON_LIBRARIES
-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 @@ -24,7 +24,7 @@ sbin_PROGRAMS = comsatd comsatd_SOURCES = action.c cfg.c comsat.c comsat.h 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 @@ -18,13 +18,13 @@ ## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I${top_builddir}/include/mailutils/gnu -I$(top_srcdir)/include -I$(top_srcdir)/libmu_scm @INTLINCS@ 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\ chown root:mail $(DESTDIR)$(bindir)/$$i;\ chmod 2755 $(DESTDIR)$(bindir)/$$i;\ done diff --git a/examples/Makefile.am b/examples/Makefile.am index 02f0259ea..76f48bf8f 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -19,12 +19,13 @@ noinst_PROGRAMS = \ addr\ base64\ listop\ url-parse\ sfrom\ + iconv\ mimetest\ murun\ muemail\ msg-send\ http\ mta\ @@ -40,13 +41,13 @@ moddir=@SIEVE_MODDIR@ mod_LTLIBRARIES = numaddr.la 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 numaddr_la_LDFLAGS = -module -avoid-version -no-undefined mimetest_LDADD =\ diff --git a/frm/Makefile.am b/frm/Makefile.am index 9be55394c..bcf518efe 100644 --- a/frm/Makefile.am +++ b/frm/Makefile.am @@ -28,7 +28,7 @@ frm_LDADD = \ ../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@ + @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 @@ -27,7 +27,7 @@ from_LDADD = \ ../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@ + @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 @@ -32,7 +32,7 @@ guimb_LDADD = \ ../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@ + @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 @@ -64,13 +64,13 @@ imap4d_LDADD = \ @IMAP_AUTHOBJS@\ ../mailbox/mbox/libmu_mbox.la\ ../mailbox/mh/libmu_mh.la\ ../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 imap4d_DEPENDENCIES = \ @IMAP_AUTHOBJS@\ ../mailbox/mbox/libmu_mbox.la\ 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 @@ -27,13 +27,13 @@ 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@ + ../lib/libmailutils.la @MU_COMMON_LIBRARIES@ install-exec-hook: for i in $(libexec_PROGRAMS); do\ chown root:mail $(DESTDIR)$(libexecdir)/$$i;\ chmod 4755 $(DESTDIR)$(libexecdir)/$$i;\ done 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 @@ -26,8 +26,8 @@ libexec_PROGRAMS = @BUILD_SMTP_PROGRAMS@ 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 @@ -28,13 +28,13 @@ mail_LDADD = \ ../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@ + @AUTHLIBS@ @READLINE_LIBS@ @MU_COMMON_LIBRARIES@ EXTRA_DIST = msgset.c mail_SOURCES = alias.c alt.c cd.c copy.c delete.c dp.c echo.c \ edit.c eq.c exit.c file.c folders.c followup.c from.c headers.c help.c \ hold.c if.c inc.c list.c mail.c mail.h mailline.c mbox.c msgset.y next.c \ diff --git a/mailbox/Makefile.am b/mailbox/Makefile.am index efcc71d90..638e90be3 100644 --- a/mailbox/Makefile.am +++ b/mailbox/Makefile.am @@ -51,12 +51,13 @@ body.c \ daemon.c \ date.c \ debug.c \ envelope.c \ file_stream.c \ filter.c \ +filter_iconv.c \ filter_rfc822.c \ filter_trans.c \ folder.c \ header.c \ iterator.c \ list.c \ @@ -101,19 +102,20 @@ BUILT_SOURCES = parsedate.c parsedate.c: $(srcdir)/parsedate.y $(YLWRAP) "$(YACC) $(AM_YFLAGS)" $< \ y.tab.c parsedate.c y.output parsedate.y.output \ -- -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 @@ -28,7 +28,7 @@ messages_LDADD =\ ../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@ + @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 @@ -128,13 +128,13 @@ mh_LIBS = \ ../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@ + @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 YLWRAP = $(SHELL) $(top_srcdir)/scripts/ylwrap AM_YFLAGS=-vt diff --git a/movemail/Makefile.am b/movemail/Makefile.am index 2fee6e6f1..3b51db231 100644 --- a/movemail/Makefile.am +++ b/movemail/Makefile.am @@ -25,7 +25,7 @@ movemail_LDADD = \ ../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@ + @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 @@ -31,10 +31,10 @@ pop3d_SOURCES = apop.c auth.c capa.c dele.c extra.c pop3d.c pop3d.h \ pop3d_LDADD = \ ../mailbox/mbox/libmu_mbox.la\ ../mailbox/mh/libmu_mh.la\ ../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 @@ -29,7 +29,7 @@ readmsg_LDADD =\ ../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@ + @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 @@ -28,10 +28,10 @@ sieve_LDADD =\ ../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@ + @AUTHLIBS@ @MU_COMMON_LIBRARIES@ sieve_LDFLAGS = -export-dynamic |