diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2006-03-07 15:02:07 +0000 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2006-03-07 15:02:07 +0000 |
commit | 27419f1af6ef56e08340fcf61361912672b149de (patch) | |
tree | 930049cadc0c50e9f7dd3d5fa53c6d868d419153 | |
parent | 841783ac72068a4b1f8762227afa72cc46ce845c (diff) | |
download | mailutils-27419f1af6ef56e08340fcf61361912672b149de.tar.gz mailutils-27419f1af6ef56e08340fcf61361912672b149de.tar.bz2 |
Use MU_LIB_.* variables instead of referring to the libraries by their relative paths.
-rw-r--r-- | auth/Makefile.am | 2 | ||||
-rw-r--r-- | comsat/Makefile.am | 4 | ||||
-rw-r--r-- | config/Makefile.am | 4 | ||||
-rw-r--r-- | dotlock/Makefile.am | 5 | ||||
-rw-r--r-- | examples/Makefile.am | 62 | ||||
-rw-r--r-- | frm/Makefile.am | 15 | ||||
-rw-r--r-- | guimb/Makefile.am | 15 | ||||
-rw-r--r-- | imap4d/Makefile.am | 13 | ||||
-rw-r--r-- | libmu_scm/Makefile.am | 9 | ||||
-rw-r--r-- | libsieve/Makefile.am | 3 | ||||
-rw-r--r-- | libsieve/extensions/Makefile.am | 2 | ||||
-rw-r--r-- | mail.local/Makefile.am | 7 | ||||
-rw-r--r-- | mail.remote/Makefile.am | 3 | ||||
-rw-r--r-- | mail/Makefile.am | 15 | ||||
-rw-r--r-- | mapi/Makefile.am | 2 | ||||
-rw-r--r-- | messages/Makefile.am | 15 | ||||
-rw-r--r-- | mh/Makefile.am | 15 | ||||
-rw-r--r-- | mimeview/Makefile.am | 2 | ||||
-rw-r--r-- | movemail/Makefile.am | 15 | ||||
-rw-r--r-- | pop3d/Makefile.am | 19 | ||||
-rw-r--r-- | readmsg/Makefile.am | 15 | ||||
-rw-r--r-- | sieve/Makefile.am | 17 |
22 files changed, 146 insertions, 113 deletions
diff --git a/auth/Makefile.am b/auth/Makefile.am index f30fc3e16..8389388c2 100644 --- a/auth/Makefile.am +++ b/auth/Makefile.am @@ -34,6 +34,6 @@ libmuauth_la_SOURCES = \ tls.c\ virtual.c -libmuauth_la_LIBADD = @SQLLIB@ @LTLIBINTL@ +libmuauth_la_LIBADD = ${MU_LIB_MAILUTILS} @MU_AUTHLIBS@ @SQLLIB@ @LTLIBINTL@ libmuauth_la_LDFLAGS = -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@ libmuauth_la_DEPENDENCIES = @SQLLIB_DEPENDENCY@ diff --git a/comsat/Makefile.am b/comsat/Makefile.am index 3161c2375..3eb145815 100644 --- a/comsat/Makefile.am +++ b/comsat/Makefile.am @@ -25,8 +25,8 @@ comsatd_SOURCES = action.c cfg.c comsat.c comsat.h comsatd_LDADD = \ ../lib/libmuaux.la\ - ../mailbox/mbox/libmu_mbox.la\ - ../mailbox/libmailutils.la\ + ${MU_LIB_MBOX}\ + ${MU_LIB_MAILUTILS}\ @MU_COMMON_LIBRARIES@ CFLOW_FLAGS=-i^s --brief -v diff --git a/config/Makefile.am b/config/Makefile.am index 8f9db4251..1bcc3b71b 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -25,7 +25,7 @@ AM_CPPFLAGS = -DGNULIB_ARGP_EXTERN_BASENAME=1 mailutils_config_SOURCES = mailutils-config.c mailutils_config_LDADD = \ ../lib/libmuaux.la \ - ../mailbox/libmailutils.la \ + ${MU_LIB_MAILUTILS} \ @MU_COMMON_LIBRARIES@ mailutils_config_CFLAGS = -DCOMPILE_FLAGS="\"-I$(includedir)\"" \ @@ -33,6 +33,6 @@ mailutils_config_CFLAGS = -DCOMPILE_FLAGS="\"-I$(includedir)\"" \ -I${top_srcdir}/lib \ -DLINK_FLAGS="\"-L$(libdir)\"" \ -DLINK_POSTFLAGS="\"$(LTLIBICONV)\"" \ - -DAUTHLIBS="\"`echo $(MU_AUTHLIBS) | sed 's/.*libmuauth.la *//'`\"" \ + -DAUTHLIBS="\"$(MU_AUTHLIBS)\"" \ -DGUILE_LIBS="\"$(GUILE_LIBS)\"" \ -DI18NLIBS="\"`test $(BUILD_INCLUDED_LIBINTL) = no && echo $(LIBINTL)`\"" diff --git a/dotlock/Makefile.am b/dotlock/Makefile.am index 92b4ade82..9a6e73af7 100644 --- a/dotlock/Makefile.am +++ b/dotlock/Makefile.am @@ -21,7 +21,10 @@ INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@ bin_PROGRAMS = dotlock -dotlock_LDADD = ../lib/libmuaux.la ../mailbox/libmailutils.la @MU_COMMON_LIBRARIES@ +dotlock_LDADD = \ + ../lib/libmuaux.la\ + ${MU_LIB_MAILUTILS}\ + @MU_COMMON_LIBRARIES@ install-exec-hook: for i in $(bin_PROGRAMS); do\ diff --git a/examples/Makefile.am b/examples/Makefile.am index 67e8dbf82..a1dcb44ae 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -49,61 +49,69 @@ mod_LTLIBRARIES = numaddr.la INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@ -AM_LDFLAGS = ../lib/libmuaux.la ../mailbox/libmailutils.la @MU_COMMON_LIBRARIES@ +AM_LDFLAGS = \ + ../lib/libmuaux.la\ + ${MU_LIB_MAILUTILS}\ + @MU_COMMON_LIBRARIES@ argcv_LDADD =\ ../lib/libmuaux.la\ - ../mailbox/libmailutils.la + ${MU_LIB_MAILUTILS} numaddr_la_SOURCES = numaddr.c -numaddr_la_LIBADD = ../libsieve/libsieve.la +numaddr_la_LIBADD = ${MU_LIB_SIEVE} 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\ + ${MU_LIB_MBOX}\ + ${MU_LIB_IMAP}\ + ${MU_LIB_POP}\ + ${MU_LIB_AUTH}\ @MU_AUTHLIBS@\ - ../mailbox/libmailutils.la + ${MU_LIB_MAILUTILS} mta_LDADD =\ ../lib/libmuaux.la\ - ../mailbox/mbox/libmu_mbox.la\ - ../mailbox/libmailutils.la + ${MU_LIB_MBOX}\ + ${MU_LIB_MAILUTILS} sfrom_LDADD =\ ../lib/libmuaux.la\ - ../mailbox/mbox/libmu_mbox.la\ - ../mailbox/imap/libmu_imap.la\ - ../mailbox/pop/libmu_pop.la\ - ../mailbox/nntp/libmu_nntp.la\ - ../mailbox/mh/libmu_mh.la\ - ../mailbox/maildir/libmu_maildir.la\ + ${MU_LIB_MBOX}\ + ${MU_LIB_IMAP}\ + ${MU_LIB_POP}\ + ${MU_LIB_NNTP}\ + ${MU_LIB_MH}\ + ${MU_LIB_MAILDIR}\ + ${MU_LIB_AUTH}\ @MU_AUTHLIBS@\ - ../mailbox/libmailutils.la + ${MU_LIB_MAILUTILS} pop3client_LDADD = \ ../lib/libmuaux.la\ - ../mailbox/pop/libmu_pop.la\ + ${MU_LIB_POP}\ + ${MU_LIB_AUTH}\ @MU_AUTHLIBS@\ - ../mailbox/libmailutils.la\ + ${MU_LIB_MAILUTILS}\ @READLINE_LIBS@ nntpclient_LDADD = \ ../lib/libmuaux.la\ - ../mailbox/nntp/libmu_nntp.la\ + ${MU_LIB_NNTP}\ + ${MU_LIB_AUTH}\ @MU_AUTHLIBS@\ - ../mailbox/libmailutils.la\ + ${MU_LIB_MAILUTILS}\ @READLINE_LIBS@ lsf_LDADD = \ - ../mailbox/mbox/libmu_mbox.la\ - ../mailbox/imap/libmu_imap.la\ - ../mailbox/pop/libmu_pop.la\ - ../mailbox/nntp/libmu_nntp.la\ - ../mailbox/mh/libmu_mh.la\ - ../mailbox/maildir/libmu_maildir.la\ + ${MU_LIB_MBOX}\ + ${MU_LIB_IMAP}\ + ${MU_LIB_POP}\ + ${MU_LIB_NNTP}\ + ${MU_LIB_MH}\ + ${MU_LIB_MAILDIR}\ + ${MU_LIB_AUTH}\ @MU_AUTHLIBS@ \ - ../mailbox/libmailutils.la + ${MU_LIB_MAILUTILS} diff --git a/frm/Makefile.am b/frm/Makefile.am index 78ebcd13e..da44c4988 100644 --- a/frm/Makefile.am +++ b/frm/Makefile.am @@ -30,14 +30,15 @@ from_LDADD = $(common_ldadd) common_ldadd = \ ../lib/libmuaux.la\ - ../mailbox/mbox/libmu_mbox.la\ - ../mailbox/imap/libmu_imap.la\ - ../mailbox/pop/libmu_pop.la\ - ../mailbox/nntp/libmu_nntp.la\ - ../mailbox/mh/libmu_mh.la\ - ../mailbox/maildir/libmu_maildir.la\ + ${MU_LIB_MBOX}\ + ${MU_LIB_IMAP}\ + ${MU_LIB_POP}\ + ${MU_LIB_NNTP}\ + ${MU_LIB_MH}\ + ${MU_LIB_MAILDIR}\ + ${MU_LIB_AUTH}\ @MU_AUTHLIBS@\ - ../mailbox/libmailutils.la\ + ${MU_LIB_MAILUTILS}\ @FRIBIDI_LIBS@ @MU_COMMON_LIBRARIES@ CFLOW_FLAGS=-i^s --brief -v diff --git a/guimb/Makefile.am b/guimb/Makefile.am index 5b615cfff..16c12f86f 100644 --- a/guimb/Makefile.am +++ b/guimb/Makefile.am @@ -27,12 +27,13 @@ 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\ - ../mailbox/pop/libmu_pop.la\ - ../mailbox/nntp/libmu_nntp.la\ - ../mailbox/mh/libmu_mh.la\ - ../mailbox/maildir/libmu_maildir.la\ + ${MU_LIB_MBOX}\ + ${MU_LIB_IMAP}\ + ${MU_LIB_POP}\ + ${MU_LIB_NNTP}\ + ${MU_LIB_MH}\ + ${MU_LIB_MAILDIR}\ + ${MU_LIB_AUTH}\ @MU_AUTHLIBS@\ - ../mailbox/libmailutils.la\ + ${MU_LIB_MAILUTILS}\ @GUILE_LIBS@ @MU_COMMON_LIBRARIES@ diff --git a/imap4d/Makefile.am b/imap4d/Makefile.am index b500602a7..65e64af89 100644 --- a/imap4d/Makefile.am +++ b/imap4d/Makefile.am @@ -62,11 +62,12 @@ imap4d_SOURCES = \ imap4d_LDADD = \ @IMAP_AUTHOBJS@\ ../lib/libmuaux.la\ - ../mailbox/mbox/libmu_mbox.la\ - ../mailbox/mh/libmu_mh.la\ - ../mailbox/maildir/libmu_maildir.la\ + ${MU_LIB_MBOX}\ + ${MU_LIB_MH}\ + ${MU_LIB_MAILDIR}\ + ${MU_LIB_AUTH}\ @MU_AUTHLIBS@ \ - ../mailbox/libmailutils.la\ + ${MU_LIB_MAILUTILS}\ @SERV_AUTHLIBS@ @MU_COMMON_LIBRARIES@ ## This kludge is necessary to correctly establish imap4d -> IMAP_AUTHOBJS @@ -78,8 +79,8 @@ imap4d_DEPENDENCIES = \ @IMAP_AUTHOBJS@\ @MU_AUTHLIBS_DEPENDENCY@\ ../lib/libmuaux.la\ - ../mailbox/mbox/libmu_mbox.la\ - ../mailbox/libmailutils.la + ${MU_LIB_MBOX}\ + ${MU_LIB_MAILUTILS} EXTRA_DIST=auth_gss.c auth_gsasl.c diff --git a/libmu_scm/Makefile.am b/libmu_scm/Makefile.am index 0d28a4893..f1b12a658 100644 --- a/libmu_scm/Makefile.am +++ b/libmu_scm/Makefile.am @@ -38,6 +38,15 @@ libmu_scm_la_SOURCES=\ mu_scm.h libmu_scm_la_LDFLAGS = -rpath $(libdir) -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@ +libmu_scm_la_LIBADD = \ + ${MU_LIB_MBOX}\ + ${MU_LIB_IMAP}\ + ${MU_LIB_POP}\ + ${MU_LIB_NNTP}\ + ${MU_LIB_MH}\ + ${MU_LIB_MAILDIR}\ + ${MU_LIB_MAILUTILS}\ + @GUILE_LIBS@ EXTRA_DIST=mailutils.scm mailutils.scm.in diff --git a/libsieve/Makefile.am b/libsieve/Makefile.am index fb23104a7..03cdf4897 100644 --- a/libsieve/Makefile.am +++ b/libsieve/Makefile.am @@ -42,7 +42,8 @@ libsieve_la_SOURCES = \ sieve-lex.c\ tests.c\ util.c -libsieve_la_LIBADD = @LTDL_LIB@ +libsieve_la_LIBADD = ${MU_LIB_MAILUTILS} @LTDL_LIB@ +libsieve_la_LDFLAGS = -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@ noinst_HEADERS = sieve.h diff --git a/libsieve/extensions/Makefile.am b/libsieve/extensions/Makefile.am index 59de372bb..defebfcd9 100644 --- a/libsieve/extensions/Makefile.am +++ b/libsieve/extensions/Makefile.am @@ -27,7 +27,7 @@ mod_LTLIBRARIES = \ INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@ -AM_LDFLAGS = ../../lib/libmuaux.la ../../mailbox/libmailutils.la +AM_LDFLAGS = ../../lib/libmuaux.la ${MU_LIB_MAILUTILS} list_la_SOURCES = list.c list_la_LIBADD = ../libsieve.la diff --git a/mail.local/Makefile.am b/mail.local/Makefile.am index b14d4646e..871c6c05e 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@\ ../lib/libmuaux.la \ - ../libsieve/libsieve.la\ - ../mailbox/mbox/libmu_mbox.la\ + ${MU_LIB_SIEVE}\ + ${MU_LIB_MBOX}\ + ${MU_LIB_AUTH}\ @MU_AUTHLIBS@\ - ../mailbox/libmailutils.la \ + ${MU_LIB_MAILUTILS} \ @MU_COMMON_LIBRARIES@ install-exec-hook: diff --git a/mail.remote/Makefile.am b/mail.remote/Makefile.am index 66072a09e..30ff61e8f 100644 --- a/mail.remote/Makefile.am +++ b/mail.remote/Makefile.am @@ -28,6 +28,7 @@ mail_remote_SOURCES = mail.remote.c mail_remote_LDADD = \ ../lib/libmuaux.la\ + ${MU_LIB_AUTH}\ @MU_AUTHLIBS@\ - ../mailbox/libmailutils.la\ + ${MU_LIB_MAILUTILS}\ @MU_COMMON_LIBRARIES@ diff --git a/mail/Makefile.am b/mail/Makefile.am index 9e73e51a7..5c1240862 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -25,14 +25,15 @@ bin_PROGRAMS = mail mail_LDADD = \ ../lib/libmuaux.la\ - ../mailbox/mbox/libmu_mbox.la\ - ../mailbox/imap/libmu_imap.la\ - ../mailbox/pop/libmu_pop.la\ - ../mailbox/nntp/libmu_nntp.la\ - ../mailbox/mh/libmu_mh.la\ - ../mailbox/maildir/libmu_maildir.la\ + ${MU_LIB_MBOX}\ + ${MU_LIB_IMAP}\ + ${MU_LIB_POP}\ + ${MU_LIB_NNTP}\ + ${MU_LIB_MH}\ + ${MU_LIB_MAILDIR}\ + ${MU_LIB_AUTH}\ @MU_AUTHLIBS@\ - ../mailbox/libmailutils.la\ + ${MU_LIB_MAILUTILS}\ @READLINE_LIBS@ @MU_COMMON_LIBRARIES@ EXTRA_DIST = msgset.c diff --git a/mapi/Makefile.am b/mapi/Makefile.am index 7a5154be7..dc63ff9ad 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 = ../lib/libmuaux.la ../mailbox/libmailutils.la +libmapi_LDADD = ../lib/libmuaux.la ${MU_LIB_MAILUTILS} libmapi_la_SOURCES = \ MAPIAddress.c \ diff --git a/messages/Makefile.am b/messages/Makefile.am index b6e1a957a..d31835ea5 100644 --- a/messages/Makefile.am +++ b/messages/Makefile.am @@ -25,14 +25,15 @@ 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\ - ../mailbox/nntp/libmu_nntp.la\ - ../mailbox/mh/libmu_mh.la\ - ../mailbox/maildir/libmu_maildir.la\ + ${MU_LIB_MBOX}\ + ${MU_LIB_IMAP}\ + ${MU_LIB_POP}\ + ${MU_LIB_NNTP}\ + ${MU_LIB_MH}\ + ${MU_LIB_MAILDIR}\ + ${MU_LIB_AUTH}\ @MU_AUTHLIBS@\ - ../mailbox/libmailutils.la\ + ${MU_LIB_MAILUTILS}\ @MU_COMMON_LIBRARIES@ CFLOW_FLAGS=-i^s --brief -v diff --git a/mh/Makefile.am b/mh/Makefile.am index fc2f219ae..7853bc756 100644 --- a/mh/Makefile.am +++ b/mh/Makefile.am @@ -129,14 +129,15 @@ AM_CPPFLAGS = -D_GNU_SOURCE -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\ - ../mailbox/mh/libmu_mh.la\ - ../mailbox/nntp/libmu_nntp.la\ - ../mailbox/maildir/libmu_maildir.la\ + ${MU_LIB_MBOX}\ + ${MU_LIB_IMAP}\ + ${MU_LIB_POP}\ + ${MU_LIB_MH}\ + ${MU_LIB_NNTP}\ + ${MU_LIB_MAILDIR}\ + ${MU_LIB_AUTH}\ @MU_AUTHLIBS@\ - ../mailbox/libmailutils.la\ + ${MU_LIB_MAILUTILS}\ @MU_COMMON_LIBRARIES@ LDADD = $(mh_LIBS) scan_LDADD = $(mh_LIBS) @CURSES_LIBS@ diff --git a/mimeview/Makefile.am b/mimeview/Makefile.am index 565ba83d0..3ba2de5a9 100644 --- a/mimeview/Makefile.am +++ b/mimeview/Makefile.am @@ -50,6 +50,6 @@ BUILT_SOURCES = mimetypes-gram.c mimetypes-lex.c mimetypes-decl.h mimeview_LDADD = \ ../lib/libmuaux.la \ - ../mailbox/libmailutils.la\ + ${MU_LIB_MAILUTILS}\ @LTLIBINTL@ diff --git a/movemail/Makefile.am b/movemail/Makefile.am index c51bae24f..ed021618e 100644 --- a/movemail/Makefile.am +++ b/movemail/Makefile.am @@ -23,14 +23,15 @@ AM_CPPFLAGS = -DGNULIB_ARGP_EXTERN_BASENAME=1 movemail_LDADD = \ ../lib/libmuaux.la\ - ../mailbox/mbox/libmu_mbox.la\ - ../mailbox/imap/libmu_imap.la\ - ../mailbox/pop/libmu_pop.la\ - ../mailbox/nntp/libmu_nntp.la\ - ../mailbox/mh/libmu_mh.la\ - ../mailbox/maildir/libmu_maildir.la\ + ${MU_LIB_MBOX}\ + ${MU_LIB_IMAP}\ + ${MU_LIB_POP}\ + ${MU_LIB_NNTP}\ + ${MU_LIB_MH}\ + ${MU_LIB_MAILDIR}\ + ${MU_LIB_AUTH}\ @MU_AUTHLIBS@\ - ../mailbox/libmailutils.la\ + ${MU_LIB_MAILUTILS}\ @MU_COMMON_LIBRARIES@ CFLOW_FLAGS=-i^s --brief -v diff --git a/pop3d/Makefile.am b/pop3d/Makefile.am index 9cdf097cc..8fd9bd8f4 100644 --- a/pop3d/Makefile.am +++ b/pop3d/Makefile.am @@ -30,22 +30,23 @@ pop3d_SOURCES = apop.c auth.c capa.c dele.c extra.c pop3d.c pop3d.h \ pop3d_LDADD = \ ../lib/libmuaux.la\ - ../mailbox/mbox/libmu_mbox.la\ - ../mailbox/mh/libmu_mh.la\ - ../mailbox/maildir/libmu_maildir.la\ + ${MU_LIB_MBOX}\ + ${MU_LIB_MH}\ + ${MU_LIB_MAILDIR}\ + ${MU_LIB_AUTH}\ @MU_AUTHLIBS@ \ - ../mailbox/libmailutils.la\ + ${MU_LIB_MAILUTILS}\ @MU_COMMON_LIBRARIES@ popauth_SOURCES = popauth.c -popauth_LDADD = ../lib/libmuaux.la ../mailbox/libmailutils.la @MU_COMMON_LIBRARIES@ +popauth_LDADD = ../lib/libmuaux.la ${MU_LIB_MAILUTILS} @MU_COMMON_LIBRARIES@ pop3d_DEPENDENCIES = \ @MU_AUTHLIBS_DEPENDENCY@ \ ../lib/libmuaux.la \ - ../mailbox/mbox/libmu_mbox.la\ - ../mailbox/mh/libmu_mh.la\ - ../mailbox/maildir/libmu_maildir.la\ - ../mailbox/libmailutils.la + ${MU_LIB_MBOX}\ + ${MU_LIB_MH}\ + ${MU_LIB_MAILDIR}\ + ${MU_LIB_MAILUTILS} CFLOW_FLAGS=-i^s --brief -v pop3d_CFLOW_INPUT=$(pop3d_OBJECTS:.$(OBJEXT)=.c) diff --git a/readmsg/Makefile.am b/readmsg/Makefile.am index 464c003c9..cc74169d9 100644 --- a/readmsg/Makefile.am +++ b/readmsg/Makefile.am @@ -26,12 +26,13 @@ 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\ - ../mailbox/nntp/libmu_nntp.la\ - ../mailbox/mh/libmu_mh.la\ - ../mailbox/maildir/libmu_maildir.la\ + ${MU_LIB_MBOX}\ + ${MU_LIB_IMAP}\ + ${MU_LIB_POP}\ + ${MU_LIB_NNTP}\ + ${MU_LIB_MH}\ + ${MU_LIB_MAILDIR}\ + ${MU_LIB_AUTH}\ @MU_AUTHLIBS@\ - ../mailbox/libmailutils.la\ + ${MU_LIB_MAILUTILS}\ @MU_COMMON_LIBRARIES@ diff --git a/sieve/Makefile.am b/sieve/Makefile.am index 862d14074..d42f83a8f 100644 --- a/sieve/Makefile.am +++ b/sieve/Makefile.am @@ -24,15 +24,16 @@ 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\ - ../mailbox/pop/libmu_pop.la\ - ../mailbox/nntp/libmu_nntp.la\ - ../mailbox/mh/libmu_mh.la\ - ../mailbox/maildir/libmu_maildir.la\ + ${MU_LIB_SIEVE}\ + ${MU_LIB_MBOX}\ + ${MU_LIB_IMAP}\ + ${MU_LIB_POP}\ + ${MU_LIB_NNTP}\ + ${MU_LIB_MH}\ + ${MU_LIB_MAILDIR}\ + ${MU_LIB_AUTH}\ @MU_AUTHLIBS@\ - ../mailbox/libmailutils.la\ + ${MU_LIB_MAILUTILS}\ @MU_COMMON_LIBRARIES@ sieve_LDFLAGS = -export-dynamic |