diff options
-rw-r--r-- | dotlock/Makefile.am | 2 | ||||
-rw-r--r-- | examples/Makefile.am | 2 | ||||
-rw-r--r-- | frm/Makefile.am | 2 | ||||
-rw-r--r-- | guimb/Makefile.am | 3 | ||||
-rw-r--r-- | imap4d/Makefile.am | 3 | ||||
-rw-r--r-- | include/mailutils/gnu/Makefile.am | 6 | ||||
-rw-r--r-- | lib/Makefile.am | 6 | ||||
-rw-r--r-- | libsieve/Makefile.am | 2 | ||||
-rw-r--r-- | mail.local/Makefile.am | 2 | ||||
-rw-r--r-- | mail.remote/Makefile.am | 2 | ||||
-rw-r--r-- | mail/Makefile.am | 2 | ||||
-rw-r--r-- | mailbox/Makefile.am | 5 | ||||
-rw-r--r-- | mailbox/imap/Makefile.am | 4 | ||||
-rw-r--r-- | mailbox/maildir/Makefile.am | 4 | ||||
-rw-r--r-- | mailbox/mbox/Makefile.am | 4 | ||||
-rw-r--r-- | mailbox/mh/Makefile.am | 4 | ||||
-rw-r--r-- | mailbox/pop/Makefile.am | 4 | ||||
-rw-r--r-- | messages/Makefile.am | 2 | ||||
-rw-r--r-- | mh/Makefile.am | 2 | ||||
-rw-r--r-- | pop3d/Makefile.am | 2 | ||||
-rw-r--r-- | readmsg/Makefile.am | 2 | ||||
-rw-r--r-- | sieve/Makefile.am | 2 |
22 files changed, 41 insertions, 26 deletions
diff --git a/dotlock/Makefile.am b/dotlock/Makefile.am index 95a22ab33..6210e6cba 100644 --- a/dotlock/Makefile.am +++ b/dotlock/Makefile.am @@ -19,3 +19,3 @@ -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@ diff --git a/examples/Makefile.am b/examples/Makefile.am index 120b11af8..812f8c59d 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -36,3 +36,3 @@ 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 diff --git a/frm/Makefile.am b/frm/Makefile.am index ccc65e8bc..90429685d 100644 --- a/frm/Makefile.am +++ b/frm/Makefile.am @@ -19,3 +19,3 @@ -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 diff --git a/guimb/Makefile.am b/guimb/Makefile.am index 2a6450b31..6f3a93d79 100644 --- a/guimb/Makefile.am +++ b/guimb/Makefile.am @@ -20,3 +20,4 @@ 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@ diff --git a/imap4d/Makefile.am b/imap4d/Makefile.am index 590bfa93f..74c704373 100644 --- a/imap4d/Makefile.am +++ b/imap4d/Makefile.am @@ -19,3 +19,4 @@ -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 diff --git a/include/mailutils/gnu/Makefile.am b/include/mailutils/gnu/Makefile.am index 52644eed4..25e5217a9 100644 --- a/include/mailutils/gnu/Makefile.am +++ b/include/mailutils/gnu/Makefile.am @@ -19,3 +19,7 @@ +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 5873e44c7..3eb5e4a64 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -21,5 +21,3 @@ 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 \ @@ -34,3 +32,3 @@ 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 diff --git a/libsieve/Makefile.am b/libsieve/Makefile.am index ba95eafe5..a63f9d911 100644 --- a/libsieve/Makefile.am +++ b/libsieve/Makefile.am @@ -19,3 +19,3 @@ -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 diff --git a/mail.local/Makefile.am b/mail.local/Makefile.am index b43aa023f..4b1233c56 100644 --- a/mail.local/Makefile.am +++ b/mail.local/Makefile.am @@ -19,3 +19,3 @@ -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 diff --git a/mail.remote/Makefile.am b/mail.remote/Makefile.am index 4484c3f3e..72737c2fb 100644 --- a/mail.remote/Makefile.am +++ b/mail.remote/Makefile.am @@ -19,3 +19,3 @@ -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@ diff --git a/mail/Makefile.am b/mail/Makefile.am index d29f8e5c5..161a644ce 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_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@\" diff --git a/mailbox/Makefile.am b/mailbox/Makefile.am index 4af7eb2d8..0eb4f358f 100644 --- a/mailbox/Makefile.am +++ b/mailbox/Makefile.am @@ -19,3 +19,3 @@ -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@\" @@ -35,3 +35,3 @@ EXTRA_DIST = strtok_r.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 @@ -70,2 +70,3 @@ mu_argp.c \ mu_auth.c \ +munre.c \ mutil.c \ diff --git a/mailbox/imap/Makefile.am b/mailbox/imap/Makefile.am index 52ef8e629..13d68afbe 100644 --- a/mailbox/imap/Makefile.am +++ b/mailbox/imap/Makefile.am @@ -19,3 +19,5 @@ -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@ diff --git a/mailbox/maildir/Makefile.am b/mailbox/maildir/Makefile.am index 8f7bdac9e..c3d6ac9ba 100644 --- a/mailbox/maildir/Makefile.am +++ b/mailbox/maildir/Makefile.am @@ -19,3 +19,5 @@ -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@ diff --git a/mailbox/mbox/Makefile.am b/mailbox/mbox/Makefile.am index 3a239d6b7..913a22e57 100644 --- a/mailbox/mbox/Makefile.am +++ b/mailbox/mbox/Makefile.am @@ -19,3 +19,5 @@ -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@ diff --git a/mailbox/mh/Makefile.am b/mailbox/mh/Makefile.am index 83a0e65fd..f507256b9 100644 --- a/mailbox/mh/Makefile.am +++ b/mailbox/mh/Makefile.am @@ -19,3 +19,5 @@ -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@ diff --git a/mailbox/pop/Makefile.am b/mailbox/pop/Makefile.am index a70848cb2..794241cfe 100644 --- a/mailbox/pop/Makefile.am +++ b/mailbox/pop/Makefile.am @@ -19,3 +19,5 @@ -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@ diff --git a/messages/Makefile.am b/messages/Makefile.am index ecb88c4f6..578f78f5f 100644 --- a/messages/Makefile.am +++ b/messages/Makefile.am @@ -19,3 +19,3 @@ -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 diff --git a/mh/Makefile.am b/mh/Makefile.am index a334e8276..24b8a0503 100644 --- a/mh/Makefile.am +++ b/mh/Makefile.am @@ -122,3 +122,3 @@ mailutils-mh.el: mailutils-mh.eli -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)\" diff --git a/pop3d/Makefile.am b/pop3d/Makefile.am index d96bc4be9..90b7d722b 100644 --- a/pop3d/Makefile.am +++ b/pop3d/Makefile.am @@ -19,3 +19,3 @@ -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@ diff --git a/readmsg/Makefile.am b/readmsg/Makefile.am index 7d9b9b0be..79f9f9825 100644 --- a/readmsg/Makefile.am +++ b/readmsg/Makefile.am @@ -19,3 +19,3 @@ -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 diff --git a/sieve/Makefile.am b/sieve/Makefile.am index 305d8bf96..e1756cbba 100644 --- a/sieve/Makefile.am +++ b/sieve/Makefile.am @@ -19,3 +19,3 @@ -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 |