diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2003-09-20 15:21:35 +0000 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2003-09-20 15:21:35 +0000 |
commit | 20477d627e595249371cfff878b0e249d1c62cee (patch) | |
tree | 0492d5ae57f8984c99f2540575ebeb3fa7bb27a8 | |
parent | 772d86eda16f6f09e9d8709d1d42570d63fce5ba (diff) | |
download | mailutils-20477d627e595249371cfff878b0e249d1c62cee.tar.gz mailutils-20477d627e595249371cfff878b0e249d1c62cee.tar.bz2 |
Fixed INCLUDES
-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 | 12 | ||||
-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, 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 @@ | |||
17 | ## Foundation, Inc. | 17 | ## Foundation, Inc. |
18 | ## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | ## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | 19 | ||
20 | INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir)/libmu_scm @INTLINCS@ | 20 | INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I${top_builddir}/include/mailutils/gnu -I$(top_srcdir)/include -I$(top_srcdir)/libmu_scm @INTLINCS@ |
21 | 21 | ||
22 | bin_PROGRAMS = dotlock | 22 | bin_PROGRAMS = dotlock |
23 | 23 | ||
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 = \ | |||
34 | moddir=@SIEVE_MODDIR@ | 34 | moddir=@SIEVE_MODDIR@ |
35 | mod_LTLIBRARIES = numaddr.la | 35 | mod_LTLIBRARIES = numaddr.la |
36 | 36 | ||
37 | INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/mailbox @INTLINCS@ | 37 | INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_builddir)/include/mailutils/gnu -I$(top_srcdir)/mailbox @INTLINCS@ |
38 | AM_LDFLAGS = ../mailbox/libmailbox.la ../lib/libmailutils.la | 38 | AM_LDFLAGS = ../mailbox/libmailbox.la ../lib/libmailutils.la |
39 | 39 | ||
40 | numaddr_la_SOURCES = numaddr.c | 40 | 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 @@ | |||
17 | ## Foundation, Inc. | 17 | ## Foundation, Inc. |
18 | ## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | ## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | 19 | ||
20 | INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib @INTLINCS@ | 20 | INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib -I${top_builddir}/include/mailutils/gnu @INTLINCS@ |
21 | SUBDIRS = testsuite | 21 | SUBDIRS = testsuite |
22 | 22 | ||
23 | bin_PROGRAMS = frm | 23 | 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 @@ | |||
18 | ## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | ## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | 19 | ||
20 | INCLUDES = -I. -I$(top_builddir) -I$(srcdir) -I$(top_srcdir)/lib \ | 20 | INCLUDES = -I. -I$(top_builddir) -I$(srcdir) -I$(top_srcdir)/lib \ |
21 | -I$(top_srcdir)/mailbox -I$(top_srcdir)/include @GUILE_INCLUDES@ @INTLINCS@ | 21 | -I$(top_srcdir)/mailbox -I$(top_srcdir)/include \ |
22 | -I${top_builddir}/include/mailutils/gnu @GUILE_INCLUDES@ @INTLINCS@ | ||
22 | 23 | ||
23 | SUBDIRS=scm | 24 | SUBDIRS=scm |
24 | 25 | ||
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 @@ | |||
17 | ## Foundation, Inc. | 17 | ## Foundation, Inc. |
18 | ## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | ## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | 19 | ||
20 | INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/include @AUTHINCS@ @SERV_AUTHINCS@ @INTLINCS@ | 20 | INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/include \ |
21 | -I${top_builddir}/include/mailutils/gnu @AUTHINCS@ @SERV_AUTHINCS@ @INTLINCS@ | ||
21 | SUBDIRS = testsuite | 22 | SUBDIRS = testsuite |
22 | 23 | ||
23 | sbin_PROGRAMS = imap4d | 24 | 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 @@ | |||
17 | ## Foundation, Inc. | 17 | ## Foundation, Inc. |
18 | ## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | ## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | 19 | ||
20 | AUTOMAKE_OPTIONS=no-dependencies | ||
21 | |||
20 | gnudir = $(pkgincludedir)/gnu | 22 | gnudir = $(pkgincludedir)/gnu |
21 | gnu_HEADERS = argp.h getopt.h | 23 | EXTRA_HEADERS = |
24 | gnu_HEADERS = @GNU_INCLS@ | ||
25 | 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 @@ | |||
19 | 19 | ||
20 | noinst_LTLIBRARIES = libmailutils.la | 20 | noinst_LTLIBRARIES = libmailutils.la |
21 | 21 | ||
22 | SUBDIRS = posix | 22 | INCLUDES = -I${top_srcdir}/include -I${top_builddir}/include/mailutils/gnu @INTLINCS@ |
23 | |||
24 | INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/include/mailutils/gnu @INTLINCS@ | ||
25 | libmailutils_la_SOURCES = basename.c daemon.c getopt.c getopt1.c md5.c \ | 23 | libmailutils_la_SOURCES = basename.c daemon.c getopt.c getopt1.c md5.c \ |
26 | mu_dbm.c xstrdup.c xmalloc.c | 24 | mu_dbm.c xstrdup.c xmalloc.c |
27 | 25 | ||
28 | EXTRA_DIST = alloca.c fnmatch.c fgetpwent.c getpass.c malloc.c obstack.c \ | 26 | EXTRA_DIST = alloca.c fnmatch.c fgetpwent.c getpass.c malloc.c obstack.c \ |
29 | realloc.c setenv.c snprintf.c strncasecmp.c \ | 27 | realloc.c setenv.c snprintf.c strncasecmp.c \ |
30 | strcasecmp.c strsignal.c xstrtol.c vasprintf.c vsyslog.c \ | 28 | strcasecmp.c strsignal.c xstrtol.c vasprintf.c vsyslog.c \ |
31 | utmp.c | 29 | utmp.c |
32 | 30 | ||
33 | noinst_HEADERS = error.h fnmatch.h md5.h \ | 31 | noinst_HEADERS = error.h fnmatch.h md5.h \ |
34 | mu_dbm.h\ | 32 | mu_dbm.h\ |
35 | regex.h snprintf.h xalloc.h xstrtol.h obstack.h \ | 33 | snprintf.h xalloc.h xstrtol.h obstack.h \ |
36 | mu_asprintf.h | 34 | mu_asprintf.h |
37 | 35 | ||
38 | libmailutils_la_LIBADD = @LTLIBOBJS@ @ALLOCA@ | 36 | 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 @@ | |||
17 | ## Foundation, Inc. | 17 | ## Foundation, Inc. |
18 | ## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | ## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | 19 | ||
20 | INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib @INTLINCS@ | 20 | INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_builddir}/include/mailutils/gnu @INTLINCS@ |
21 | YLWRAP = $(SHELL) $(top_srcdir)/scripts/ylwrap | 21 | YLWRAP = $(SHELL) $(top_srcdir)/scripts/ylwrap |
22 | AM_YFLAGS = -dtv | 22 | AM_YFLAGS = -dtv |
23 | AM_CPPFLAGS = -DSIEVE_MODDIR=\"@SIEVE_MODDIR@\" | 23 | 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 @@ | |||
17 | ## Foundation, Inc. | 17 | ## Foundation, Inc. |
18 | ## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | ## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | 19 | ||
20 | INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/mailbox -I$(top_srcdir)/include @GUILE_INCLUDES@ @INTLINCS@ | 20 | INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I${top_builddir}/include/mailutils/gnu -I$(top_srcdir)/mailbox -I$(top_srcdir)/include @GUILE_INCLUDES@ @INTLINCS@ |
21 | SUBDIRS = testsuite | 21 | SUBDIRS = testsuite |
22 | 22 | ||
23 | libexec_PROGRAMS = mail.local | 23 | 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 @@ | |||
17 | ## Foundation, Inc. | 17 | ## Foundation, Inc. |
18 | ## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | ## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | 19 | ||
20 | INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include @INTLINCS@ | 20 | INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I${top_builddir}/include/mailutils/gnu -I$(top_srcdir)/include @INTLINCS@ |
21 | 21 | ||
22 | SUBDIRS = testsuite | 22 | SUBDIRS = testsuite |
23 | PROGRAMS_SMTP = mail.remote | 23 | 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 @@ | |||
18 | ## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | ## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | 19 | ||
20 | AM_YFLAGS=-vt | 20 | AM_YFLAGS=-vt |
21 | INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_srcdir}/mailbox @INTLINCS@ @AUTHINCS@ | 21 | INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_builddir}/include/mailutils/gnu -I${top_srcdir}/mailbox @INTLINCS@ @AUTHINCS@ |
22 | AM_CFLAGS = -DSITE_MAIL_RC=\"@SITE_MAIL_RC@\" | 22 | AM_CFLAGS = -DSITE_MAIL_RC=\"@SITE_MAIL_RC@\" |
23 | 23 | ||
24 | bin_PROGRAMS = mail | 24 | 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 @@ | |||
17 | ## Foundation, Inc. | 17 | ## Foundation, Inc. |
18 | ## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | ## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | 19 | ||
20 | INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox -I${top_srcdir}/mailbox/include -I${top_srcdir}/include/mailutils/gnu @INTLINCS@ | 20 | INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox -I${top_srcdir}/mailbox/include -I${top_builddir}/include/mailutils/gnu @INTLINCS@ |
21 | AM_CFLAGS = -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\" | 21 | AM_CFLAGS = -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\" |
22 | YLWRAP = $(SHELL) $(top_srcdir)/scripts/ylwrap | 22 | YLWRAP = $(SHELL) $(top_srcdir)/scripts/ylwrap |
23 | AM_YFLAGS=-vt | 23 | AM_YFLAGS=-vt |
@@ -33,7 +33,7 @@ DEFS = @DEFS@ -DLOCALEDIR=\"$(localedir)\" | |||
33 | EXTRA_DIST = strtok_r.c \ | 33 | EXTRA_DIST = strtok_r.c \ |
34 | strndup.c strnlen.c strchrnul.c argp-ba.c argp-eexst.c \ | 34 | strndup.c strnlen.c strchrnul.c argp-ba.c argp-eexst.c \ |
35 | argp-fmtstream.c argp-fs-xinl.c argp-help.c argp-parse.c argp-pv.c \ | 35 | argp-fmtstream.c argp-fs-xinl.c argp-help.c argp-parse.c argp-pv.c \ |
36 | argp-pvh.c argp-xinl.c getline.c getline.h parsedate.y pin.c | 36 | argp-pvh.c argp-xinl.c getline.c getline.h parsedate.y pin.c regex.c |
37 | 37 | ||
38 | noinst_HEADERS=argp-fmtstream.h argp-namefrob.h md5.h | 38 | noinst_HEADERS=argp-fmtstream.h argp-namefrob.h md5.h |
39 | 39 | ||
@@ -68,6 +68,7 @@ mime.c \ | |||
68 | monitor.c \ | 68 | monitor.c \ |
69 | mu_argp.c \ | 69 | mu_argp.c \ |
70 | mu_auth.c \ | 70 | mu_auth.c \ |