From 20477d627e595249371cfff878b0e249d1c62cee Mon Sep 17 00:00:00 2001 From: Sergey Poznyakoff Date: Sat, 20 Sep 2003 15:21:35 +0000 Subject: Fixed INCLUDES --- dotlock/Makefile.am | 2 +- examples/Makefile.am | 2 +- frm/Makefile.am | 2 +- guimb/Makefile.am | 3 ++- imap4d/Makefile.am | 3 ++- include/mailutils/gnu/Makefile.am | 6 +++++- lib/Makefile.am | 12 +++++------- libsieve/Makefile.am | 2 +- mail.local/Makefile.am | 2 +- mail.remote/Makefile.am | 2 +- mail/Makefile.am | 2 +- mailbox/Makefile.am | 5 +++-- mailbox/imap/Makefile.am | 4 +++- mailbox/maildir/Makefile.am | 4 +++- mailbox/mbox/Makefile.am | 4 +++- mailbox/mh/Makefile.am | 4 +++- mailbox/pop/Makefile.am | 4 +++- messages/Makefile.am | 2 +- mh/Makefile.am | 2 +- pop3d/Makefile.am | 2 +- readmsg/Makefile.am | 2 +- sieve/Makefile.am | 2 +- 22 files changed, 44 insertions(+), 29 deletions(-) diff --git a/dotlock/Makefile.am b/dotlock/Makefile.am index 95a22ab33..6210e6cba 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 120b11af8..812f8c59d 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 ccc65e8bc..90429685d 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 2a6450b31..6f3a93d79 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 590bfa93f..74c704373 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 52644eed4..25e5217a9 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 5873e44c7..3eb5e4a64 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 ba95eafe5..a63f9d911 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 b43aa023f..4b1233c56 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 4484c3f3e..72737c2fb 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 d29f8e5c5..161a644ce 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 4af7eb2d8..0eb4f358f 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 52ef8e629..13d68afbe 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 8f7bdac9e..c3d6ac9ba 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 3a239d6b7..913a22e57 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 83a0e65fd..f507256b9 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 a70848cb2..794241cfe 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 ecb88c4f6..578f78f5f 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 a334e8276..24b8a0503 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 d96bc4be9..90b7d722b 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 7d9b9b0be..79f9f9825 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 305d8bf96..e1756cbba 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 -- cgit v1.2.1