summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--comsat/Makefile.am8
-rw-r--r--config/Makefile.am2
-rw-r--r--examples/Makefile.am16
-rw-r--r--frm/Makefile.am10
-rw-r--r--guimb/Makefile.am3
-rw-r--r--imap4d/Makefile.am16
-rw-r--r--libmu_scm/Makefile.am8
-rw-r--r--libsieve/Makefile.am8
-rw-r--r--mail.local/Makefile.am6
-rw-r--r--mail.remote/Makefile.am4
-rw-r--r--mail/Makefile.am13
-rw-r--r--mailbox/Makefile.am8
-rw-r--r--messages/Makefile.am11
-rw-r--r--mh/Makefile.am3
-rw-r--r--movemail/Makefile.am13
-rw-r--r--pop3d/Makefile.am12
-rw-r--r--readmsg/Makefile.am3
-rw-r--r--sieve/Makefile.am10
18 files changed, 125 insertions, 29 deletions
diff --git a/comsat/Makefile.am b/comsat/Makefile.am
index 709e26c..ef51b1c 100644
--- a/comsat/Makefile.am
+++ b/comsat/Makefile.am
@@ -28,3 +28,11 @@ comsatd_LDADD = \
../mailbox/mbox/libmu_mbox.la\
../mailbox/libmailutils.la\
@MU_COMMON_LIBRARIES@
+
+CFLOW_FLAGS=-i^s --brief -v
+comsatd_CFLOW_INPUT=$(comsatd_OBJECTS:.$(OBJEXT)=.c)
+comsatd.cflow: $(comsatd_CFLOW_INPUT) Makefile
+ cflow -o$@ $(CFLOW_FLAGS) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) \
+ $(comsatd_CFLOW_INPUT)
diff --git a/config/Makefile.am b/config/Makefile.am
index dfb09a3..a8c7f59 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -34,6 +34,6 @@ mailutils_config_CFLAGS = -DCOMPILE_FLAGS="\"-I$(includedir)\"" \
-I${top_srcdir}/lib \
-DLINK_FLAGS="\"-L$(libdir)\"" \
-DLINK_POSTFLAGS="\"$(LTLIBICONV)\"" \
- -DAUTHLIBS="\"`echo $(AUTHLIBS) | sed 's/.*libmuauth.la *//'`\"" \
+ -DAUTHLIBS="\"`echo $(MU_AUTHLIBS) | sed 's/.*libmuauth.la *//'`\"" \
-DGUILE_LIBS="\"$(GUILE_LIBS)\"" \
-DI18NLIBS="\"`test $(BUILD_INCLUDED_LIBINTL) = no && echo $(LIBINTL)`\""
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 76171bf..40a0d1a 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -66,8 +66,8 @@ mimetest_LDADD =\
../mailbox/mbox/libmu_mbox.la\
../mailbox/imap/libmu_imap.la\
../mailbox/pop/libmu_pop.la\
- ../mailbox/libmailutils.la\
- @AUTHLIBS@
+ @MU_AUTHLIBS@\
+ ../mailbox/libmailutils.la
mta_LDADD =\
../lib/libmuaux.la\
@@ -82,20 +82,22 @@ sfrom_LDADD =\
../mailbox/nntp/libmu_nntp.la\
../mailbox/mh/libmu_mh.la\
../mailbox/maildir/libmu_maildir.la\
- ../mailbox/libmailutils.la\
- @AUTHLIBS@
+ @MU_AUTHLIBS@\
+ ../mailbox/libmailutils.la
pop3client_LDADD = \
../lib/libmuaux.la\
../mailbox/pop/libmu_pop.la\
+ @MU_AUTHLIBS@\
../mailbox/libmailutils.la\
- @AUTHLIBS@ @READLINE_LIBS@
+ @READLINE_LIBS@
nntpclient_LDADD = \
../lib/libmuaux.la\
../mailbox/nntp/libmu_nntp.la\
+ @MU_AUTHLIBS@\
../mailbox/libmailutils.la\
- @AUTHLIBS@ @READLINE_LIBS@
+ @READLINE_LIBS@
lsf_LDADD = \
../mailbox/mbox/libmu_mbox.la\
@@ -104,6 +106,6 @@ lsf_LDADD = \
../mailbox/nntp/libmu_nntp.la\
../mailbox/mh/libmu_mh.la\
../mailbox/maildir/libmu_maildir.la\
- @AUTHLIBS@ \
+ @MU_AUTHLIBS@ \
../mailbox/libmailutils.la
diff --git a/frm/Makefile.am b/frm/Makefile.am
index 0e259e9..f2286db 100644
--- a/frm/Makefile.am
+++ b/frm/Makefile.am
@@ -37,6 +37,14 @@ common_ldadd = \
../mailbox/nntp/libmu_nntp.la\
../mailbox/mh/libmu_mh.la\
../mailbox/maildir/libmu_maildir.la\
+ @MU_AUTHLIBS@\
../mailbox/libmailutils.la\
- @AUTHLIBS@ @FRIBIDI_LIBS@ @MU_COMMON_LIBRARIES@
+ @FRIBIDI_LIBS@ @MU_COMMON_LIBRARIES@
+CFLOW_FLAGS=-i^s --brief -v
+frm_CFLOW_INPUT=$(frm_OBJECTS:.$(OBJEXT)=.c)
+frm.cflow: $(frm_CFLOW_INPUT) Makefile
+ cflow -o$@ $(CFLOW_FLAGS) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) \
+ $(frm_CFLOW_INPUT)
diff --git a/guimb/Makefile.am b/guimb/Makefile.am
index 8efaec5..19924ec 100644
--- a/guimb/Makefile.am
+++ b/guimb/Makefile.am
@@ -35,5 +35,6 @@ guimb_LDADD = \
../mailbox/nntp/libmu_nntp.la\
../mailbox/mh/libmu_mh.la\
../mailbox/maildir/libmu_maildir.la\
+ @MU_AUTHLIBS@\
../mailbox/libmailutils.la\
- @AUTHLIBS@ @GUILE_LIBS@ @MU_COMMON_LIBRARIES@
+ @GUILE_LIBS@ @MU_COMMON_LIBRARIES@
diff --git a/imap4d/Makefile.am b/imap4d/Makefile.am
index c211c51..ed824c9 100644
--- a/imap4d/Makefile.am
+++ b/imap4d/Makefile.am
@@ -19,7 +19,7 @@
INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/include \
-I$(top_srcdir)/mailbox \
- -I${top_builddir}/include/mailutils/gnu @AUTHINCS@ @SERV_AUTHINCS@ @INTLINCS@
+ -I${top_builddir}/include/mailutils/gnu @MU_AUTHINCS@ @SERV_AUTHINCS@ @INTLINCS@
SUBDIRS = testsuite
sbin_PROGRAMS = imap4d
@@ -64,23 +64,31 @@ imap4d_SOURCES = \
imap4d_LDADD = \
@IMAP_AUTHOBJS@\
../lib/libmuaux.la\
- @AUTHLIBS@ \
../mailbox/mbox/libmu_mbox.la\
../mailbox/mh/libmu_mh.la\
../mailbox/maildir/libmu_maildir.la\
+ @MU_AUTHLIBS@ \
../mailbox/libmailutils.la\
@SERV_AUTHLIBS@ @MU_COMMON_LIBRARIES@
## This kludge is necessary to correctly establish imap4d -> IMAP_AUTHOBJS
-## and imap4d -> AUTHLIBS dependencies. Automake stupidly refuses to
+## and imap4d -> MU_AUTHLIBS dependencies. Automake stupidly refuses to
## include them.
## Same kludge appears in pop3d/Makefile.am and auth/Makefile.am
## Think about better approach --gray
imap4d_DEPENDENCIES = \
@IMAP_AUTHOBJS@\
- @AUTHLIBS_DEPENDENCY@\
+ @MU_AUTHLIBS_DEPENDENCY@\
../mailbox/mbox/libmu_mbox.la\
../mailbox/libmailutils.la\
../lib/libmuaux.la
EXTRA_DIST=auth_gss.c auth_gsasl.c
+
+CFLOW_FLAGS=-i^s --brief
+imap4d_CFLOW_INPUT=$(imap4d_OBJECTS:.$(OBJEXT)=.c)
+imap4d.cflow: $(imap4d_CFLOW_INPUT) Makefile
+ cflow -o$@ $(CFLOW_FLAGS) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) \
+ $(imap4d_CFLOW_INPUT)
diff --git a/libmu_scm/Makefile.am b/libmu_scm/Makefile.am
index 58c2a30..3c3d680 100644
--- a/libmu_scm/Makefile.am
+++ b/libmu_scm/Makefile.am
@@ -91,3 +91,11 @@ install-data-hook:
$(LN_S) -f libmu_scm.so libguile-mailutils-v-$(VERSION).so; \
fi; \
cd $$here
+
+CFLOW_FLAGS=-i^s --brief -v
+libmu_scm_CFLOW_INPUT=$(libmu_scm_la_OBJECTS:.lo=.c)
+libmu_scm.cflow: $(libmu_scm_CFLOW_INPUT) Makefile
+ cflow -o$@ $(CFLOW_FLAGS) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) \
+ $(libmu_scm_CFLOW_INPUT)
diff --git a/libsieve/Makefile.am b/libsieve/Makefile.am
index 37872de..cba0d3b 100644
--- a/libsieve/Makefile.am
+++ b/libsieve/Makefile.am
@@ -65,3 +65,11 @@ sieve-gram.c sieve-gram.h: $(srcdir)/sieve.y
y.tab.c sieve-gram.c y.tab.h sieve-gram.h y.output y.output \
-- -yy mu_sieve_yy
+
+CFLOW_FLAGS=-i^s --brief -v
+libsieve_CFLOW_INPUT=$(libsieve_la_OBJECTS:.lo=.c)
+libsieve.cflow: $(libsieve_CFLOW_INPUT) Makefile
+ cflow -o$@ $(CFLOW_FLAGS) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) \
+ $(libsieve_CFLOW_INPUT)
diff --git a/mail.local/Makefile.am b/mail.local/Makefile.am
index ec09139..4484a34 100644
--- a/mail.local/Makefile.am
+++ b/mail.local/Makefile.am
@@ -26,11 +26,11 @@ mail_local_SOURCES = main.c mailquota.c script.c mail.local.h
mail_local_LDADD = \
@LIBMU_SCM@ @GUILE_LIBS@\
@LIBMU_SCM_DEPS@\
- @AUTHLIBS@\
../lib/libmuaux.la \
- ../mailbox/mbox/libmu_mbox.la \
- ../mailbox/libmailutils.la \
../libsieve/libsieve.la\
+ ../mailbox/mbox/libmu_mbox.la\
+ @MU_AUTHLIBS@\
+ ../mailbox/libmailutils.la \
@MU_COMMON_LIBRARIES@
install-exec-hook:
diff --git a/mail.remote/Makefile.am b/mail.remote/Makefile.am
index 0309836..c96c2c5 100644
--- a/mail.remote/Makefile.am
+++ b/mail.remote/Makefile.am
@@ -28,6 +28,6 @@ mail_remote_SOURCES = mail.remote.c
mail_remote_LDADD = \
../lib/libmuaux.la\
+ @MU_AUTHLIBS@\
../mailbox/libmailutils.la\
- @MU_COMMON_LIBRARIES@\
- @AUTHLIBS@
+ @MU_COMMON_LIBRARIES@
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 28bf5c2..e9a8bec 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -18,7 +18,7 @@
## 02110-1301 USA
AM_YFLAGS=-vt
-INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_builddir}/include/mailutils/gnu -I${top_srcdir}/mailbox @INTLINCS@ @AUTHINCS@
+INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_builddir}/include/mailutils/gnu -I${top_srcdir}/mailbox @INTLINCS@ @MU_AUTHINCS@
AM_CFLAGS = -DSITE_MAIL_RC=\"@SITE_MAIL_RC@\"
bin_PROGRAMS = mail
@@ -31,8 +31,9 @@ mail_LDADD = \
../mailbox/nntp/libmu_nntp.la\
../mailbox/mh/libmu_mh.la\
../mailbox/maildir/libmu_maildir.la\
+ @MU_AUTHLIBS@\
../mailbox/libmailutils.la\
- @AUTHLIBS@ @READLINE_LIBS@ @MU_COMMON_LIBRARIES@
+ @READLINE_LIBS@ @MU_COMMON_LIBRARIES@
EXTRA_DIST = msgset.c
@@ -94,3 +95,11 @@ mail_SOURCES = \
z.c
SUBDIRS = testsuite
+
+CFLOW_FLAGS=-i^s --brief -v
+mail_CFLOW_INPUT=$(mail_OBJECTS:.$(OBJEXT)=.c)
+mail.cflow: $(mail_CFLOW_INPUT) Makefile
+ cflow -o$@ $(CFLOW_FLAGS) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) \
+ $(mail_CFLOW_INPUT)
diff --git a/mailbox/Makefile.am b/mailbox/Makefile.am
index 7c7c8f4..7137e3d 100644
--- a/mailbox/Makefile.am
+++ b/mailbox/Makefile.am
@@ -185,3 +185,11 @@ libmailutils_la_SOURCES += vsnprintf.h
libmailutils_la_SOURCES += xsize.h
EXTRA_DIST += getdelim.c getdelim.h getdelim.c getopt.c getopt1.c md5.c md5.h md5.c memchr.c mempcpy.c mempcpy.h mempcpy.c vasnprintf.c printf-args.c printf-parse.c asnprintf.c getline.c getline.c getline.h getline.c getndelim2.c vsnprintf.c unlocked-io.h strchrnul.c regex.c strcasecmp.c strncasecmp.c strndup.c strndup.h strndup.c strnlen.c strnlen.h strnlen.c strtok_r.c
+
+CFLOW_FLAGS=-i^s --brief
+mailutils_CFLOW_INPUT=$(libmailutils_la_OBJECTS:.lo=.c)
+mailutils.cflow: $(mailutils_CFLOW_INPUT) Makefile
+ cflow -o$@ $(CFLOW_FLAGS) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) \
+ $(mailutils_CFLOW_INPUT)
diff --git a/messages/Makefile.am b/messages/Makefile.am
index 4324537..34421f5 100644
--- a/messages/Makefile.am
+++ b/messages/Makefile.am
@@ -32,5 +32,14 @@ messages_LDADD =\
../mailbox/nntp/libmu_nntp.la\
../mailbox/mh/libmu_mh.la\
../mailbox/maildir/libmu_maildir.la\
+ @MU_AUTHLIBS@\
../mailbox/libmailutils.la\
- @AUTHLIBS@ @MU_COMMON_LIBRARIES@
+ @MU_COMMON_LIBRARIES@
+
+CFLOW_FLAGS=-i^s --brief -v
+messages_CFLOW_INPUT=$(messages_OBJECTS:.$(OBJEXT)=.c)
+messages.cflow: $(messages_CFLOW_INPUT) Makefile
+ cflow -o$@ $(CFLOW_FLAGS) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) \
+ $(messages_CFLOW_INPUT)
diff --git a/mh/Makefile.am b/mh/Makefile.am
index 1cad31e..245b4fa 100644
--- a/mh/Makefile.am
+++ b/mh/Makefile.am
@@ -133,8 +133,9 @@ mh_LIBS = \
../mailbox/mh/libmu_mh.la\
../mailbox/nntp/libmu_nntp.la\
../mailbox/maildir/libmu_maildir.la\
+ @MU_AUTHLIBS@\
../mailbox/libmailutils.la\
- @AUTHLIBS@ @MU_COMMON_LIBRARIES@
+ @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 bdb14b1..e297707 100644
--- a/movemail/Makefile.am
+++ b/movemail/Makefile.am
@@ -17,7 +17,7 @@
## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
## 02110-1301 USA
-INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_builddir}/include/mailutils/gnu -I${top_srcdir}/mailbox @INTLINCS@ @AUTHINCS@
+INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_builddir}/include/mailutils/gnu -I${top_srcdir}/mailbox @INTLINCS@ @MU_AUTHINCS@
bin_PROGRAMS = movemail
movemail_LDADD = \
@@ -28,5 +28,14 @@ movemail_LDADD = \
../mailbox/nntp/libmu_nntp.la\
../mailbox/mh/libmu_mh.la\
../mailbox/maildir/libmu_maildir.la\
+ @MU_AUTHLIBS@\
../mailbox/libmailutils.la\
- @AUTHLIBS@ @MU_COMMON_LIBRARIES@
+ @MU_COMMON_LIBRARIES@
+
+CFLOW_FLAGS=-i^s --brief -v
+movemail_CFLOW_INPUT=$(movemail_OBJECTS:.$(OBJEXT)=.c)
+movemail.cflow: $(movemail_CFLOW_INPUT) Makefile
+ cflow -o$@ $(CFLOW_FLAGS) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) \
+ $(movemail_CFLOW_INPUT)
diff --git a/pop3d/Makefile.am b/pop3d/Makefile.am
index c9a823b..7c47d36 100644
--- a/pop3d/Makefile.am
+++ b/pop3d/Makefile.am
@@ -29,20 +29,28 @@ pop3d_SOURCES = apop.c auth.c capa.c dele.c extra.c pop3d.c pop3d.h \
uidl.c user.c logindelay.c expire.c
pop3d_LDADD = \
- @AUTHLIBS@ \
../lib/libmuaux.la\
../mailbox/mbox/libmu_mbox.la\
../mailbox/mh/libmu_mh.la\
../mailbox/maildir/libmu_maildir.la\
+ @MU_AUTHLIBS@ \
../mailbox/libmailutils.la\
@MU_COMMON_LIBRARIES@
popauth_SOURCES = popauth.c
popauth_LDADD = ../lib/libmuaux.la ../mailbox/libmailutils.la @MU_COMMON_LIBRARIES@
pop3d_DEPENDENCIES = \
- @AUTHLIBS_DEPENDENCY@ \
+ @MU_AUTHLIBS_DEPENDENCY@ \
../mailbox/mbox/libmu_mbox.la\
../mailbox/mh/libmu_mh.la\
../mailbox/maildir/libmu_maildir.la\
../mailbox/libmailutils.la\
../lib/libmuaux.la
+
+CFLOW_FLAGS=-i^s --brief -v
+pop3d_CFLOW_INPUT=$(pop3d_OBJECTS:.$(OBJEXT)=.c)
+pop3d.cflow: $(pop3d_CFLOW_INPUT) Makefile
+ cflow -o$@ $(CFLOW_FLAGS) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) \
+ $(pop3d_CFLOW_INPUT)
diff --git a/readmsg/Makefile.am b/readmsg/Makefile.am
index 3522830..f2aff9e 100644
--- a/readmsg/Makefile.am
+++ b/readmsg/Makefile.am
@@ -33,5 +33,6 @@ readmsg_LDADD =\
../mailbox/nntp/libmu_nntp.la\
../mailbox/mh/libmu_mh.la\
../mailbox/maildir/libmu_maildir.la\
+ @MU_AUTHLIBS@\
../mailbox/libmailutils.la\
- @AUTHLIBS@ @MU_COMMON_LIBRARIES@
+ @MU_COMMON_LIBRARIES@
diff --git a/sieve/Makefile.am b/sieve/Makefile.am
index 5be0d3a..a01ba59 100644
--- a/sieve/Makefile.am
+++ b/sieve/Makefile.am
@@ -31,8 +31,16 @@ sieve_LDADD =\
../mailbox/nntp/libmu_nntp.la\
../mailbox/mh/libmu_mh.la\
../mailbox/maildir/libmu_maildir.la\
+ @MU_AUTHLIBS@\
../mailbox/libmailutils.la\
- @AUTHLIBS@ @MU_COMMON_LIBRARIES@
+ @MU_COMMON_LIBRARIES@
sieve_LDFLAGS = -export-dynamic
+CFLOW_FLAGS=-i^s --brief -v
+sieve_CFLOW_INPUT=$(sieve_OBJECTS:.$(OBJEXT)=.c)
+sieve.cflow: $(sieve_CFLOW_INPUT) Makefile
+ cflow -o$@ $(CFLOW_FLAGS) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) \
+ $(sieve_CFLOW_INPUT)

Return to:

Send suggestions and report system problems to the System administrator.