[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU Mailutils branch, master, updated. mu-1-2-90-separate-argp-cfg
|
From: |
Sergey Poznyakoff |
|
Subject: |
[SCM] GNU Mailutils branch, master, updated. mu-1-2-90-separate-argp-cfg-279-ga5c08dc |
|
Date: |
Sat, 04 Jul 2009 21:25:11 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".
http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=a5c08dc87d4eb83ac93ff5d0c02b3a5b1b8dcbb1
The branch, master has been updated
via a5c08dc87d4eb83ac93ff5d0c02b3a5b1b8dcbb1 (commit)
via acfec56c9e49342eb49010c2559b5bdc1f814240 (commit)
via 7b8bfef29b7d1d30f5714bb951bd33fc40007cfa (commit)
via 44f275b87665d268eab64dbe600506b11fc710ee (commit)
from e2dff986e890f397154ddfd51c7b94453fadba69 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a5c08dc87d4eb83ac93ff5d0c02b3a5b1b8dcbb1
Author: Sergey Poznyakoff <address@hidden>
Date: Sun Jul 5 00:24:52 2009 +0300
Add maintainer-specific files.
* maint.mk: New file.
* config/maint.mk: New file.
* README-hacking: Update.
commit acfec56c9e49342eb49010c2559b5bdc1f814240
Author: Sergey Poznyakoff <address@hidden>
Date: Sun Jul 5 00:12:57 2009 +0300
Fix namespaces and inclusion directories.
* README-hacking: Update.
* configure.ac (MU_COMMON_INCLUDES): Remove.
(MU_LIB_COMMON_INCLUDES,MU_APP_COMMON_INCLUDES): New variables.
Link lib/gettext.h and lib.intprops.h to include.
* gnulib.modules: Remove fnmatch.
* comsat/Makefile.am, config/Makefile.am,
dotlock/Makefile.am, frm/Makefile.am,
guimb/Makefile.am, imap4d/Makefile.am,
maidag/Makefile.am, mail/Makefile.am,
movemail/Makefile.am, pop3d/Makefile.am,
python/libmu_py/Makefile.am, readmsg/Makefile.am
sieve/Makefile.am (INCLUDES): Use MU_APP_COMMON_INCLUDES
* lib/Makefile.am, examples/Makefile.am,
libmu_argp/Makefile.am, libmu_auth/Makefile.am,
libmu_cpp/Makefile.am, libmu_sieve/Makefile.am,
libproto/imap/Makefile.am, libproto/mailer/Makefile.am,
libproto/mh/Makefile.am, libproto/nntp/Makefile.am,
libproto/pop/Makefile.am, mailbox/Makefile.am,
mapi/Makefile.am, messages/Makefile.am,
mh/Makefile.am, sql/Makefile.am (INCLUDES): Use MU_LIB_COMMON_INCLUDES
commit 7b8bfef29b7d1d30f5714bb951bd33fc40007cfa
Author: Sergey Poznyakoff <address@hidden>
Date: Sun Jul 5 00:12:38 2009 +0300
Minor changes.
* examples/mta.c: Remove include mu_asprintf.h.
* libmu_auth/radius.c: Remove include inttostr.h.
* libmu_scm/mu_dbgport.c: Silence gcc warnings.
* libmu_sieve/extensions/pipe.c: Remove include <mu_dbm.h>.
* libmu_sieve/sieve-priv.h: Remove include mu_asprintf.h.
* maidag/python.c: Remove unused locals.
* python/libmu_py/address.c: Likewise.
* python/libmu_py/auth.c: Likewise.
* python/libmu_py/body.c: Likewise.
* python/libmu_py/secret.c: Likewise.
* python/libmu_py/stream.c: Likewise.
* python/libmu_py/url.c: Likewise.
* python/libmu_py/util.c: Likewise.
commit 44f275b87665d268eab64dbe600506b11fc710ee
Author: Sergey Poznyakoff <address@hidden>
Date: Sun Jul 5 00:11:47 2009 +0300
Bugfixes.
* mailbox/debug.c (mu_debug_printv): use mu_debug_vprintf
* mailbox/message_stream.c (restore_envelope): supplied
sender address must be a single word.
-----------------------------------------------------------------------
Summary of changes:
README-hacking | 37 +++++++++++++----
comsat/Makefile.am | 11 +----
config/Makefile.am | 2 +-
config/maint.mk | 29 +++++++++++++
configure.ac | 24 ++++++++++-
dotlock/Makefile.am | 4 +-
examples/Makefile.am | 2 +-
examples/cpp/Makefile.am | 2 +-
examples/mta.c | 1 -
frm/Makefile.am | 9 +----
gnulib.modules | 3 +-
guimb/Makefile.am | 2 +-
imap4d/Makefile.am | 10 +----
lib/Makefile.am | 2 +-
libmu_argp/Makefile.am | 4 +-
libmu_auth/Makefile.am | 2 +-
libmu_auth/radius.c | 1 -
libmu_cfg/Makefile.am | 2 +-
libmu_cpp/Makefile.am | 2 +-
libmu_scm/Makefile.am | 9 +----
libmu_scm/mu_dbgport.c | 2 +-
libmu_sieve/Makefile.am | 9 +----
libmu_sieve/extensions/Makefile.am | 2 +-
libmu_sieve/extensions/pipe.c | 1 -
libmu_sieve/sieve-priv.h | 1 -
libproto/imap/Makefile.am | 2 +-
libproto/maildir/Makefile.am | 2 +-
libproto/mailer/Makefile.am | 2 +-
libproto/mbox/Makefile.am | 2 +-
libproto/mh/Makefile.am | 2 +-
libproto/nntp/Makefile.am | 2 +-
libproto/pop/Makefile.am | 2 +-
maidag/Makefile.am | 2 +-
maidag/python.c | 1 -
mail/Makefile.am | 9 +----
mailbox/Makefile.am | 2 +-
mailbox/debug.c | 2 +-
mailbox/message_stream.c | 2 +-
maint.mk | 81 ++++++++++++++++++++++++++++++++++++
mapi/Makefile.am | 2 +-
messages/Makefile.am | 9 +----
mh/Makefile.am | 2 +-
mimeview/Makefile.am | 2 +-
movemail/Makefile.am | 9 +----
pop3d/Makefile.am | 9 +----
python/libmu_py/Makefile.am | 2 +-
python/libmu_py/address.c | 1 -
python/libmu_py/auth.c | 2 -
python/libmu_py/body.c | 1 -
python/libmu_py/secret.c | 1 -
python/libmu_py/stream.c | 1 -
python/libmu_py/url.c | 1 -
python/libmu_py/util.c | 1 -
readmsg/Makefile.am | 2 +-
sieve/Makefile.am | 9 +----
sql/Makefile.am | 2 +-
56 files changed, 206 insertions(+), 136 deletions(-)
create mode 100644 config/maint.mk
create mode 100644 maint.mk
diff --git a/README-hacking b/README-hacking
index e05eea5..f18395d 100644
--- a/README-hacking
+++ b/README-hacking
@@ -32,13 +32,6 @@ which are extracted from other source packages:
./bootstrap
-Notice that at the one of its final stages, bootstrap may spit out
-several warnings like:
-
-pop3d_OBJECTS:.$(OBJEXT: non-POSIX variable name
-
-Ignore them, these are due to the bug in automake.
-
Once done, proceed as described in the file README (section
INSTALLATION).
@@ -56,10 +49,38 @@ sources reside.
For more information about `bootstrap', run `bootstrap --help'.
+* Flowgraphs
+
+To obtain flowgraphs, you need GNU cflow v.1.3 or higher.
+
+To create or update all flowgraphs, run the following command
+from the source tree root directory:
+
+ make -f maint.mk
+
+The flowgraphs will be created in the subdirectories and
+named COMP.cflow, where COMP is the name of the corresponding
+Mailutils component.
+
+To create or update the flowgraph for a given component, change
+into this component's subdirectory and run
+
+ make -f ../maint.mk flowgraph
+
+If the component in question has its own maint.mk, run
+
+ make -f maint.mk flowgraph
+
+instead.
+
+To clean all flowgraphs, run (from the source tree root directory):
+
+ make -f maint.mk maintclean-recursive
+
* Copyright information
- Copyright (C) 2007, 2008 Free Software Foundation, Inc.
+ Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
Permission is granted to anyone to make or distribute verbatim copies
of this document as received, in any medium, provided that the
diff --git a/comsat/Makefile.am b/comsat/Makefile.am
index 838f04f..d65bf0d 100644
--- a/comsat/Makefile.am
+++ b/comsat/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with GNU Automake to create Makefile.in
-## Copyright (C) 2001, 2002, 2007 Free Software Foundation, Inc.
+## Copyright (C) 2001, 2002, 2007, 2009 Free Software Foundation, Inc.
##
## GNU Mailutils is free software; you can redistribute it and/or
## modify it under the terms of the GNU General Public License as
@@ -17,7 +17,7 @@
## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
## 02110-1301 USA
-INCLUDES = @MU_COMMON_INCLUDES@
+INCLUDES = @MU_APP_COMMON_INCLUDES@
sbin_PROGRAMS = comsatd
@@ -35,10 +35,3 @@ comsatd_LDADD = \
${MU_LIB_MAILUTILS}\
@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 44d26e3..9de1363 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -17,7 +17,7 @@
## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
## 02110-1301 USA
-INCLUDES = @MU_COMMON_INCLUDES@
+INCLUDES = @MU_APP_COMMON_INCLUDES@
bin_PROGRAMS = mailutils-config
diff --git a/config/maint.mk b/config/maint.mk
new file mode 100644
index 0000000..4d51d8c
--- /dev/null
+++ b/config/maint.mk
@@ -0,0 +1,29 @@
+# This file is part of GNU Mailutils.
+# Copyright (C) 2009 Free Software Foundation, Inc.
+#
+# Written by Sergey Poznyakoff
+#
+# GNU Mailutils is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Mailutils is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
+
+include Makefile
+mailutils_config_CFLOW_INPUT=$(mailutils_config_SOURCES)
+mailutils-config.cflow: $(mailutils_config_CFLOW_INPUT) Makefile
+ cflow -o$@ $(CFLOW_FLAGS) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) \
+ $(mailutils_config_CFLOW_INPUT)
+
+flowgraph: mailutils-config.cflow
+maintclean:
+ rm -f mailutils-config.cflow
diff --git a/configure.ac b/configure.ac
index 6a6e3d0..cdf3cfc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,7 +60,18 @@ AC_SUBST(MU_SIEVE_MODDIR,'$(libdir)/$(PACKAGE)')
AC_SUBST(MU_COMMON_LIBRARIES,'$(LTLIBINTL) $(LTLIBICONV)')
AC_SUBST(MU_APP_LIBRARIES,'../libmu_argp/libmu_argp.a
../libmu_cfg/libmu_cfg.la ../lib/libmuaux.la')
-AC_SUBST(MU_COMMON_INCLUDES,'-I${srcdir} -I${top_srcdir}/include
-I${top_srcdir}/lib -I${top_builddir}/lib -I${top_builddir}
-I${top_builddir}/include -I${top_srcdir}/mailbox -I${top_srcdir}/libmu_argp
-I${top_srcdir}/libmu_cfg')
+# There are two sets of include directories: MU_LIB_COMMON_INCLUDES, used
+# by the libraries, and MU_APP_COMMON_INCLUDES, which is used by applications.
+# The principal difference between them is that the latter contains gnulib
+# directory.
+#
+# Libraries are isolated from gnulib and are not allowed to include its
+# header files. There are two exceptions, though. See NOTE before the
+# AC_CONFIG_LINKS statements, below.
+
+AC_SUBST(MU_LIB_COMMON_INCLUDES,'-I${top_builddir} -I${top_srcdir}/include
-I${top_builddir}/include -I${top_srcdir}/mailbox
-I${top_srcdir}/libproto/include')
+
+AC_SUBST(MU_APP_COMMON_INCLUDES,'-I${srcdir} -I${top_srcdir}/include
-I${top_srcdir}/lib -I${top_builddir}/lib -I${top_builddir}
-I${top_builddir}/include -I${top_srcdir}/mailbox -I${top_srcdir}/libmu_argp
-I${top_srcdir}/libmu_cfg')
dnl Check for programs
AC_PROG_CC
@@ -99,6 +110,17 @@ AC_CHECK_TYPE(iconv_t,:,
#endif
])
+# NOTE: Generally speaking, Mailutils libraries are not allowed to include
+# gnulib headers. The only exceptions are: gettext.h, which is needed for
+# proper i18n, and intprops.h, which is used in mailbox/cfg_parser.y.
+# This latter will probably be rewritten to remove the need for intprops.h.
+#
+# To make these two headers accessible for the libraries, they are linked
+# to include/.
+#
+AC_CONFIG_LINKS(include/gettext.h:lib/gettext.h)
+AC_CONFIG_LINKS(include/intprops.h:lib/intprops.h)
+
AH_BOTTOM([
#define DEFAULT_TEXT_DOMAIN PACKAGE
])
diff --git a/dotlock/Makefile.am b/dotlock/Makefile.am
index 3cab964..10f1855 100644
--- a/dotlock/Makefile.am
+++ b/dotlock/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with GNU Automake to create Makefile.in
-## Copyright (C) 2002, 2007 Free Software Foundation, Inc.
+## Copyright (C) 2002, 2007, 2009 Free Software Foundation, Inc.
##
## GNU Mailutils is free software; you can redistribute it and/or
## modify it under the terms of the GNU General Public License as
@@ -17,7 +17,7 @@
## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
## 02110-1301 USA
-INCLUDES = @MU_COMMON_INCLUDES@
+INCLUDES = @MU_APP_COMMON_INCLUDES@
bin_PROGRAMS = dotlock
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 083e088..70ef8fe 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -52,7 +52,7 @@ noinst_PROGRAMS = \
address@hidden@
mod_LTLIBRARIES = numaddr.la
-INCLUDES = @MU_COMMON_INCLUDES@
+INCLUDES = @MU_LIB_COMMON_INCLUDES@
LDADD = \
../lib/libmuaux.la\
diff --git a/examples/cpp/Makefile.am b/examples/cpp/Makefile.am
index d1b63fb..78179e5 100644
--- a/examples/cpp/Makefile.am
+++ b/examples/cpp/Makefile.am
@@ -33,7 +33,7 @@ MU_CXX_EXAMPLES_LIST = \
EXTRA_PROGRAMS=$(MU_CXX_EXAMPLES_LIST)
noinst_PROGRAMS = @MU_CXX_EXAMPLES_BUILD@
-INCLUDES = @MU_COMMON_INCLUDES@
+INCLUDES = @MU_LIB_COMMON_INCLUDES@
AM_LDFLAGS = \
../../lib/libmuaux.la\
diff --git a/examples/mta.c b/examples/mta.c
index 424e92e..0e84180 100644
--- a/examples/mta.c
+++ b/examples/mta.c
@@ -60,7 +60,6 @@
#include <sys/time.h>
#include <sys/socket.h>
#include <netinet/in.h>
-#include <mu_asprintf.h>
#include <mailutils/argcv.h>
#include <mailutils/mailutils.h>
diff --git a/frm/Makefile.am b/frm/Makefile.am
index 2d07e15..ebfa557 100644
--- a/frm/Makefile.am
+++ b/frm/Makefile.am
@@ -18,7 +18,7 @@
## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
## 02110-1301 USA
-INCLUDES = @MU_COMMON_INCLUDES@
+INCLUDES = @MU_APP_COMMON_INCLUDES@
SUBDIRS = testsuite
@@ -42,10 +42,3 @@ common_ldadd = \
${MU_LIB_MAILUTILS}\
@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/gnulib.modules b/gnulib.modules
index 1957954..1d667f8 100644
--- a/gnulib.modules
+++ b/gnulib.modules
@@ -1,13 +1,12 @@
# List of gnulib modules needed for GNU mailutils.
# A module name per line. Empty lines and comments are ignored.
-# FIXME: regex and glob are used by libmailutils...
+# FIXME: fnmatch, regex and glob are used by libmailutils...
alloca
autobuild
argp
crypto/des
-fnmatch
getline
getpass-gnu
gettext
diff --git a/guimb/Makefile.am b/guimb/Makefile.am
index ebfd475..a439c82 100644
--- a/guimb/Makefile.am
+++ b/guimb/Makefile.am
@@ -17,7 +17,7 @@
## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
## 02110-1301 USA
-INCLUDES = @MU_COMMON_INCLUDES@ @GUILE_INCLUDES@
+INCLUDES = @MU_APP_COMMON_INCLUDES@ @GUILE_INCLUDES@
SUBDIRS=scm
diff --git a/imap4d/Makefile.am b/imap4d/Makefile.am
index 751daf3..63da56d 100644
--- a/imap4d/Makefile.am
+++ b/imap4d/Makefile.am
@@ -18,7 +18,7 @@
## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
## 02110-1301 USA
-INCLUDES = @MU_COMMON_INCLUDES@ @MU_AUTHINCS@ @SERV_AUTHINCS@
+INCLUDES = @MU_APP_COMMON_INCLUDES@ @MU_AUTHINCS@ @SERV_AUTHINCS@
SUBDIRS = testsuite
sbin_PROGRAMS = imap4d
@@ -86,11 +86,3 @@ imap4d_DEPENDENCIES = \
${MU_LIB_MAILUTILS}
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/lib/Makefile.am b/lib/Makefile.am
index 0b6bbc7..15dcdc3 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -20,7 +20,7 @@
include gnulib.mk
-INCLUDES = @MU_COMMON_INCLUDES@
+INCLUDES = @MU_LIB_COMMON_INCLUDES@
libmuaux_la_SOURCES += \
daemon.c\
diff --git a/libmu_argp/Makefile.am b/libmu_argp/Makefile.am
index 7248f26..435dcd8 100644
--- a/libmu_argp/Makefile.am
+++ b/libmu_argp/Makefile.am
@@ -16,7 +16,9 @@
# Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301 USA
-INCLUDES = @MU_COMMON_INCLUDES@
+# This library uses gnulib calls and is always linked with gnulib, therefore
+# we use application includes here.
+INCLUDES = @MU_APP_COMMON_INCLUDES@
AM_CPPFLAGS = \
-DSYSCONFDIR=\"$(sysconfdir)\"\
-DSITE_VIRTUAL_PWDDIR=\"@address@hidden"\
diff --git a/libmu_auth/Makefile.am b/libmu_auth/Makefile.am
index acdc2e0..00a0918 100644
--- a/libmu_auth/Makefile.am
+++ b/libmu_auth/Makefile.am
@@ -17,7 +17,7 @@
## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
## 02110-1301 USA
-INCLUDES = @MU_COMMON_INCLUDES@
+INCLUDES = @MU_LIB_COMMON_INCLUDES@
AM_CFLAGS = -DSITE_VIRTUAL_PWDDIR=\"@address@hidden" \
-DSITE_CRAM_MD5_PWD=\"@address@hidden"
diff --git a/libmu_auth/radius.c b/libmu_auth/radius.c
index 50189db..4e7e39c 100644
--- a/libmu_auth/radius.c
+++ b/libmu_auth/radius.c
@@ -30,7 +30,6 @@
#ifdef HAVE_STRINGS_H
# include <strings.h>
#endif
-#include <inttostr.h>
#include <mailutils/list.h>
#include <mailutils/iterator.h>
diff --git a/libmu_cfg/Makefile.am b/libmu_cfg/Makefile.am
index b9640ed..ba8b2ce 100644
--- a/libmu_cfg/Makefile.am
+++ b/libmu_cfg/Makefile.am
@@ -16,7 +16,7 @@
# Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301 USA
-INCLUDES = @MU_COMMON_INCLUDES@
+INCLUDES = @MU_LIB_COMMON_INCLUDES@
AM_CFLAGS = -DSITE_VIRTUAL_PWDDIR=\"@address@hidden" \
-DSITE_CRAM_MD5_PWD=\"@address@hidden"
diff --git a/libmu_cpp/Makefile.am b/libmu_cpp/Makefile.am
index 1cef4af..b91e90d 100644
--- a/libmu_cpp/Makefile.am
+++ b/libmu_cpp/Makefile.am
@@ -17,7 +17,7 @@
## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
## 02110-1301 USA
-INCLUDES = @MU_COMMON_INCLUDES@
+INCLUDES = @MU_LIB_COMMON_INCLUDES@
MU_CXX_LTLIBRARIES_LIST = libmu_cpp.la
lib_LTLIBRARIES = @MU_CXX_LTLIBRARIES_BUILD@
diff --git a/libmu_scm/Makefile.am b/libmu_scm/Makefile.am
index 1d394a6..f9a79e9 100644
--- a/libmu_scm/Makefile.am
+++ b/libmu_scm/Makefile.am
@@ -18,7 +18,7 @@
## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
## 02110-1301 USA
-INCLUDES = -I. @MU_COMMON_INCLUDES@ @GUILE_INCLUDES@
+INCLUDES = -I. @MU_LIB_COMMON_INCLUDES@ @GUILE_INCLUDES@
MU_SCM_LTLIBRARIES_LIST = libmu_scm.la
address@hidden@
@@ -133,10 +133,3 @@ install-data-hook:
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/libmu_scm/mu_dbgport.c b/libmu_scm/mu_dbgport.c
index 0d0ffd7..54343b6 100644
--- a/libmu_scm/mu_dbgport.c
+++ b/libmu_scm/mu_dbgport.c
@@ -58,7 +58,7 @@ _mu_debug_port_mark (SCM port)
static void
_mu_debug_port_flush (SCM port)
{
- struct _mu_debug_port *dp = MU_DEBUG_PORT (port);
+ /* struct _mu_debug_port *dp = MU_DEBUG_PORT (port); */
/* FIXME: */
}
diff --git a/libmu_sieve/Makefile.am b/libmu_sieve/Makefile.am
index 7f21800..949e325 100644
--- a/libmu_sieve/Makefile.am
+++ b/libmu_sieve/Makefile.am
@@ -18,7 +18,7 @@
## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
## 02110-1301 USA
-INCLUDES = @MU_COMMON_INCLUDES@
+INCLUDES = @MU_LIB_COMMON_INCLUDES@
YLWRAP = $(SHELL) $(mu_aux_dir)/gylwrap
AM_YFLAGS = -dtv
@@ -67,10 +67,3 @@ sieve-gram.c sieve-gram.h: $(srcdir)/sieve.y
-- -yy mu_sieve_yy
-CFLOW_FLAGS=-i^s --brief -v
-libmu_sieve_CFLOW_INPUT=$(libmu_sieve_la_OBJECTS:.lo=.c)
-libmu_sieve.cflow: $(libmu_sieve_CFLOW_INPUT) Makefile
- cflow -o$@ $(CFLOW_FLAGS) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) \
- $(libmu_sieve_CFLOW_INPUT)
diff --git a/libmu_sieve/extensions/Makefile.am
b/libmu_sieve/extensions/Makefile.am
index 6813f1e..93ca319 100644
--- a/libmu_sieve/extensions/Makefile.am
+++ b/libmu_sieve/extensions/Makefile.am
@@ -27,7 +27,7 @@ mod_LTLIBRARIES = \
timestamp.la\
vacation.la
-INCLUDES = @MU_COMMON_INCLUDES@
+INCLUDES = @MU_APP_COMMON_INCLUDES@
AM_LDFLAGS = -module -avoid-version -no-undefined -rpath '$(moddir)'
diff --git a/libmu_sieve/extensions/pipe.c b/libmu_sieve/extensions/pipe.c
index b2773c1..6990a4a 100644
--- a/libmu_sieve/extensions/pipe.c
+++ b/libmu_sieve/extensions/pipe.c
@@ -39,7 +39,6 @@
#include <string.h>
#include <signal.h>
#include <regex.h>
-#include <mu_dbm.h>
#include <mailutils/sieve.h>
#define ASSERT(expr, diag, ec) \
diff --git a/libmu_sieve/sieve-priv.h b/libmu_sieve/sieve-priv.h
index 8462dd7..ce65f67 100644
--- a/libmu_sieve/sieve-priv.h
+++ b/libmu_sieve/sieve-priv.h
@@ -18,7 +18,6 @@
Boston, MA 02110-1301 USA */
#include <mailutils/sieve.h>
-#include <mu_asprintf.h>
#include <setjmp.h>
#include <string.h>
diff --git a/libproto/imap/Makefile.am b/libproto/imap/Makefile.am
index 687f6c7..5ae5ab7 100644
--- a/libproto/imap/Makefile.am
+++ b/libproto/imap/Makefile.am
@@ -17,7 +17,7 @@
## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
## 02110-1301 USA
-INCLUDES = @MU_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include
+INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include
lib_LTLIBRARIES = libmu_imap.la
libmu_imap_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
diff --git a/libproto/maildir/Makefile.am b/libproto/maildir/Makefile.am
index d71bc7a..d7d11ce 100644
--- a/libproto/maildir/Makefile.am
+++ b/libproto/maildir/Makefile.am
@@ -17,7 +17,7 @@
## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
## 02110-1301 USA
-INCLUDES = @MU_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include
+INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include
lib_LTLIBRARIES = libmu_maildir.la
libmu_maildir_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
diff --git a/libproto/mailer/Makefile.am b/libproto/mailer/Makefile.am
index 3513f9e..71d0550 100644
--- a/libproto/mailer/Makefile.am
+++ b/libproto/mailer/Makefile.am
@@ -17,7 +17,7 @@
## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
## 02110-1301 USA
-INCLUDES = @MU_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include
+INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include
lib_LTLIBRARIES = libmu_mailer.la
libmu_mailer_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
diff --git a/libproto/mbox/Makefile.am b/libproto/mbox/Makefile.am
index 8bc7290..c180024 100644
--- a/libproto/mbox/Makefile.am
+++ b/libproto/mbox/Makefile.am
@@ -17,7 +17,7 @@
## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
## 02110-1301 USA
-INCLUDES = @MU_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include
+INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include
lib_LTLIBRARIES = libmu_mbox.la
libmu_mbox_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
diff --git a/libproto/mh/Makefile.am b/libproto/mh/Makefile.am
index 43d77be..6896d13 100644
--- a/libproto/mh/Makefile.am
+++ b/libproto/mh/Makefile.am
@@ -17,7 +17,7 @@
## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
## 02110-1301 USA
-INCLUDES = @MU_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include
+INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include
lib_LTLIBRARIES = libmu_mh.la
libmu_mh_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
diff --git a/libproto/nntp/Makefile.am b/libproto/nntp/Makefile.am
index 73ff037..c94cf5c 100644
--- a/libproto/nntp/Makefile.am
+++ b/libproto/nntp/Makefile.am
@@ -17,7 +17,7 @@
## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
## 02110-1301 USA
-INCLUDES = @MU_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include
+INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include
lib_LTLIBRARIES = libmu_nntp.la
libmu_nntp_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
diff --git a/libproto/pop/Makefile.am b/libproto/pop/Makefile.am
index a0e3c19..55e2086 100644
--- a/libproto/pop/Makefile.am
+++ b/libproto/pop/Makefile.am
@@ -17,7 +17,7 @@
## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
## 02110-1301 USA
-INCLUDES = @MU_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include
+INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include
lib_LTLIBRARIES = libmu_pop.la
libmu_pop_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
diff --git a/maidag/Makefile.am b/maidag/Makefile.am
index 24b73bc..bacdec8 100644
--- a/maidag/Makefile.am
+++ b/maidag/Makefile.am
@@ -15,7 +15,7 @@
# Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301 USA
-INCLUDES = -I${top_srcdir} @MU_COMMON_INCLUDES@ @GUILE_INCLUDES@ \
+INCLUDES = -I${top_srcdir} @MU_APP_COMMON_INCLUDES@ @GUILE_INCLUDES@ \
@PYTHON_INCLUDES@
sbin_PROGRAMS=maidag
diff --git a/maidag/python.c b/maidag/python.c
index ffc916d..2df544c 100644
--- a/maidag/python.c
+++ b/maidag/python.c
@@ -25,7 +25,6 @@ int
python_check_msg (mu_message_t msg, struct mu_auth_data *auth,
const char *prog)
{
- int status;
PyMessage *py_msg;
mu_py_dict dict[2];
mu_py_script_data data[1];
diff --git a/mail/Makefile.am b/mail/Makefile.am
index e9d859c..7b7682c 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -18,7 +18,7 @@
## 02110-1301 USA
AM_YFLAGS=-vt
-INCLUDES = @MU_COMMON_INCLUDES@ @MU_AUTHINCS@
+INCLUDES = @MU_APP_COMMON_INCLUDES@ @MU_AUTHINCS@
AM_CFLAGS = -DSITE_MAIL_RC=\"@address@hidden"
bin_PROGRAMS = mail
@@ -98,10 +98,3 @@ 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 d115eac..6684d3a 100644
--- a/mailbox/Makefile.am
+++ b/mailbox/Makefile.am
@@ -18,7 +18,7 @@
## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
## 02110-1301 USA
-INCLUDES = @MU_COMMON_INCLUDES@ -I${top_srcdir}/libproto/include
+INCLUDES = @MU_LIB_COMMON_INCLUDES@
YLWRAP = $(SHELL) $(mu_aux_dir)/gylwrap
AM_YFLAGS=-vt
diff --git a/mailbox/debug.c b/mailbox/debug.c
index fa0e936..21b18ed 100644
--- a/mailbox/debug.c
+++ b/mailbox/debug.c
@@ -247,7 +247,7 @@ mu_debug_printv (mu_debug_t debug, mu_log_level_t level,
const char *format,
return EINVAL;
if (debug->level & MU_DEBUG_LEVEL_MASK (level))
return 0;
- return mu_debug_printf (debug, level, format, ap);
+ return mu_debug_vprintf (debug, level, format, ap);
}
int
diff --git a/mailbox/message_stream.c b/mailbox/message_stream.c
index 066d789..2ece545 100644
--- a/mailbox/message_stream.c
+++ b/mailbox/message_stream.c
@@ -293,7 +293,7 @@ restore_envelope (mu_stream_t str, struct
_mu_rfc822_message **pmenv)
mu_address_create (&addr, from);
if (!addr
|| mu_address_aget_email (addr, 1, &env_from))
- env_from = strdup ("GNU Mailutils");
+ env_from = strdup ("GNU-Mailutils");
mu_address_destroy (&addr);
}
else
diff --git a/maint.mk b/maint.mk
new file mode 100644
index 0000000..7f71b18
--- /dev/null
+++ b/maint.mk
@@ -0,0 +1,81 @@
+# This file is part of GNU Mailutils.
+# Copyright (C) 2009 Free Software Foundation, Inc.
+#
+# Written by Sergey Poznyakoff
+#
+# GNU Mailutils is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Mailutils is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
+
+include Makefile
+
+CFLOW_FLAGS=-i^s --brief -v
+
+MAINT_CLEAN_FILES=
+
+define flowgraph_tmpl
+MAINT_CLEAN_FILES += $(1).cflow
+$(2)_CFLOW_INPUT=$$($(2)_OBJECTS:.$(3)=.c)
+$(1).cflow: $$($(2)_CFLOW_INPUT) Makefile
+ cflow -o$$@ $$(CFLOW_FLAGS) $$(DEFS) \
+ $$(DEFAULT_INCLUDES) $$(INCLUDES) $$(AM_CPPFLAGS) \
+ $$(CPPFLAGS) \
+ $$($(2)_CFLOW_INPUT)
+endef
+
+$(foreach prog,$(bin_PROGRAMS) $(sbin_PROGRAMS),\
+$(eval $(call flowgraph_tmpl,$(prog),$(subst -,_,$(prog)),$(OBJEXT))))
+
+$(foreach prog,$(lib_LTLIBRARIES),\
+$(eval $(call flowgraph_tmpl,$(prog),$(subst .,_,$(prog)),lo)))
+
+all: flowgraph-recursive
+
+flowgraph: $(foreach prog,$(bin_PROGRAMS) $(sbin_PROGRAMS)
$(lib_LTLIBRARIES),$(prog).cflow)
+
+maintclean:
+ -test -n "$(MAINT_CLEAN_FILES)" && rm -f $(MAINT_CLEAN_FILES)
+
+##
+
+MAINT_MK = maint.mk
+
+MAINT_RECURSIVE_TARGETS=flowgraph-recursive maintclean-recursive
+
+$(MAINT_RECURSIVE_TARGETS):
+ @cwd=`pwd`; \
+ failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ if test -f $$subdir/$(MAINT_MK); then \
+ makefile='$(MAINT_MK)'; \
+ else \
+ makefile="$$cwd/maint.mk"; \
+ fi; \
+ $(MAKE) -C $$subdir -f $$makefile $$local_target \
+ || eval $$failcom; \
+ done; \
+ test -z "$$fail"
diff --git a/mapi/Makefile.am b/mapi/Makefile.am
index 5f4d0c4..f5ea85f 100644
--- a/mapi/Makefile.am
+++ b/mapi/Makefile.am
@@ -17,7 +17,7 @@
## Foundation, Inc.
## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-INCLUDES = @MU_COMMON_INCLUDES@
+INCLUDES = @MU_LIB_COMMON_INCLUDES@
SUBDIRS = include
diff --git a/messages/Makefile.am b/messages/Makefile.am
index 4362ea4..fed19bb 100644
--- a/messages/Makefile.am
+++ b/messages/Makefile.am
@@ -17,7 +17,7 @@
## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
## 02110-1301 USA
-INCLUDES = @MU_COMMON_INCLUDES@
+INCLUDES = @MU_APP_COMMON_INCLUDES@
SUBDIRS = testsuite
@@ -36,10 +36,3 @@ messages_LDADD =\
${MU_LIB_MAILUTILS}\
@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 bd39d18..589cbd7 100644
--- a/mh/Makefile.am
+++ b/mh/Makefile.am
@@ -123,7 +123,7 @@ mailutils-mh.el: mailutils-mh.eli
.eli.el:
sed "s,BINDIR,$(bindir),g;s,MHLIBDIR,$(mhlibdir),g" $< > $@
-INCLUDES = @MU_COMMON_INCLUDES@
+INCLUDES = @MU_APP_COMMON_INCLUDES@
AM_CPPFLAGS = -D_GNU_SOURCE -DMHLIBDIR=\"$(mhlibdir)\" -DMHBINDIR=\"$(bindir)\"
mh_LIBS = \
./libmh.a\
diff --git a/mimeview/Makefile.am b/mimeview/Makefile.am
index 21574e3..d46eb75 100644
--- a/mimeview/Makefile.am
+++ b/mimeview/Makefile.am
@@ -17,7 +17,7 @@
## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
## 02110-1301 USA
-INCLUDES = @MU_COMMON_INCLUDES@
+INCLUDES = @MU_APP_COMMON_INCLUDES@
AM_CFLAGS = -DDEFAULT_CUPS_CONFDIR=\"@address@hidden"
diff --git a/movemail/Makefile.am b/movemail/Makefile.am
index ce4c5ed..fabf2ab 100644
--- a/movemail/Makefile.am
+++ b/movemail/Makefile.am
@@ -18,7 +18,7 @@
## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
## 02110-1301 USA
-INCLUDES = @MU_COMMON_INCLUDES@ @MU_AUTHINCS@
+INCLUDES = @MU_APP_COMMON_INCLUDES@ @MU_AUTHINCS@
bin_PROGRAMS = movemail
movemail_LDADD = \
@@ -34,10 +34,3 @@ movemail_LDADD = \
${MU_LIB_MAILUTILS}\
@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 f482ce9..a194658 100644
--- a/pop3d/Makefile.am
+++ b/pop3d/Makefile.am
@@ -18,7 +18,7 @@
## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
## 02110-1301 USA
-INCLUDES = @MU_COMMON_INCLUDES@
+INCLUDES = @MU_APP_COMMON_INCLUDES@
sbin_PROGRAMS = pop3d
bin_PROGRAMS = @POPAUTH@
@@ -69,10 +69,3 @@ pop3d_DEPENDENCIES = \
${MU_LIB_MAILDIR}\
${MU_LIB_MAILUTILS}
-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/python/libmu_py/Makefile.am b/python/libmu_py/Makefile.am
index c6e92f7..0bf87e5 100644
--- a/python/libmu_py/Makefile.am
+++ b/python/libmu_py/Makefile.am
@@ -17,7 +17,7 @@
## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
## 02110-1301 USA
-INCLUDES = @MU_COMMON_INCLUDES@ $(PYTHON_INCLUDES)
+INCLUDES = @MU_LIB_COMMON_INCLUDES@ $(PYTHON_INCLUDES)
EXTRA_LTLIBRARIES = libmu_py.la c_api.la
diff --git a/python/libmu_py/address.c b/python/libmu_py/address.c
index 8aab21f..9452dd8 100644
--- a/python/libmu_py/address.c
+++ b/python/libmu_py/address.c
@@ -103,7 +103,6 @@ static PyObject *
api_address_createv (PyObject *self, PyObject *args)
{
int status;
- char *str;
PyAddress *py_addr;
PyObject *py_seq;
char **sv;
diff --git a/python/libmu_py/auth.c b/python/libmu_py/auth.c
index 2be362f..7613f12 100644
--- a/python/libmu_py/auth.c
+++ b/python/libmu_py/auth.c
@@ -574,7 +574,6 @@ api_register_module (PyObject *self, PyObject *args)
static PyObject *
api_get_auth_by_name (PyObject *self, PyObject *args)
{
- int status;
char *username;
PyAuthData *py_ad = PyAuthData_NEW ();
@@ -593,7 +592,6 @@ api_get_auth_by_name (PyObject *self, PyObject *args)
static PyObject *
api_get_auth_by_uid (PyObject *self, PyObject *args)
{
- int status;
uid_t uid;
PyAuthData *py_ad = PyAuthData_NEW ();
diff --git a/python/libmu_py/body.c b/python/libmu_py/body.c
index 1f9a5ba..b263653 100644
--- a/python/libmu_py/body.c
+++ b/python/libmu_py/body.c
@@ -111,7 +111,6 @@ static PyObject *
api_body_get_stream (PyObject *self, PyObject *args)
{
int status;
- size_t lines;
PyBody *py_body;
PyStream *py_stm = PyStream_NEW ();
diff --git a/python/libmu_py/secret.c b/python/libmu_py/secret.c
index 57d7d67..8f6ee78 100644
--- a/python/libmu_py/secret.c
+++ b/python/libmu_py/secret.c
@@ -116,7 +116,6 @@ api_secret_destroy (PyObject *self, PyObject *args)
static PyObject *
api_secret_password (PyObject *self, PyObject *args)
{
- int status;
const char *pass;
PySecret *py_secret;
diff --git a/python/libmu_py/stream.c b/python/libmu_py/stream.c
index 432a3ac..ea2080a 100644
--- a/python/libmu_py/stream.c
+++ b/python/libmu_py/stream.c
@@ -119,7 +119,6 @@ static PyObject *
api_stdio_stream_create (PyObject *self, PyObject *args)
{
int status, flags;
- char *filename;
FILE *fp;
PyStream *py_stm;
PyFileObject *py_file;
diff --git a/python/libmu_py/url.c b/python/libmu_py/url.c
index 39853cc..af82f50 100644
--- a/python/libmu_py/url.c
+++ b/python/libmu_py/url.c
@@ -242,7 +242,6 @@ api_url_get_query (PyObject *self, PyObject *args)
static PyObject *
api_url_to_string (PyObject *self, PyObject *args)
{
- int status;
const char *str;
PyUrl *py_url;
diff --git a/python/libmu_py/util.c b/python/libmu_py/util.c
index f1fad18..e3a2087 100644
--- a/python/libmu_py/util.c
+++ b/python/libmu_py/util.c
@@ -25,7 +25,6 @@
static PyObject *
api_util_get_user_email (PyObject *self, PyObject *args)
{
- int status;
char *name = NULL;
char *email = NULL;
diff --git a/readmsg/Makefile.am b/readmsg/Makefile.am
index 88cdd23..7a5ba0d 100644
--- a/readmsg/Makefile.am
+++ b/readmsg/Makefile.am
@@ -17,7 +17,7 @@
## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
## 02110-1301 USA
-INCLUDES = @MU_COMMON_INCLUDES@
+INCLUDES = @MU_APP_COMMON_INCLUDES@
SUBDIRS = testsuite
diff --git a/sieve/Makefile.am b/sieve/Makefile.am
index d206c7c..99fa75a 100644
--- a/sieve/Makefile.am
+++ b/sieve/Makefile.am
@@ -17,7 +17,7 @@
## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
## 02110-1301 USA
-INCLUDES = @MU_COMMON_INCLUDES@
+INCLUDES = @MU_APP_COMMON_INCLUDES@
SUBDIRS = testsuite
bin_PROGRAMS = sieve
@@ -39,10 +39,3 @@ sieve_LDADD =\
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)
diff --git a/sql/Makefile.am b/sql/Makefile.am
index 07b2600..16d0863 100644
--- a/sql/Makefile.am
+++ b/sql/Makefile.am
@@ -25,7 +25,7 @@ EXTRA_DIST=\
postgres.c
DISTCLEANFILES = modlist.h
-INCLUDES= @MU_COMMON_INCLUDES@
+INCLUDES= @MU_LIB_COMMON_INCLUDES@
libsql_la_SOURCES=sql.c
address@hidden@
hooks/post-receive
--
GNU Mailutils
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU Mailutils branch, master, updated. mu-1-2-90-separate-argp-cfg-279-ga5c08dc,
Sergey Poznyakoff <=