summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2005-11-12 11:34:10 +0000
committerSergey Poznyakoff <gray@gnu.org.ua>2005-11-12 11:34:10 +0000
commitac73454fd6976ef381077f4c590a0b09d9616111 (patch)
tree09aad956250a14ffc04d62009762ad38f280c707
parent5acf6de61e3cd93a35cf4f163f0a73b88840208e (diff)
downloadmailutils-ac73454fd6976ef381077f4c590a0b09d9616111.tar.gz
mailutils-ac73454fd6976ef381077f4c590a0b09d9616111.tar.bz2
Load MU_AUTHLIBS before libmailutils. Fixes cygwin build
-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 709e26c99..ef51b1c6e 100644
--- a/comsat/Makefile.am
+++ b/comsat/Makefile.am
@@ -30 +30,9 @@ comsatd_LDADD = \
@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 dfb09a3ec..a8c7f59d8 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -36,3 +36,3 @@ mailutils_config_CFLAGS = -DCOMPILE_FLAGS="\"-I$(includedir)\"" \
-DLINK_POSTFLAGS="\"$(LTLIBICONV)\"" \
- -DAUTHLIBS="\"`echo $(AUTHLIBS) | sed 's/.*libmuauth.la *//'`\"" \
+ -DAUTHLIBS="\"`echo $(MU_AUTHLIBS) | sed 's/.*libmuauth.la *//'`\"" \
-DGUILE_LIBS="\"$(GUILE_LIBS)\"" \
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 76171bf2e..40a0d1a73 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -68,4 +68,4 @@ mimetest_LDADD =\
../mailbox/pop/libmu_pop.la\
- ../mailbox/libmailutils.la\
- @AUTHLIBS@
+ @MU_AUTHLIBS@\
+ ../mailbox/libmailutils.la
@@ -84,4 +84,4 @@ sfrom_LDADD =\
../mailbox/maildir/libmu_maildir.la\
- ../mailbox/libmailutils.la\
- @AUTHLIBS@
+ @MU_AUTHLIBS@\
+ ../mailbox/libmailutils.la
@@ -90,4 +90,5 @@ pop3client_LDADD = \
../mailbox/pop/libmu_pop.la\
+ @MU_AUTHLIBS@\
../mailbox/libmailutils.la\
- @AUTHLIBS@ @READLINE_LIBS@
+ @READLINE_LIBS@
@@ -96,4 +97,5 @@ nntpclient_LDADD = \
../mailbox/nntp/libmu_nntp.la\
+ @MU_AUTHLIBS@\
../mailbox/libmailutils.la\
- @AUTHLIBS@ @READLINE_LIBS@
+ @READLINE_LIBS@
@@ -106,3 +108,3 @@ lsf_LDADD = \
../mailbox/maildir/libmu_maildir.la\
- @AUTHLIBS@ \
+ @MU_AUTHLIBS@ \
../mailbox/libmailutils.la
diff --git a/frm/Makefile.am b/frm/Makefile.am
index 0e259e90c..f2286db0d 100644
--- a/frm/Makefile.am
+++ b/frm/Makefile.am
@@ -39,4 +39,12 @@ common_ldadd = \
../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 8efaec590..19924ec4d 100644
--- a/guimb/Makefile.am
+++ b/guimb/Makefile.am
@@ -37,3 +37,4 @@ guimb_LDADD = \
../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 c211c518a..ed824c958 100644
--- a/imap4d/Makefile.am
+++ b/imap4d/Makefile.am
@@ -21,3 +21,3 @@ 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
@@ -66,3 +66,2 @@ imap4d_LDADD = \
../lib/libmuaux.la\
- @AUTHLIBS@ \
../mailbox/mbox/libmu_mbox.la\
@@ -70,2 +69,3 @@ imap4d_LDADD = \
../mailbox/maildir/libmu_maildir.la\
+ @MU_AUTHLIBS@ \
../mailbox/libmailutils.la\
@@ -74,3 +74,3 @@ imap4d_LDADD = \
## 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.
@@ -80,3 +80,3 @@ imap4d_DEPENDENCIES = \
@IMAP_AUTHOBJS@\
- @AUTHLIBS_DEPENDENCY@\
+ @MU_AUTHLIBS_DEPENDENCY@\
../mailbox/mbox/libmu_mbox.la\
@@ -86 +86,9 @@ imap4d_DEPENDENCIES = \
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 58c2a309b..3c3d68036 100644
--- a/libmu_scm/Makefile.am
+++ b/libmu_scm/Makefile.am
@@ -93 +93,9 @@ install-data-hook:
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 37872de31..cba0d3bf6 100644
--- a/libsieve/Makefile.am
+++ b/libsieve/Makefile.am
@@ -67 +67,9 @@ sieve-gram.c sieve-gram.h: $(srcdir)/sieve.y
+
+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 ec09139f5..4484a3418 100644
--- a/mail.local/Makefile.am
+++ b/mail.local/Makefile.am
@@ -28,7 +28,7 @@ mail_local_LDADD = \
@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@
diff --git a/mail.remote/Makefile.am b/mail.remote/Makefile.am
index 030983656..c96c2c565 100644
--- a/mail.remote/Makefile.am
+++ b/mail.remote/Makefile.am
@@ -30,4 +30,4 @@ 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 28bf5c21f..e9a8beca7 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -20,3 +20,3 @@
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@\"
@@ -33,4 +33,5 @@ mail_LDADD = \
../mailbox/maildir/libmu_maildir.la\
+ @MU_AUTHLIBS@\
../mailbox/libmailutils.la\
- @AUTHLIBS@ @READLINE_LIBS@ @MU_COMMON_LIBRARIES@
+ @READLINE_LIBS@ @MU_COMMON_LIBRARIES@
@@ -96 +97,9 @@ mail_SOURCES = \
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 7c7c8f479..7137e3dff 100644
--- a/mailbox/Makefile.am
+++ b/mailbox/Makefile.am
@@ -187 +187,9 @@ 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 432453706..34421f58a 100644
--- a/messages/Makefile.am
+++ b/messages/Makefile.am
@@ -34,3 +34,12 @@ messages_LDADD =\
../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 1cad31e8b..245b4fa48 100644
--- a/mh/Makefile.am
+++ b/mh/Makefile.am
@@ -135,4 +135,5 @@ mh_LIBS = \
../mailbox/maildir/libmu_maildir.la\
+ @MU_AUTHLIBS@\
../mailbox/libmailutils.la\
- @AUTHLIBS@ @MU_COMMON_LIBRARIES@
+ @MU_COMMON_LIBRARIES@
LDADD = $(mh_LIBS)
diff --git a/movemail/Makefile.am b/movemail/Makefile.am
index bdb14b18b..e297707fa 100644
--- a/movemail/Makefile.am
+++ b/movemail/Makefile.am
@@ -19,3 +19,3 @@
-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
@@ -30,3 +30,12 @@ movemail_LDADD = \
../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 c9a823be9..7c47d36d1 100644
--- a/pop3d/Makefile.am
+++ b/pop3d/Makefile.am
@@ -31,3 +31,2 @@ pop3d_SOURCES = apop.c auth.c capa.c dele.c extra.c pop3d.c pop3d.h \
pop3d_LDADD = \
- @AUTHLIBS@ \
../lib/libmuaux.la\
@@ -36,2 +35,3 @@ pop3d_LDADD = \
../mailbox/maildir/libmu_maildir.la\
+ @MU_AUTHLIBS@ \
../mailbox/libmailutils.la\
@@ -42,3 +42,3 @@ popauth_LDADD = ../lib/libmuaux.la ../mailbox/libmailutils.la @MU_COMMON_LIBRARI
pop3d_DEPENDENCIES = \
- @AUTHLIBS_DEPENDENCY@ \
+ @MU_AUTHLIBS_DEPENDENCY@ \
../mailbox/mbox/libmu_mbox.la\
@@ -48 +48,9 @@ pop3d_DEPENDENCIES = \
../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 352283001..f2aff9e90 100644
--- a/readmsg/Makefile.am
+++ b/readmsg/Makefile.am
@@ -35,3 +35,4 @@ readmsg_LDADD =\
../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 5be0d3a91..a01ba59ad 100644
--- a/sieve/Makefile.am
+++ b/sieve/Makefile.am
@@ -33,4 +33,5 @@ sieve_LDADD =\
../mailbox/maildir/libmu_maildir.la\
+ @MU_AUTHLIBS@\
../mailbox/libmailutils.la\
- @AUTHLIBS@ @MU_COMMON_LIBRARIES@
+ @MU_COMMON_LIBRARIES@
@@ -38 +39,8 @@ 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.