summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--dotlock/Makefile.am2
-rw-r--r--examples/Makefile.am2
-rw-r--r--frm/Makefile.am2
-rw-r--r--guimb/Makefile.am3
-rw-r--r--imap4d/Makefile.am3
-rw-r--r--include/mailutils/gnu/Makefile.am6
-rw-r--r--lib/Makefile.am12
-rw-r--r--libsieve/Makefile.am2
-rw-r--r--mail.local/Makefile.am2
-rw-r--r--mail.remote/Makefile.am2
-rw-r--r--mail/Makefile.am2
-rw-r--r--mailbox/Makefile.am5
-rw-r--r--mailbox/imap/Makefile.am4
-rw-r--r--mailbox/maildir/Makefile.am4
-rw-r--r--mailbox/mbox/Makefile.am4
-rw-r--r--mailbox/mh/Makefile.am4
-rw-r--r--mailbox/pop/Makefile.am4
-rw-r--r--messages/Makefile.am2
-rw-r--r--mh/Makefile.am2
-rw-r--r--pop3d/Makefile.am2
-rw-r--r--readmsg/Makefile.am2
-rw-r--r--sieve/Makefile.am2
22 files changed, 44 insertions, 29 deletions
diff --git a/dotlock/Makefile.am b/dotlock/Makefile.am
index 95a22ab..6210e6c 100644
--- a/dotlock/Makefile.am
+++ b/dotlock/Makefile.am
@@ -17,7 +17,7 @@
## Foundation, Inc.
## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir)/libmu_scm @INTLINCS@
+INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I${top_builddir}/include/mailutils/gnu -I$(top_srcdir)/include -I$(top_srcdir)/libmu_scm @INTLINCS@
bin_PROGRAMS = dotlock
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 120b11a..812f8c5 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -34,7 +34,7 @@ noinst_PROGRAMS = \
moddir=@SIEVE_MODDIR@
mod_LTLIBRARIES = numaddr.la
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/mailbox @INTLINCS@
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_builddir)/include/mailutils/gnu -I$(top_srcdir)/mailbox @INTLINCS@
AM_LDFLAGS = ../mailbox/libmailbox.la ../lib/libmailutils.la
numaddr_la_SOURCES = numaddr.c
diff --git a/frm/Makefile.am b/frm/Makefile.am
index ccc65e8..9042968 100644
--- a/frm/Makefile.am
+++ b/frm/Makefile.am
@@ -17,7 +17,7 @@
## Foundation, Inc.
## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib @INTLINCS@
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib -I${top_builddir}/include/mailutils/gnu @INTLINCS@
SUBDIRS = testsuite
bin_PROGRAMS = frm
diff --git a/guimb/Makefile.am b/guimb/Makefile.am
index 2a6450b..6f3a93d 100644
--- a/guimb/Makefile.am
+++ b/guimb/Makefile.am
@@ -18,7 +18,8 @@
## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
INCLUDES = -I. -I$(top_builddir) -I$(srcdir) -I$(top_srcdir)/lib \
- -I$(top_srcdir)/mailbox -I$(top_srcdir)/include @GUILE_INCLUDES@ @INTLINCS@
+ -I$(top_srcdir)/mailbox -I$(top_srcdir)/include \
+ -I${top_builddir}/include/mailutils/gnu @GUILE_INCLUDES@ @INTLINCS@
SUBDIRS=scm
diff --git a/imap4d/Makefile.am b/imap4d/Makefile.am
index 590bfa9..74c7043 100644
--- a/imap4d/Makefile.am
+++ b/imap4d/Makefile.am
@@ -17,7 +17,8 @@
## Foundation, Inc.
## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/include @AUTHINCS@ @SERV_AUTHINCS@ @INTLINCS@
+INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/include \
+ -I${top_builddir}/include/mailutils/gnu @AUTHINCS@ @SERV_AUTHINCS@ @INTLINCS@
SUBDIRS = testsuite
sbin_PROGRAMS = imap4d
diff --git a/include/mailutils/gnu/Makefile.am b/include/mailutils/gnu/Makefile.am
index 52644ee..25e5217 100644
--- a/include/mailutils/gnu/Makefile.am
+++ b/include/mailutils/gnu/Makefile.am
@@ -17,5 +17,9 @@
## Foundation, Inc.
## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+AUTOMAKE_OPTIONS=no-dependencies
+
gnudir = $(pkgincludedir)/gnu
-gnu_HEADERS = argp.h getopt.h
+EXTRA_HEADERS =
+gnu_HEADERS = @GNU_INCLS@
+DISTCLEANFILES = getopt.h argp.h regex.h posix/regex.h
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 5873e44..3eb5e4a 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -19,20 +19,18 @@
noinst_LTLIBRARIES = libmailutils.la
-SUBDIRS = posix
-
-INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/include/mailutils/gnu @INTLINCS@
+INCLUDES = -I${top_srcdir}/include -I${top_builddir}/include/mailutils/gnu @INTLINCS@
libmailutils_la_SOURCES = basename.c daemon.c getopt.c getopt1.c md5.c \
mu_dbm.c xstrdup.c xmalloc.c
EXTRA_DIST = alloca.c fnmatch.c fgetpwent.c getpass.c malloc.c obstack.c \
- realloc.c setenv.c snprintf.c strncasecmp.c \
- strcasecmp.c strsignal.c xstrtol.c vasprintf.c vsyslog.c \
- utmp.c
+ realloc.c setenv.c snprintf.c strncasecmp.c \
+ strcasecmp.c strsignal.c xstrtol.c vasprintf.c vsyslog.c \
+ utmp.c
noinst_HEADERS = error.h fnmatch.h md5.h \
mu_dbm.h\
- regex.h snprintf.h xalloc.h xstrtol.h obstack.h \
+ snprintf.h xalloc.h xstrtol.h obstack.h \
mu_asprintf.h
libmailutils_la_LIBADD = @LTLIBOBJS@ @ALLOCA@
diff --git a/libsieve/Makefile.am b/libsieve/Makefile.am
index ba95eaf..a63f9d9 100644
--- a/libsieve/Makefile.am
+++ b/libsieve/Makefile.am
@@ -17,7 +17,7 @@
## Foundation, Inc.
## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib @INTLINCS@
+INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_builddir}/include/mailutils/gnu @INTLINCS@
YLWRAP = $(SHELL) $(top_srcdir)/scripts/ylwrap
AM_YFLAGS = -dtv
AM_CPPFLAGS = -DSIEVE_MODDIR=\"@SIEVE_MODDIR@\"
diff --git a/mail.local/Makefile.am b/mail.local/Makefile.am
index b43aa02..4b1233c 100644
--- a/mail.local/Makefile.am
+++ b/mail.local/Makefile.am
@@ -17,7 +17,7 @@
## Foundation, Inc.
## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/mailbox -I$(top_srcdir)/include @GUILE_INCLUDES@ @INTLINCS@
+INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I${top_builddir}/include/mailutils/gnu -I$(top_srcdir)/mailbox -I$(top_srcdir)/include @GUILE_INCLUDES@ @INTLINCS@
SUBDIRS = testsuite
libexec_PROGRAMS = mail.local
diff --git a/mail.remote/Makefile.am b/mail.remote/Makefile.am
index 4484c3f..72737c2 100644
--- a/mail.remote/Makefile.am
+++ b/mail.remote/Makefile.am
@@ -17,7 +17,7 @@
## Foundation, Inc.
## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include @INTLINCS@
+INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I${top_builddir}/include/mailutils/gnu -I$(top_srcdir)/include @INTLINCS@
SUBDIRS = testsuite
PROGRAMS_SMTP = mail.remote
diff --git a/mail/Makefile.am b/mail/Makefile.am
index d29f8e5..161a644 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -18,7 +18,7 @@
## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
AM_YFLAGS=-vt
-INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib -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@ @AUTHINCS@
AM_CFLAGS = -DSITE_MAIL_RC=\"@SITE_MAIL_RC@\"
bin_PROGRAMS = mail
diff --git a/mailbox/Makefile.am b/mailbox/Makefile.am
index 4af7eb2..0eb4f35 100644
--- a/mailbox/Makefile.am
+++ b/mailbox/Makefile.am
@@ -17,7 +17,7 @@
## Foundation, Inc.
## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox -I${top_srcdir}/mailbox/include -I${top_srcdir}/include/mailutils/gnu @INTLINCS@
+INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox -I${top_srcdir}/mailbox/include -I${top_builddir}/include/mailutils/gnu @INTLINCS@
AM_CFLAGS = -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\"
YLWRAP = $(SHELL) $(top_srcdir)/scripts/ylwrap
AM_YFLAGS=-vt
@@ -33,7 +33,7 @@ DEFS = @DEFS@ -DLOCALEDIR=\"$(localedir)\"
EXTRA_DIST = strtok_r.c \
strndup.c strnlen.c strchrnul.c argp-ba.c argp-eexst.c \
argp-fmtstream.c argp-fs-xinl.c argp-help.c argp-parse.c argp-pv.c \
- argp-pvh.c argp-xinl.c getline.c getline.h parsedate.y pin.c
+ argp-pvh.c argp-xinl.c getline.c getline.h parsedate.y pin.c regex.c
noinst_HEADERS=argp-fmtstream.h argp-namefrob.h md5.h
@@ -68,6 +68,7 @@ mime.c \
monitor.c \
mu_argp.c \
mu_auth.c \
+munre.c \
mutil.c \
muerror.c \
muerrno.c \
diff --git a/mailbox/imap/Makefile.am b/mailbox/imap/Makefile.am
index 52ef8e6..13d68af 100644
--- a/mailbox/imap/Makefile.am
+++ b/mailbox/imap/Makefile.am
@@ -17,7 +17,9 @@
## Foundation, Inc.
## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox -I${top_srcdir}/mailbox/include -I${top_srcdir}/include/mailutils/gnu @INTLINCS@
+INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox \
+ -I${top_srcdir}/mailbox/include -I${top_builddir}/include/mailutils/gnu \
+ @INTLINCS@
lib_LTLIBRARIES = libmu_imap.la
diff --git a/mailbox/maildir/Makefile.am b/mailbox/maildir/Makefile.am
index 8f7bdac..c3d6ac9 100644
--- a/mailbox/maildir/Makefile.am
+++ b/mailbox/maildir/Makefile.am
@@ -17,7 +17,9 @@
## Foundation, Inc.
## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox -I${top_srcdir}/mailbox/include -I${top_srcdir}/include/mailutils/gnu @INTLINCS@
+INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox \
+ -I${top_srcdir}/mailbox/include -I${top_builddir}/include/mailutils/gnu \
+ @INTLINCS@
lib_LTLIBRARIES = libmu_maildir.la
diff --git a/mailbox/mbox/Makefile.am b/mailbox/mbox/Makefile.am
index 3a239d6..913a22e 100644
--- a/mailbox/mbox/Makefile.am
+++ b/mailbox/mbox/Makefile.am
@@ -17,7 +17,9 @@
## Foundation, Inc.
## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox -I${top_srcdir}/mailbox/include -I${top_srcdir}/include/mailutils/gnu @INTLINCS@
+INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox \
+ -I${top_srcdir}/mailbox/include -I${top_builddir}/include/mailutils/gnu \
+ @INTLINCS@
lib_LTLIBRARIES = libmu_mbox.la
diff --git a/mailbox/mh/Makefile.am b/mailbox/mh/Makefile.am
index 83a0e65..f507256 100644
--- a/mailbox/mh/Makefile.am
+++ b/mailbox/mh/Makefile.am
@@ -17,7 +17,9 @@
## Foundation, Inc.
## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox -I${top_srcdir}/mailbox/include -I${top_srcdir}/include/mailutils/gnu @INTLINCS@
+INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox \
+ -I${top_srcdir}/mailbox/include \
+ @INTLINCS@
lib_LTLIBRARIES = libmu_mh.la
diff --git a/mailbox/pop/Makefile.am b/mailbox/pop/Makefile.am
index a70848c..794241c 100644
--- a/mailbox/pop/Makefile.am
+++ b/mailbox/pop/Makefile.am
@@ -17,7 +17,9 @@
## Foundation, Inc.
## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox -I${top_srcdir}/mailbox/include -I${top_srcdir}/include/mailutils/gnu @INTLINCS@
+INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox \
+ -I${top_srcdir}/mailbox/include -I${top_builddir}/include/mailutils/gnu \
+ @INTLINCS@
lib_LTLIBRARIES = libmu_pop.la
diff --git a/messages/Makefile.am b/messages/Makefile.am
index ecb88c4..578f78f 100644
--- a/messages/Makefile.am
+++ b/messages/Makefile.am
@@ -17,7 +17,7 @@
## Foundation, Inc.
## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib @INTLINCS@
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib -I${top_builddir}/include/mailutils/gnu @INTLINCS@
SUBDIRS = testsuite
bin_PROGRAMS = messages
diff --git a/mh/Makefile.am b/mh/Makefile.am
index a334e82..24b8a05 100644
--- a/mh/Makefile.am
+++ b/mh/Makefile.am
@@ -120,7 +120,7 @@ mailutils-mh.el: mailutils-mh.eli
.eli.el:
sed "s,BINDIR,$(bindir),g;s,MHLIBDIR,$(mhlibdir),g" $< > $@
-INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_srcdir}/mailbox @INTLINCS@
+INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_builddir}/include/mailutils/gnu -I${top_srcdir}/mailbox @INTLINCS@
AM_CPPFLAGS = -DMHLIBDIR=\"$(mhlibdir)\" -DMHBINDIR=\"$(bindir)\"
mh_LIBS = \
./libmh.a\
diff --git a/pop3d/Makefile.am b/pop3d/Makefile.am
index d96bc4b..90b7d72 100644
--- a/pop3d/Makefile.am
+++ b/pop3d/Makefile.am
@@ -17,7 +17,7 @@
## Foundation, Inc.
## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include @INTLINCS@
+INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I${top_builddir}/include/mailutils/gnu -I$(top_srcdir)/include @INTLINCS@
sbin_PROGRAMS = pop3d
bin_PROGRAMS = @POPAUTH@
diff --git a/readmsg/Makefile.am b/readmsg/Makefile.am
index 7d9b9b0..79f9f98 100644
--- a/readmsg/Makefile.am
+++ b/readmsg/Makefile.am
@@ -17,7 +17,7 @@
## Foundation, Inc.
## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib @INTLINCS@
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib -I${top_builddir}/include/mailutils/gnu @INTLINCS@
SUBDIRS = testsuite
bin_PROGRAMS = readmsg
diff --git a/sieve/Makefile.am b/sieve/Makefile.am
index 305d8bf..e1756cb 100644
--- a/sieve/Makefile.am
+++ b/sieve/Makefile.am
@@ -17,7 +17,7 @@
## Foundation, Inc.
## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib @INTLINCS@
+INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_builddir}/include/mailutils/gnu @INTLINCS@
SUBDIRS = testsuite
bin_PROGRAMS = sieve

Return to:

Send suggestions and report system problems to the System administrator.