Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 27419f1a 27419f1af6ef56e08340fcf61361912672b149de by Sergey Poznyakoff
Options

Use MU_LIB_.* variables instead of referring to the libraries by their relative paths.

1 parent 841783ac
Inline Side-by-side
Showing 22 changed files with 146 additions and 113 deletions
...@@ -34,6 +34,6 @@ libmuauth_la_SOURCES = \ ...@@ -34,6 +34,6 @@ libmuauth_la_SOURCES = \
34 tls.c\ 34 tls.c\
35 virtual.c 35 virtual.c
36 36
37 libmuauth_la_LIBADD = @SQLLIB@ @LTLIBINTL@ 37 libmuauth_la_LIBADD = ${MU_LIB_MAILUTILS} @MU_AUTHLIBS@ @SQLLIB@ @LTLIBINTL@
38 libmuauth_la_LDFLAGS = -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@ 38 libmuauth_la_LDFLAGS = -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
39 libmuauth_la_DEPENDENCIES = @SQLLIB_DEPENDENCY@ 39 libmuauth_la_DEPENDENCIES = @SQLLIB_DEPENDENCY@
......
...@@ -25,8 +25,8 @@ comsatd_SOURCES = action.c cfg.c comsat.c comsat.h ...@@ -25,8 +25,8 @@ comsatd_SOURCES = action.c cfg.c comsat.c comsat.h
25 25
26 comsatd_LDADD = \ 26 comsatd_LDADD = \
27 ../lib/libmuaux.la\ 27 ../lib/libmuaux.la\
28 ../mailbox/mbox/libmu_mbox.la\ 28 ${MU_LIB_MBOX}\
29 ../mailbox/libmailutils.la\ 29 ${MU_LIB_MAILUTILS}\
30 @MU_COMMON_LIBRARIES@ 30 @MU_COMMON_LIBRARIES@
31 31
32 CFLOW_FLAGS=-i^s --brief -v 32 CFLOW_FLAGS=-i^s --brief -v
......
...@@ -25,7 +25,7 @@ AM_CPPFLAGS = -DGNULIB_ARGP_EXTERN_BASENAME=1 ...@@ -25,7 +25,7 @@ AM_CPPFLAGS = -DGNULIB_ARGP_EXTERN_BASENAME=1
25 mailutils_config_SOURCES = mailutils-config.c 25 mailutils_config_SOURCES = mailutils-config.c
26 mailutils_config_LDADD = \ 26 mailutils_config_LDADD = \
27 ../lib/libmuaux.la \ 27 ../lib/libmuaux.la \
28 ../mailbox/libmailutils.la \ 28 ${MU_LIB_MAILUTILS} \
29 @MU_COMMON_LIBRARIES@ 29 @MU_COMMON_LIBRARIES@
30 30
31 mailutils_config_CFLAGS = -DCOMPILE_FLAGS="\"-I$(includedir)\"" \ 31 mailutils_config_CFLAGS = -DCOMPILE_FLAGS="\"-I$(includedir)\"" \
...@@ -33,6 +33,6 @@ mailutils_config_CFLAGS = -DCOMPILE_FLAGS="\"-I$(includedir)\"" \ ...@@ -33,6 +33,6 @@ mailutils_config_CFLAGS = -DCOMPILE_FLAGS="\"-I$(includedir)\"" \
33 -I${top_srcdir}/lib \ 33 -I${top_srcdir}/lib \
34 -DLINK_FLAGS="\"-L$(libdir)\"" \ 34 -DLINK_FLAGS="\"-L$(libdir)\"" \
35 -DLINK_POSTFLAGS="\"$(LTLIBICONV)\"" \ 35 -DLINK_POSTFLAGS="\"$(LTLIBICONV)\"" \
36 -DAUTHLIBS="\"`echo $(MU_AUTHLIBS) | sed 's/.*libmuauth.la *//'`\"" \ 36 -DAUTHLIBS="\"$(MU_AUTHLIBS)\"" \
37 -DGUILE_LIBS="\"$(GUILE_LIBS)\"" \ 37 -DGUILE_LIBS="\"$(GUILE_LIBS)\"" \
38 -DI18NLIBS="\"`test $(BUILD_INCLUDED_LIBINTL) = no && echo $(LIBINTL)`\"" 38 -DI18NLIBS="\"`test $(BUILD_INCLUDED_LIBINTL) = no && echo $(LIBINTL)`\""
......
...@@ -21,7 +21,10 @@ INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@ ...@@ -21,7 +21,10 @@ INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@
21 21
22 bin_PROGRAMS = dotlock 22 bin_PROGRAMS = dotlock
23 23
24 dotlock_LDADD = ../lib/libmuaux.la ../mailbox/libmailutils.la @MU_COMMON_LIBRARIES@ 24 dotlock_LDADD = \
25 ../lib/libmuaux.la\
26 ${MU_LIB_MAILUTILS}\
27 @MU_COMMON_LIBRARIES@
25 28
26 install-exec-hook: 29 install-exec-hook:
27 for i in $(bin_PROGRAMS); do\ 30 for i in $(bin_PROGRAMS); do\
......
...@@ -49,61 +49,69 @@ mod_LTLIBRARIES = numaddr.la ...@@ -49,61 +49,69 @@ mod_LTLIBRARIES = numaddr.la
49 49
50 INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@ 50 INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@
51 51
52 AM_LDFLAGS = ../lib/libmuaux.la ../mailbox/libmailutils.la @MU_COMMON_LIBRARIES@ 52 AM_LDFLAGS = \
53 ../lib/libmuaux.la\
54 ${MU_LIB_MAILUTILS}\
55 @MU_COMMON_LIBRARIES@
53 56
54 argcv_LDADD =\ 57 argcv_LDADD =\
55 ../lib/libmuaux.la\ 58 ../lib/libmuaux.la\
56 ../mailbox/libmailutils.la 59 ${MU_LIB_MAILUTILS}
57 60
58 numaddr_la_SOURCES = numaddr.c 61 numaddr_la_SOURCES = numaddr.c
59 numaddr_la_LIBADD = ../libsieve/libsieve.la 62 numaddr_la_LIBADD = ${MU_LIB_SIEVE}
60 numaddr_la_LDFLAGS = -module -avoid-version -no-undefined 63 numaddr_la_LDFLAGS = -module -avoid-version -no-undefined
61 64
62 mimetest_LDADD =\ 65 mimetest_LDADD =\
63 ../lib/libmuaux.la\ 66 ../lib/libmuaux.la\
64 ../mailbox/mbox/libmu_mbox.la\ 67 ${MU_LIB_MBOX}\
65 ../mailbox/imap/libmu_imap.la\ 68 ${MU_LIB_IMAP}\
66 ../mailbox/pop/libmu_pop.la\ 69 ${MU_LIB_POP}\
70 ${MU_LIB_AUTH}\
67 @MU_AUTHLIBS@\ 71 @MU_AUTHLIBS@\
68 ../mailbox/libmailutils.la 72 ${MU_LIB_MAILUTILS}
69 73
70 mta_LDADD =\ 74 mta_LDADD =\
71 ../lib/libmuaux.la\ 75 ../lib/libmuaux.la\
72 ../mailbox/mbox/libmu_mbox.la\ 76 ${MU_LIB_MBOX}\
73 ../mailbox/libmailutils.la 77 ${MU_LIB_MAILUTILS}
74 78
75 sfrom_LDADD =\ 79 sfrom_LDADD =\
76 ../lib/libmuaux.la\ 80 ../lib/libmuaux.la\
77 ../mailbox/mbox/libmu_mbox.la\ 81 ${MU_LIB_MBOX}\
78 ../mailbox/imap/libmu_imap.la\ 82 ${MU_LIB_IMAP}\
79 ../mailbox/pop/libmu_pop.la\ 83 ${MU_LIB_POP}\
80 ../mailbox/nntp/libmu_nntp.la\ 84 ${MU_LIB_NNTP}\
81 ../mailbox/mh/libmu_mh.la\ 85 ${MU_LIB_MH}\
82 ../mailbox/maildir/libmu_maildir.la\ 86 ${MU_LIB_MAILDIR}\
87 ${MU_LIB_AUTH}\
83 @MU_AUTHLIBS@\ 88 @MU_AUTHLIBS@\
84 ../mailbox/libmailutils.la 89 ${MU_LIB_MAILUTILS}
85 90
86 pop3client_LDADD = \ 91 pop3client_LDADD = \
87 ../lib/libmuaux.la\ 92 ../lib/libmuaux.la\
88 ../mailbox/pop/libmu_pop.la\ 93 ${MU_LIB_POP}\
94 ${MU_LIB_AUTH}\
89 @MU_AUTHLIBS@\ 95 @MU_AUTHLIBS@\
90 ../mailbox/libmailutils.la\ 96 ${MU_LIB_MAILUTILS}\
91 @READLINE_LIBS@ 97 @READLINE_LIBS@
92 98
93 nntpclient_LDADD = \ 99 nntpclient_LDADD = \
94 ../lib/libmuaux.la\ 100 ../lib/libmuaux.la\
95 ../mailbox/nntp/libmu_nntp.la\ 101 ${MU_LIB_NNTP}\
102 ${MU_LIB_AUTH}\
96 @MU_AUTHLIBS@\ 103 @MU_AUTHLIBS@\
97 ../mailbox/libmailutils.la\ 104 ${MU_LIB_MAILUTILS}\
98 @READLINE_LIBS@ 105 @READLINE_LIBS@
99 106
100 lsf_LDADD = \ 107 lsf_LDADD = \
101 ../mailbox/mbox/libmu_mbox.la\ 108 ${MU_LIB_MBOX}\
102 ../mailbox/imap/libmu_imap.la\ 109 ${MU_LIB_IMAP}\
103 ../mailbox/pop/libmu_pop.la\ 110 ${MU_LIB_POP}\
104 ../mailbox/nntp/libmu_nntp.la\ 111 ${MU_LIB_NNTP}\
105 ../mailbox/mh/libmu_mh.la\ 112 ${MU_LIB_MH}\
106 ../mailbox/maildir/libmu_maildir.la\ 113 ${MU_LIB_MAILDIR}\
114 ${MU_LIB_AUTH}\
107 @MU_AUTHLIBS@ \ 115 @MU_AUTHLIBS@ \
108 ../mailbox/libmailutils.la 116 ${MU_LIB_MAILUTILS}
109 117
......
...@@ -30,14 +30,15 @@ from_LDADD = $(common_ldadd) ...@@ -30,14 +30,15 @@ from_LDADD = $(common_ldadd)
30 30
31 common_ldadd = \ 31 common_ldadd = \
32 ../lib/libmuaux.la\ 32 ../lib/libmuaux.la\
33 ../mailbox/mbox/libmu_mbox.la\ 33 ${MU_LIB_MBOX}\
34 ../mailbox/imap/libmu_imap.la\ 34 ${MU_LIB_IMAP}\
35 ../mailbox/pop/libmu_pop.la\ 35 ${MU_LIB_POP}\
36 ../mailbox/nntp/libmu_nntp.la\ 36 ${MU_LIB_NNTP}\
37 ../mailbox/mh/libmu_mh.la\ 37 ${MU_LIB_MH}\
38 ../mailbox/maildir/libmu_maildir.la\ 38 ${MU_LIB_MAILDIR}\
39 ${MU_LIB_AUTH}\
39 @MU_AUTHLIBS@\ 40 @MU_AUTHLIBS@\
40 ../mailbox/libmailutils.la\ 41 ${MU_LIB_MAILUTILS}\
41 @FRIBIDI_LIBS@ @MU_COMMON_LIBRARIES@ 42 @FRIBIDI_LIBS@ @MU_COMMON_LIBRARIES@
42 43
43 CFLOW_FLAGS=-i^s --brief -v 44 CFLOW_FLAGS=-i^s --brief -v
......
...@@ -27,12 +27,13 @@ guimb_SOURCES=main.c collect.c util.c guimb.h ...@@ -27,12 +27,13 @@ guimb_SOURCES=main.c collect.c util.c guimb.h
27 guimb_LDADD = \ 27 guimb_LDADD = \
28 ../lib/libmuaux.la\ 28 ../lib/libmuaux.la\
29 ../libmu_scm/libmu_scm.la\ 29 ../libmu_scm/libmu_scm.la\
30 ../mailbox/mbox/libmu_mbox.la\ 30 ${MU_LIB_MBOX}\
31 ../mailbox/imap/libmu_imap.la\ 31 ${MU_LIB_IMAP}\
32 ../mailbox/pop/libmu_pop.la\ 32 ${MU_LIB_POP}\
33 ../mailbox/nntp/libmu_nntp.la\ 33 ${MU_LIB_NNTP}\
34 ../mailbox/mh/libmu_mh.la\ 34 ${MU_LIB_MH}\
35 ../mailbox/maildir/libmu_maildir.la\ 35 ${MU_LIB_MAILDIR}\
36 ${MU_LIB_AUTH}\
36 @MU_AUTHLIBS@\ 37 @MU_AUTHLIBS@\
37 ../mailbox/libmailutils.la\ 38 ${MU_LIB_MAILUTILS}\
38 @GUILE_LIBS@ @MU_COMMON_LIBRARIES@ 39 @GUILE_LIBS@ @MU_COMMON_LIBRARIES@
......
...@@ -62,11 +62,12 @@ imap4d_SOURCES = \ ...@@ -62,11 +62,12 @@ imap4d_SOURCES = \
62 imap4d_LDADD = \ 62 imap4d_LDADD = \
63 @IMAP_AUTHOBJS@\ 63 @IMAP_AUTHOBJS@\
64 ../lib/libmuaux.la\ 64 ../lib/libmuaux.la\
65 ../mailbox/mbox/libmu_mbox.la\ 65 ${MU_LIB_MBOX}\
66 ../mailbox/mh/libmu_mh.la\ 66 ${MU_LIB_MH}\
67 ../mailbox/maildir/libmu_maildir.la\ 67 ${MU_LIB_MAILDIR}\
68 ${MU_LIB_AUTH}\
68 @MU_AUTHLIBS@ \ 69 @MU_AUTHLIBS@ \
69 ../mailbox/libmailutils.la\ 70 ${MU_LIB_MAILUTILS}\
70 @SERV_AUTHLIBS@ @MU_COMMON_LIBRARIES@ 71 @SERV_AUTHLIBS@ @MU_COMMON_LIBRARIES@
71 72
72 ## This kludge is necessary to correctly establish imap4d -> IMAP_AUTHOBJS 73 ## This kludge is necessary to correctly establish imap4d -> IMAP_AUTHOBJS
...@@ -78,8 +79,8 @@ imap4d_DEPENDENCIES = \ ...@@ -78,8 +79,8 @@ imap4d_DEPENDENCIES = \
78 @IMAP_AUTHOBJS@\ 79 @IMAP_AUTHOBJS@\
79 @MU_AUTHLIBS_DEPENDENCY@\ 80 @MU_AUTHLIBS_DEPENDENCY@\
80 ../lib/libmuaux.la\ 81 ../lib/libmuaux.la\
81 ../mailbox/mbox/libmu_mbox.la\ 82 ${MU_LIB_MBOX}\
82 ../mailbox/libmailutils.la 83 ${MU_LIB_MAILUTILS}
83 84
84 EXTRA_DIST=auth_gss.c auth_gsasl.c 85 EXTRA_DIST=auth_gss.c auth_gsasl.c
85 86
......
...@@ -38,6 +38,15 @@ libmu_scm_la_SOURCES=\ ...@@ -38,6 +38,15 @@ libmu_scm_la_SOURCES=\
38 mu_scm.h 38 mu_scm.h
39 39
40 libmu_scm_la_LDFLAGS = -rpath $(libdir) -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@ 40 libmu_scm_la_LDFLAGS = -rpath $(libdir) -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
41 libmu_scm_la_LIBADD = \
42 ${MU_LIB_MBOX}\
43 ${MU_LIB_IMAP}\
44 ${MU_LIB_POP}\
45 ${MU_LIB_NNTP}\
46 ${MU_LIB_MH}\
47 ${MU_LIB_MAILDIR}\
48 ${MU_LIB_MAILUTILS}\
49 @GUILE_LIBS@
41 50
42 EXTRA_DIST=mailutils.scm mailutils.scm.in 51 EXTRA_DIST=mailutils.scm mailutils.scm.in
43 52
......
...@@ -42,7 +42,8 @@ libsieve_la_SOURCES = \ ...@@ -42,7 +42,8 @@ libsieve_la_SOURCES = \
42 sieve-lex.c\ 42 sieve-lex.c\
43 tests.c\ 43 tests.c\
44 util.c 44 util.c
45 libsieve_la_LIBADD = @LTDL_LIB@ 45 libsieve_la_LIBADD = ${MU_LIB_MAILUTILS} @LTDL_LIB@
46 libsieve_la_LDFLAGS = -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
46 47
47 noinst_HEADERS = sieve.h 48 noinst_HEADERS = sieve.h
48 49
......
...@@ -27,7 +27,7 @@ mod_LTLIBRARIES = \ ...@@ -27,7 +27,7 @@ mod_LTLIBRARIES = \
27 27
28 INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@ 28 INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@
29 29
30 AM_LDFLAGS = ../../lib/libmuaux.la ../../mailbox/libmailutils.la 30 AM_LDFLAGS = ../../lib/libmuaux.la ${MU_LIB_MAILUTILS}
31 31
32 list_la_SOURCES = list.c 32 list_la_SOURCES = list.c
33 list_la_LIBADD = ../libsieve.la 33 list_la_LIBADD = ../libsieve.la
......
...@@ -27,10 +27,11 @@ mail_local_LDADD = \ ...@@ -27,10 +27,11 @@ mail_local_LDADD = \
27 @LIBMU_SCM@ @GUILE_LIBS@\ 27 @LIBMU_SCM@ @GUILE_LIBS@\
28 @LIBMU_SCM_DEPS@\ 28 @LIBMU_SCM_DEPS@\
29 ../lib/libmuaux.la \ 29 ../lib/libmuaux.la \
30 ../libsieve/libsieve.la\ 30 ${MU_LIB_SIEVE}\
31 ../mailbox/mbox/libmu_mbox.la\ 31 ${MU_LIB_MBOX}\
32 ${MU_LIB_AUTH}\
32 @MU_AUTHLIBS@\ 33 @MU_AUTHLIBS@\
33 ../mailbox/libmailutils.la \ 34 ${MU_LIB_MAILUTILS} \
34 @MU_COMMON_LIBRARIES@ 35 @MU_COMMON_LIBRARIES@
35 36
36 install-exec-hook: 37 install-exec-hook:
......
...@@ -28,6 +28,7 @@ mail_remote_SOURCES = mail.remote.c ...@@ -28,6 +28,7 @@ mail_remote_SOURCES = mail.remote.c
28 28
29 mail_remote_LDADD = \ 29 mail_remote_LDADD = \
30 ../lib/libmuaux.la\ 30 ../lib/libmuaux.la\
31 ${MU_LIB_AUTH}\
31 @MU_AUTHLIBS@\ 32 @MU_AUTHLIBS@\
32 ../mailbox/libmailutils.la\ 33 ${MU_LIB_MAILUTILS}\
33 @MU_COMMON_LIBRARIES@ 34 @MU_COMMON_LIBRARIES@
......
...@@ -25,14 +25,15 @@ bin_PROGRAMS = mail ...@@ -25,14 +25,15 @@ bin_PROGRAMS = mail
25 25
26 mail_LDADD = \ 26 mail_LDADD = \
27 ../lib/libmuaux.la\ 27 ../lib/libmuaux.la\
28 ../mailbox/mbox/libmu_mbox.la\ 28 ${MU_LIB_MBOX}\
29 ../mailbox/imap/libmu_imap.la\ 29 ${MU_LIB_IMAP}\
30 ../mailbox/pop/libmu_pop.la\ 30 ${MU_LIB_POP}\
31 ../mailbox/nntp/libmu_nntp.la\ 31 ${MU_LIB_NNTP}\
32 ../mailbox/mh/libmu_mh.la\ 32 ${MU_LIB_MH}\
33 ../mailbox/maildir/libmu_maildir.la\ 33 ${MU_LIB_MAILDIR}\
34 ${MU_LIB_AUTH}\
34 @MU_AUTHLIBS@\ 35 @MU_AUTHLIBS@\
35 ../mailbox/libmailutils.la\ 36 ${MU_LIB_MAILUTILS}\
36 @READLINE_LIBS@ @MU_COMMON_LIBRARIES@ 37 @READLINE_LIBS@ @MU_COMMON_LIBRARIES@
37 38
38 EXTRA_DIST = msgset.c 39 EXTRA_DIST = msgset.c
......
...@@ -26,7 +26,7 @@ lib_LTLIBRARIES = libmapi.la ...@@ -26,7 +26,7 @@ lib_LTLIBRARIES = libmapi.la
26 /* FIXME: This should be part of the default includes. */ 26 /* FIXME: This should be part of the default includes. */
27 EXTRA_DIST = mapi.h 27 EXTRA_DIST = mapi.h
28 28
29 libmapi_LDADD = ../lib/libmuaux.la ../mailbox/libmailutils.la 29 libmapi_LDADD = ../lib/libmuaux.la ${MU_LIB_MAILUTILS}
30 30
31 libmapi_la_SOURCES = \ 31 libmapi_la_SOURCES = \
32 MAPIAddress.c \ 32 MAPIAddress.c \
......
...@@ -25,14 +25,15 @@ bin_PROGRAMS = messages ...@@ -25,14 +25,15 @@ bin_PROGRAMS = messages
25 messages_SOURCES = messages.c 25 messages_SOURCES = messages.c
26 messages_LDADD =\ 26 messages_LDADD =\
27 ../lib/libmuaux.la\ 27 ../lib/libmuaux.la\
28 ../mailbox/mbox/libmu_mbox.la\ 28 ${MU_LIB_MBOX}\
29 ../mailbox/imap/libmu_imap.la\ 29 ${MU_LIB_IMAP}\
30 ../mailbox/pop/libmu_pop.la\ 30 ${MU_LIB_POP}\
31 ../mailbox/nntp/libmu_nntp.la\ 31 ${MU_LIB_NNTP}\
32 ../mailbox/mh/libmu_mh.la\ 32 ${MU_LIB_MH}\
33 ../mailbox/maildir/libmu_maildir.la\ 33 ${MU_LIB_MAILDIR}\
34 ${MU_LIB_AUTH}\
34 @MU_AUTHLIBS@\ 35 @MU_AUTHLIBS@\
35 ../mailbox/libmailutils.la\ 36 ${MU_LIB_MAILUTILS}\
36 @MU_COMMON_LIBRARIES@ 37 @MU_COMMON_LIBRARIES@
37 38
38 CFLOW_FLAGS=-i^s --brief -v 39 CFLOW_FLAGS=-i^s --brief -v
......
...@@ -129,14 +129,15 @@ AM_CPPFLAGS = -D_GNU_SOURCE -DMHLIBDIR=\"$(mhlibdir)\" -DMHBINDIR=\"$(bindir)\" ...@@ -129,14 +129,15 @@ AM_CPPFLAGS = -D_GNU_SOURCE -DMHLIBDIR=\"$(mhlibdir)\" -DMHBINDIR=\"$(bindir)\"
129 mh_LIBS = \ 129 mh_LIBS = \
130 ./libmh.a\ 130 ./libmh.a\
131 ../lib/libmuaux.la\ 131 ../lib/libmuaux.la\
132 ../mailbox/mbox/libmu_mbox.la\ 132 ${MU_LIB_MBOX}\
133 ../mailbox/imap/libmu_imap.la\ 133 ${MU_LIB_IMAP}\
134 ../mailbox/pop/libmu_pop.la\ 134 ${MU_LIB_POP}\
135 ../mailbox/mh/libmu_mh.la\ 135 ${MU_LIB_MH}\
136 ../mailbox/nntp/libmu_nntp.la\ 136 ${MU_LIB_NNTP}\
137 ../mailbox/maildir/libmu_maildir.la\ 137 ${MU_LIB_MAILDIR}\
138 ${MU_LIB_AUTH}\
138 @MU_AUTHLIBS@\ 139 @MU_AUTHLIBS@\
139 ../mailbox/libmailutils.la\ 140 ${MU_LIB_MAILUTILS}\
140 @MU_COMMON_LIBRARIES@ 141 @MU_COMMON_LIBRARIES@
141 LDADD = $(mh_LIBS) 142 LDADD = $(mh_LIBS)
142 scan_LDADD = $(mh_LIBS) @CURSES_LIBS@ 143 scan_LDADD = $(mh_LIBS) @CURSES_LIBS@
......
...@@ -50,6 +50,6 @@ BUILT_SOURCES = mimetypes-gram.c mimetypes-lex.c mimetypes-decl.h ...@@ -50,6 +50,6 @@ BUILT_SOURCES = mimetypes-gram.c mimetypes-lex.c mimetypes-decl.h
50 50
51 mimeview_LDADD = \ 51 mimeview_LDADD = \
52 ../lib/libmuaux.la \ 52 ../lib/libmuaux.la \
53 ../mailbox/libmailutils.la\ 53 ${MU_LIB_MAILUTILS}\
54 @LTLIBINTL@ 54 @LTLIBINTL@
55 55
......
...@@ -23,14 +23,15 @@ AM_CPPFLAGS = -DGNULIB_ARGP_EXTERN_BASENAME=1 ...@@ -23,14 +23,15 @@ AM_CPPFLAGS = -DGNULIB_ARGP_EXTERN_BASENAME=1
23 23
24 movemail_LDADD = \ 24 movemail_LDADD = \
25 ../lib/libmuaux.la\ 25 ../lib/libmuaux.la\
26 ../mailbox/mbox/libmu_mbox.la\ 26 ${MU_LIB_MBOX}\
27 ../mailbox/imap/libmu_imap.la\ 27 ${MU_LIB_IMAP}\
28 ../mailbox/pop/libmu_pop.la\ 28 ${MU_LIB_POP}\
29 ../mailbox/nntp/libmu_nntp.la\ 29 ${MU_LIB_NNTP}\
30 ../mailbox/mh/libmu_mh.la\ 30 ${MU_LIB_MH}\
31 ../mailbox/maildir/libmu_maildir.la\ 31 ${MU_LIB_MAILDIR}\
32 ${MU_LIB_AUTH}\
32 @MU_AUTHLIBS@\ 33 @MU_AUTHLIBS@\
33 ../mailbox/libmailutils.la\ 34 ${MU_LIB_MAILUTILS}\
34 @MU_COMMON_LIBRARIES@ 35 @MU_COMMON_LIBRARIES@
35 36
36 CFLOW_FLAGS=-i^s --brief -v 37 CFLOW_FLAGS=-i^s --brief -v
......
...@@ -30,22 +30,23 @@ pop3d_SOURCES = apop.c auth.c capa.c dele.c extra.c pop3d.c pop3d.h \ ...@@ -30,22 +30,23 @@ pop3d_SOURCES = apop.c auth.c capa.c dele.c extra.c pop3d.c pop3d.h \
30 30
31 pop3d_LDADD = \ 31 pop3d_LDADD = \
32 ../lib/libmuaux.la\ 32 ../lib/libmuaux.la\
33 ../mailbox/mbox/libmu_mbox.la\ 33 ${MU_LIB_MBOX}\
34 ../mailbox/mh/libmu_mh.la\ 34 ${MU_LIB_MH}\
35 ../mailbox/maildir/libmu_maildir.la\ 35 ${MU_LIB_MAILDIR}\
36 ${MU_LIB_AUTH}\
36 @MU_AUTHLIBS@ \ 37 @MU_AUTHLIBS@ \
37 ../mailbox/libmailutils.la\ 38 ${MU_LIB_MAILUTILS}\
38 @MU_COMMON_LIBRARIES@ 39 @MU_COMMON_LIBRARIES@
39 40
40 popauth_SOURCES = popauth.c 41 popauth_SOURCES = popauth.c
41 popauth_LDADD = ../lib/libmuaux.la ../mailbox/libmailutils.la @MU_COMMON_LIBRARIES@ 42 popauth_LDADD = ../lib/libmuaux.la ${MU_LIB_MAILUTILS} @MU_COMMON_LIBRARIES@
42 pop3d_DEPENDENCIES = \ 43 pop3d_DEPENDENCIES = \
43 @MU_AUTHLIBS_DEPENDENCY@ \ 44 @MU_AUTHLIBS_DEPENDENCY@ \
44 ../lib/libmuaux.la \ 45 ../lib/libmuaux.la \
45 ../mailbox/mbox/libmu_mbox.la\ 46 ${MU_LIB_MBOX}\
46 ../mailbox/mh/libmu_mh.la\ 47 ${MU_LIB_MH}\
47 ../mailbox/maildir/libmu_maildir.la\ 48 ${MU_LIB_MAILDIR}\
48 ../mailbox/libmailutils.la 49 ${MU_LIB_MAILUTILS}
49 50
50 CFLOW_FLAGS=-i^s --brief -v 51 CFLOW_FLAGS=-i^s --brief -v
51 pop3d_CFLOW_INPUT=$(pop3d_OBJECTS:.$(OBJEXT)=.c) 52 pop3d_CFLOW_INPUT=$(pop3d_OBJECTS:.$(OBJEXT)=.c)
......
...@@ -26,12 +26,13 @@ readmsg_SOURCES = readmsg.c msglist.c readmsg.h ...@@ -26,12 +26,13 @@ readmsg_SOURCES = readmsg.c msglist.c readmsg.h
26 26
27 readmsg_LDADD =\ 27 readmsg_LDADD =\
28 ../lib/libmuaux.la\ 28 ../lib/libmuaux.la\
29 ../mailbox/mbox/libmu_mbox.la\ 29 ${MU_LIB_MBOX}\
30 ../mailbox/imap/libmu_imap.la\ 30 ${MU_LIB_IMAP}\
31 ../mailbox/pop/libmu_pop.la\ 31 ${MU_LIB_POP}\
32 ../mailbox/nntp/libmu_nntp.la\ 32 ${MU_LIB_NNTP}\
33 ../mailbox/mh/libmu_mh.la\ 33 ${MU_LIB_MH}\
34 ../mailbox/maildir/libmu_maildir.la\ 34 ${MU_LIB_MAILDIR}\
35 ${MU_LIB_AUTH}\
35 @MU_AUTHLIBS@\ 36 @MU_AUTHLIBS@\
36 ../mailbox/libmailutils.la\ 37 ${MU_LIB_MAILUTILS}\
37 @MU_COMMON_LIBRARIES@ 38 @MU_COMMON_LIBRARIES@
......
...@@ -24,15 +24,16 @@ bin_PROGRAMS = sieve ...@@ -24,15 +24,16 @@ bin_PROGRAMS = sieve
24 sieve_SOURCES = sieve.c 24 sieve_SOURCES = sieve.c
25 sieve_LDADD =\ 25 sieve_LDADD =\
26 ../lib/libmuaux.la\ 26 ../lib/libmuaux.la\
27 ../libsieve/libsieve.la\ 27 ${MU_LIB_SIEVE}\
28 ../mailbox/mbox/libmu_mbox.la\ 28 ${MU_LIB_MBOX}\
29 ../mailbox/imap/libmu_imap.la\ 29 ${MU_LIB_IMAP}\
30 ../mailbox/pop/libmu_pop.la\ 30 ${MU_LIB_POP}\
31 ../mailbox/nntp/libmu_nntp.la\ 31 ${MU_LIB_NNTP}\
32 ../mailbox/mh/libmu_mh.la\ 32 ${MU_LIB_MH}\
33 ../mailbox/maildir/libmu_maildir.la\ 33 ${MU_LIB_MAILDIR}\
34 ${MU_LIB_AUTH}\
34 @MU_AUTHLIBS@\ 35 @MU_AUTHLIBS@\
35 ../mailbox/libmailutils.la\ 36 ${MU_LIB_MAILUTILS}\
36 @MU_COMMON_LIBRARIES@ 37 @MU_COMMON_LIBRARIES@
37 38
38 sieve_LDFLAGS = -export-dynamic 39 sieve_LDFLAGS = -export-dynamic
......