Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit b85aa07e b85aa07ee10b880880661a9eedadb7d08fc5a24e by Sergey Poznyakoff
Options

Use MU_COMMON_LIBRARIES

1 parent 2ed43469
Inline Side-by-side
Showing 17 changed files with 22 additions and 19 deletions
...@@ -27,4 +27,4 @@ comsatd_LDADD = \ ...@@ -27,4 +27,4 @@ comsatd_LDADD = \
27 ../mailbox/mbox/libmu_mbox.la\ 27 ../mailbox/mbox/libmu_mbox.la\
28 ../mailbox/libmailbox.la\ 28 ../mailbox/libmailbox.la\
29 ../lib/libmailutils.la\ 29 ../lib/libmailutils.la\
30 @LTLIBINTL@ 30 @MU_COMMON_LIBRARIES@
......
...@@ -21,7 +21,7 @@ INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I${top_builddir}/include/mailutils/gn ...@@ -21,7 +21,7 @@ INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I${top_builddir}/include/mailutils/gn
21 21
22 bin_PROGRAMS = dotlock 22 bin_PROGRAMS = dotlock
23 23
24 dotlock_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la @LTLIBINTL@ 24 dotlock_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la @MU_COMMON_LIBRARIES@
25 25
26 install-exec-hook: 26 install-exec-hook:
27 for i in $(bin_PROGRAMS); do\ 27 for i in $(bin_PROGRAMS); do\
......
...@@ -22,6 +22,7 @@ noinst_PROGRAMS = \ ...@@ -22,6 +22,7 @@ noinst_PROGRAMS = \
22 listop\ 22 listop\
23 url-parse\ 23 url-parse\
24 sfrom\ 24 sfrom\
25 iconv\
25 mimetest\ 26 mimetest\
26 murun\ 27 murun\
27 muemail\ 28 muemail\
...@@ -43,7 +44,7 @@ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib\ ...@@ -43,7 +44,7 @@ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib\
43 -I$(top_builddir)/include/mailutils/gnu\ 44 -I$(top_builddir)/include/mailutils/gnu\
44 -I$(top_srcdir)/mailbox @INTLINCS@ 45 -I$(top_srcdir)/mailbox @INTLINCS@
45 46
46 AM_LDFLAGS = ../mailbox/libmailbox.la ../lib/libmailutils.la 47 AM_LDFLAGS = ../mailbox/libmailbox.la ../lib/libmailutils.la @MU_COMMON_LIBRARIES@
47 48
48 numaddr_la_SOURCES = numaddr.c 49 numaddr_la_SOURCES = numaddr.c
49 numaddr_la_LIBADD = ../libsieve/libsieve.la 50 numaddr_la_LIBADD = ../libsieve/libsieve.la
......
...@@ -31,4 +31,4 @@ frm_LDADD = \ ...@@ -31,4 +31,4 @@ frm_LDADD = \
31 ../mailbox/maildir/libmu_maildir.la\ 31 ../mailbox/maildir/libmu_maildir.la\
32 ../mailbox/libmailbox.la\ 32 ../mailbox/libmailbox.la\
33 ../lib/libmailutils.la\ 33 ../lib/libmailutils.la\
34 @AUTHLIBS@ @LTLIBINTL@ 34 @AUTHLIBS@ @MU_COMMON_LIBRARIES@
......
...@@ -30,4 +30,4 @@ from_LDADD = \ ...@@ -30,4 +30,4 @@ from_LDADD = \
30 ../mailbox/maildir/libmu_maildir.la\ 30 ../mailbox/maildir/libmu_maildir.la\
31 ../mailbox/libmailbox.la\ 31 ../mailbox/libmailbox.la\
32 ../lib/libmailutils.la\ 32 ../lib/libmailutils.la\
33 @AUTHLIBS@ @LTLIBINTL@ 33 @AUTHLIBS@ @MU_COMMON_LIBRARIES@
......
...@@ -35,4 +35,4 @@ guimb_LDADD = \ ...@@ -35,4 +35,4 @@ guimb_LDADD = \
35 ../mailbox/maildir/libmu_maildir.la\ 35 ../mailbox/maildir/libmu_maildir.la\
36 ../mailbox/libmailbox.la\ 36 ../mailbox/libmailbox.la\
37 ../lib/libmailutils.la\ 37 ../lib/libmailutils.la\
38 @AUTHLIBS@ @GUILE_LIBS@ @LTLIBINTL@ 38 @AUTHLIBS@ @GUILE_LIBS@ @MU_COMMON_LIBRARIES@
......
...@@ -67,7 +67,7 @@ imap4d_LDADD = \ ...@@ -67,7 +67,7 @@ imap4d_LDADD = \
67 ../mailbox/maildir/libmu_maildir.la\ 67 ../mailbox/maildir/libmu_maildir.la\
68 ../mailbox/libmailbox.la\ 68 ../mailbox/libmailbox.la\
69 ../lib/libmailutils.la\ 69 ../lib/libmailutils.la\
70 @AUTHLIBS@ @SERV_AUTHLIBS@ @LTLIBINTL@ 70 @AUTHLIBS@ @SERV_AUTHLIBS@ @MU_COMMON_LIBRARIES@
71 71
72 ## This kludge is necessary to correctly establish imap4d -> IMAP_AUTHOBJS 72 ## This kludge is necessary to correctly establish imap4d -> IMAP_AUTHOBJS
73 ## dependency. Think about better approach --gray 73 ## dependency. Think about better approach --gray
......
...@@ -30,7 +30,7 @@ mail_local_LDADD = \ ...@@ -30,7 +30,7 @@ mail_local_LDADD = \
30 ../mailbox/libmailbox.la \ 30 ../mailbox/libmailbox.la \
31 @AUTHLIBS@\ 31 @AUTHLIBS@\
32 ../libsieve/libsieve.la\ 32 ../libsieve/libsieve.la\
33 ../lib/libmailutils.la @LTLIBINTL@ 33 ../lib/libmailutils.la @MU_COMMON_LIBRARIES@
34 34
35 install-exec-hook: 35 install-exec-hook:
36 for i in $(libexec_PROGRAMS); do\ 36 for i in $(libexec_PROGRAMS); do\
......
...@@ -29,5 +29,5 @@ mail_remote_SOURCES = mail.remote.c ...@@ -29,5 +29,5 @@ mail_remote_SOURCES = mail.remote.c
29 mail_remote_LDADD = \ 29 mail_remote_LDADD = \
30 ../mailbox/libmailbox.la\ 30 ../mailbox/libmailbox.la\
31 ../lib/libmailutils.la\ 31 ../lib/libmailutils.la\
32 @LTLIBINTL@\ 32 @MU_COMMON_LIBRARIES@\
33 @AUTHLIBS@ 33 @AUTHLIBS@
......
...@@ -31,7 +31,7 @@ mail_LDADD = \ ...@@ -31,7 +31,7 @@ mail_LDADD = \
31 ../mailbox/maildir/libmu_maildir.la\ 31 ../mailbox/maildir/libmu_maildir.la\
32 ../mailbox/libmailbox.la\ 32 ../mailbox/libmailbox.la\
33 ../lib/libmailutils.la\ 33 ../lib/libmailutils.la\
34 @AUTHLIBS@ @READLINE_LIBS@ @LTLIBINTL@ 34 @AUTHLIBS@ @READLINE_LIBS@ @MU_COMMON_LIBRARIES@
35 35
36 EXTRA_DIST = msgset.c 36 EXTRA_DIST = msgset.c
37 37
......
...@@ -54,6 +54,7 @@ debug.c \ ...@@ -54,6 +54,7 @@ debug.c \
54 envelope.c \ 54 envelope.c \
55 file_stream.c \ 55 file_stream.c \
56 filter.c \ 56 filter.c \
57 filter_iconv.c \
57 filter_rfc822.c \ 58 filter_rfc822.c \
58 filter_trans.c \ 59 filter_trans.c \
59 folder.c \ 60 folder.c \
...@@ -104,15 +105,16 @@ parsedate.c: $(srcdir)/parsedate.y ...@@ -104,15 +105,16 @@ parsedate.c: $(srcdir)/parsedate.y
104 -- -yy pd_yy 105 -- -yy pd_yy
105 106
106 libmailbox_la_DEPENDENCIES = @MU_LTLIBOBJS@ 107 libmailbox_la_DEPENDENCIES = @MU_LTLIBOBJS@
107 libmailbox_la_LIBADD = @MU_LTLIBOBJS@ @LTLIBINTL@ 108 libmailbox_la_LIBADD = @MU_LTLIBOBJS@ @MU_COMMON_LIBRARIES@
108 libmailbox_la_LDFLAGS = -version-info 0:0:0 109 libmailbox_la_LDFLAGS = -version-info 0:0:0
109 110
110 mailutils_config_SOURCES = mailutils-config.c 111 mailutils_config_SOURCES = mailutils-config.c
111 mailutils_config_LDADD = ./libmailbox.la ../lib/libmailutils.la @LTLIBINTL@ 112 mailutils_config_LDADD = ./libmailbox.la ../lib/libmailutils.la @MU_COMMON_LIBRARIES@
112 mailutils_config_CFLAGS = -DCOMPILE_FLAGS="\"-I$(includedir)\"" \ 113 mailutils_config_CFLAGS = -DCOMPILE_FLAGS="\"-I$(includedir)\"" \
113 -I$(top_srcdir)/intl \ 114 -I$(top_srcdir)/intl \
114 -I${top_srcdir}/lib \ 115 -I${top_srcdir}/lib \
115 -DLINK_FLAGS="\"-L$(libdir)\"" \ 116 -DLINK_FLAGS="\"-L$(libdir)\"" \
117 -DLINK_POSTFLAGS="\"$(LTLIBICONV)\"" \
116 -DAUTHLIBS="\"`echo $(AUTHLIBS) | sed 's/.*libmuauth.la *//'`\"" \ 118 -DAUTHLIBS="\"`echo $(AUTHLIBS) | sed 's/.*libmuauth.la *//'`\"" \
117 -DGUILE_LIBS="\"$(GUILE_LIBS)\"" \ 119 -DGUILE_LIBS="\"$(GUILE_LIBS)\"" \
118 -DI18NLIBS="\"`test $(BUILD_INCLUDED_LIBINTL) = no && echo $(LIBINTL)`\"" 120 -DI18NLIBS="\"`test $(BUILD_INCLUDED_LIBINTL) = no && echo $(LIBINTL)`\""
......
...@@ -31,4 +31,4 @@ messages_LDADD =\ ...@@ -31,4 +31,4 @@ messages_LDADD =\
31 ../mailbox/maildir/libmu_maildir.la\ 31 ../mailbox/maildir/libmu_maildir.la\
32 ../mailbox/libmailbox.la\ 32 ../mailbox/libmailbox.la\
33 ../lib/libmailutils.la\ 33 ../lib/libmailutils.la\
34 @AUTHLIBS@ @LTLIBINTL@ 34 @AUTHLIBS@ @MU_COMMON_LIBRARIES@
......
...@@ -131,7 +131,7 @@ mh_LIBS = \ ...@@ -131,7 +131,7 @@ mh_LIBS = \
131 ../mailbox/maildir/libmu_maildir.la\ 131 ../mailbox/maildir/libmu_maildir.la\
132 ../mailbox/libmailbox.la\ 132 ../mailbox/libmailbox.la\
133 ../lib/libmailutils.la\ 133 ../lib/libmailutils.la\
134 @AUTHLIBS@ @LTLIBINTL@ 134 @AUTHLIBS@ @MU_COMMON_LIBRARIES@
135 LDADD = $(mh_LIBS) 135 LDADD = $(mh_LIBS)
136 scan_LDADD = $(mh_LIBS) @CURSES_LIBS@ 136 scan_LDADD = $(mh_LIBS) @CURSES_LIBS@
137 pick_SOURCES = pick.c pick.h pick-gram.c pick-gram.h 137 pick_SOURCES = pick.c pick.h pick-gram.c pick-gram.h
......
...@@ -28,4 +28,4 @@ movemail_LDADD = \ ...@@ -28,4 +28,4 @@ movemail_LDADD = \
28 ../mailbox/maildir/libmu_maildir.la\ 28 ../mailbox/maildir/libmu_maildir.la\
29 ../mailbox/libmailbox.la\ 29 ../mailbox/libmailbox.la\
30 ../lib/libmailutils.la\ 30 ../lib/libmailutils.la\
31 @AUTHLIBS@ @LTLIBINTL@ 31 @AUTHLIBS@ @MU_COMMON_LIBRARIES@
......
...@@ -34,7 +34,7 @@ pop3d_LDADD = \ ...@@ -34,7 +34,7 @@ pop3d_LDADD = \
34 ../mailbox/maildir/libmu_maildir.la\ 34 ../mailbox/maildir/libmu_maildir.la\
35 ../mailbox/libmailbox.la\ 35 ../mailbox/libmailbox.la\
36 ../lib/libmailutils.la\ 36 ../lib/libmailutils.la\
37 @AUTHLIBS@ @LTLIBINTL@ 37 @AUTHLIBS@ @MU_COMMON_LIBRARIES@
38 38
39 popauth_SOURCES = popauth.c 39 popauth_SOURCES = popauth.c
40 popauth_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la @LTLIBINTL@ 40 popauth_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la @MU_COMMON_LIBRARIES@
......
...@@ -32,4 +32,4 @@ readmsg_LDADD =\ ...@@ -32,4 +32,4 @@ readmsg_LDADD =\
32 ../mailbox/maildir/libmu_maildir.la\ 32 ../mailbox/maildir/libmu_maildir.la\
33 ../mailbox/libmailbox.la\ 33 ../mailbox/libmailbox.la\
34 ../lib/libmailutils.la\ 34 ../lib/libmailutils.la\
35 @AUTHLIBS@ @LTLIBINTL@ 35 @AUTHLIBS@ @MU_COMMON_LIBRARIES@
......
...@@ -31,7 +31,7 @@ sieve_LDADD =\ ...@@ -31,7 +31,7 @@ sieve_LDADD =\
31 ../mailbox/maildir/libmu_maildir.la\ 31 ../mailbox/maildir/libmu_maildir.la\
32 ../mailbox/libmailbox.la\ 32 ../mailbox/libmailbox.la\
33 ../lib/libmailutils.la\ 33 ../lib/libmailutils.la\
34 @AUTHLIBS@ @LTLIBINTL@ 34 @AUTHLIBS@ @MU_COMMON_LIBRARIES@
35 35
36 sieve_LDFLAGS = -export-dynamic 36 sieve_LDFLAGS = -export-dynamic
37 37
......