diff options
32 files changed, 72 insertions, 86 deletions
diff --git a/auth/Makefile.am b/auth/Makefile.am index e84b94174..94d322b14 100644 --- a/auth/Makefile.am +++ b/auth/Makefile.am @@ -17,7 +17,7 @@ ## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA ## 02110-1301 USA -INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox/include -I${top_srcdir}/lib -I${top_builddir}/include/mailutils/gnu @INTLINCS@ +INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@ AM_CFLAGS = -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\" \ -DSITE_CRAM_MD5_PWD=\"@SITE_CRAM_MD5_PWD@\" diff --git a/comsat/Makefile.am b/comsat/Makefile.am index ef51b1c6e..3161c2375 100644 --- a/comsat/Makefile.am +++ b/comsat/Makefile.am @@ -17,7 +17,7 @@ ## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA ## 02110-1301 USA -INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I${top_builddir}/include/mailutils/gnu -I$(top_srcdir)/include @INTLINCS@ +INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@ sbin_PROGRAMS = comsatd diff --git a/config/Makefile.am b/config/Makefile.am index a8c7f59d8..69fc60e31 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -17,9 +17,7 @@ ## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA ## 02110-1301 USA -INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox \ - -I${top_srcdir}/mailbox/include -I${top_builddir}/include/mailutils/gnu \ - @INTLINCS@ +INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@ bin_PROGRAMS = mailutils-config diff --git a/dotlock/Makefile.am b/dotlock/Makefile.am index 63c4d6186..92b4ade82 100644 --- a/dotlock/Makefile.am +++ b/dotlock/Makefile.am @@ -17,7 +17,7 @@ ## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA ## 02110-1301 USA -INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I${top_builddir}/include/mailutils/gnu -I$(top_srcdir)/include -I$(top_srcdir)/libmu_scm @INTLINCS@ +INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@ bin_PROGRAMS = dotlock diff --git a/examples/Makefile.am b/examples/Makefile.am index 40a0d1a73..48c7ec0d1 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -47,9 +47,7 @@ noinst_PROGRAMS = \ moddir=@SIEVE_MODDIR@ mod_LTLIBRARIES = numaddr.la -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib\ - -I$(top_builddir)/include/mailutils/gnu\ - -I$(top_srcdir)/mailbox @INTLINCS@ +INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@ AM_LDFLAGS = ../mailbox/libmailutils.la ../lib/libmuaux.la @MU_COMMON_LIBRARIES@ diff --git a/frm/Makefile.am b/frm/Makefile.am index f2286db0d..78ebcd13e 100644 --- a/frm/Makefile.am +++ b/frm/Makefile.am @@ -17,8 +17,7 @@ ## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA ## 02110-1301 USA -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib\ - -I${top_builddir}/include/mailutils/gnu @INTLINCS@ +INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@ SUBDIRS = testsuite diff --git a/guimb/Makefile.am b/guimb/Makefile.am index 19924ec4d..5b615cfff 100644 --- a/guimb/Makefile.am +++ b/guimb/Makefile.am @@ -17,9 +17,7 @@ ## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA ## 02110-1301 USA -INCLUDES = -I. -I$(top_builddir) -I$(srcdir) -I$(top_srcdir)/lib \ - -I$(top_srcdir)/mailbox -I$(top_srcdir)/include \ - -I${top_builddir}/include/mailutils/gnu @GUILE_INCLUDES@ @INTLINCS@ +INCLUDES = @MU_COMMON_INCLUDES@ @GUILE_INCLUDES@ @INTLINCS@ SUBDIRS=scm diff --git a/imap4d/Makefile.am b/imap4d/Makefile.am index ed824c958..4c9d3f8c4 100644 --- a/imap4d/Makefile.am +++ b/imap4d/Makefile.am @@ -17,9 +17,7 @@ ## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA ## 02110-1301 USA -INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/include \ - -I$(top_srcdir)/mailbox \ - -I${top_builddir}/include/mailutils/gnu @MU_AUTHINCS@ @SERV_AUTHINCS@ @INTLINCS@ +INCLUDES = @MU_COMMON_INCLUDES@ @MU_AUTHINCS@ @SERV_AUTHINCS@ @INTLINCS@ SUBDIRS = testsuite sbin_PROGRAMS = imap4d diff --git a/lib/Makefile.am b/lib/Makefile.am index 1cc1d8875..47ea12882 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -19,7 +19,8 @@ noinst_LTLIBRARIES = libmuaux.la -INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox -I${top_builddir}/include/mailutils/gnu @INTLINCS@ +INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@ + libmuaux_la_SOURCES = \ daemon.c\ mailcap.c\ @@ -47,17 +48,6 @@ libmuaux_la_SOURCES += exit.h -BUILT_SOURCES += $(FNMATCH_H) -EXTRA_DIST += fnmatch_.h fnmatch_loop.c - -# We need the following in order to create <fnmatch.h> when the system -# doesn't have one that supports the required API. -fnmatch.h: fnmatch_.h - cp $(srcdir)/fnmatch_.h $@-t - mv $@-t $@ -MOSTLYCLEANFILES += fnmatch.h fnmatch.h-t - - libmuaux_la_SOURCES += mbswidth.h mbswidth.c diff --git a/libmu_cpp/Makefile.am b/libmu_cpp/Makefile.am index 690511410..02a494de2 100644 --- a/libmu_cpp/Makefile.am +++ b/libmu_cpp/Makefile.am @@ -16,10 +16,7 @@ ## along with this program; if not, write to the Free Software ## 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_builddir}/include/mailutils/gnu \ - @INTLINCS@ +INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@ MU_CXX_LIBS = libmu_cpp.la lib_LTLIBRARIES = @MU_CXX_LIBS@ diff --git a/libmu_scm/Makefile.am b/libmu_scm/Makefile.am index 3c3d68036..a430ade4e 100644 --- a/libmu_scm/Makefile.am +++ b/libmu_scm/Makefile.am @@ -17,7 +17,7 @@ ## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA ## 02110-1301 USA -INCLUDES =-I. -I$(top_builddir) -I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include @GUILE_INCLUDES@ @INTLINCS@ +INCLUDES = -I. @MU_COMMON_INCLUDES@ @GUILE_INCLUDES@ @INTLINCS@ lib_LTLIBRARIES=@MU_SCM@ EXTRA_LTLIBRARIES=libmu_scm.la diff --git a/libsieve/Makefile.am b/libsieve/Makefile.am index cba0d3bf6..fb23104a7 100644 --- a/libsieve/Makefile.am +++ b/libsieve/Makefile.am @@ -17,8 +17,7 @@ ## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA ## 02110-1301 USA -INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib\ - -I${top_builddir}/include/mailutils/gnu @INTLINCS@ +INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@ YLWRAP = $(SHELL) $(top_srcdir)/scripts/ylwrap AM_YFLAGS = -dtv diff --git a/libsieve/extensions/Makefile.am b/libsieve/extensions/Makefile.am index dd32cb503..6cefd3ed2 100644 --- a/libsieve/extensions/Makefile.am +++ b/libsieve/extensions/Makefile.am @@ -20,9 +20,7 @@ moddir=@SIEVE_MODDIR@ mod_LTLIBRARIES = timestamp.la spamd.la list.la vacation.la -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib\ - -I$(top_builddir)/include/mailutils/gnu\ - -I$(top_srcdir)/mailbox @INTLINCS@ +INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@ AM_LDFLAGS = ../../mailbox/libmailutils.la ../../lib/libmuaux.la diff --git a/mail.local/Makefile.am b/mail.local/Makefile.am index 4484a3418..b14d4646e 100644 --- a/mail.local/Makefile.am +++ b/mail.local/Makefile.am @@ -17,7 +17,7 @@ ## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA ## 02110-1301 USA -INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I${top_builddir}/include/mailutils/gnu -I$(top_srcdir)/mailbox -I$(top_srcdir)/include @GUILE_INCLUDES@ @INTLINCS@ +INCLUDES = -I${top_srcdir} @MU_COMMON_INCLUDES@ @GUILE_INCLUDES@ @INTLINCS@ SUBDIRS = testsuite libexec_PROGRAMS = mail.local diff --git a/mail.remote/Makefile.am b/mail.remote/Makefile.am index c96c2c565..66072a09e 100644 --- a/mail.remote/Makefile.am +++ b/mail.remote/Makefile.am @@ -17,7 +17,7 @@ ## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA ## 02110-1301 USA -INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I${top_builddir}/include/mailutils/gnu -I$(top_srcdir)/include @INTLINCS@ +INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@ SUBDIRS = testsuite PROGRAMS_SMTP = mail.remote$(EXEEXT) diff --git a/mail/Makefile.am b/mail/Makefile.am index e9a8beca7..9e73e51a7 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -18,7 +18,7 @@ ## 02110-1301 USA AM_YFLAGS=-vt -INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_builddir}/include/mailutils/gnu -I${top_srcdir}/mailbox @INTLINCS@ @MU_AUTHINCS@ +INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@ @MU_AUTHINCS@ AM_CFLAGS = -DSITE_MAIL_RC=\"@SITE_MAIL_RC@\" bin_PROGRAMS = mail diff --git a/mailbox/Makefile.am b/mailbox/Makefile.am index 7137e3dff..980fee3d0 100644 --- a/mailbox/Makefile.am +++ b/mailbox/Makefile.am @@ -17,9 +17,7 @@ ## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA ## 02110-1301 USA -INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox \ - -I${top_srcdir}/mailbox/include -I${top_builddir}/include/mailutils/gnu \ - @INTLINCS@ +INCLUDES = @MU_COMMON_INCLUDES@ -I${top_srcdir}/mailbox/include @INTLINCS@ AM_CFLAGS = -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\" YLWRAP = $(SHELL) $(top_srcdir)/scripts/ylwrap @@ -123,10 +121,31 @@ libmailutils_la_SOURCES += argp.h argp-ba.c argp-eexst.c \ argp-namefrob.h argp-parse.c argp-pv.c argp-pvh.c argp-xinl.c +EXTRA_DIST += regex_internal.c regex_internal.h regexec.c regcomp.c libmailutils_la_SOURCES += strtok_r.h +BUILT_SOURCES += $(GLOB_H) + +# We need the following in order to create <glob.h> when the system +# doesn't have one that works with the given compiler. +glob.h: glob_.h + cp $(srcdir)/glob_.h $@-t + mv $@-t $@ +MOSTLYCLEANFILES += glob.h glob.h-t + + +BUILT_SOURCES += $(FNMATCH_H) +EXTRA_DIST += fnmatch_.h fnmatch_loop.c + +# We need the following in order to create <fnmatch.h> when the system +# doesn't have one that supports the required API. +fnmatch.h: fnmatch_.h + cp $(srcdir)/fnmatch_.h $@-t + mv $@-t $@ +MOSTLYCLEANFILES += fnmatch.h fnmatch.h-t + BUILT_SOURCES += $(GETOPT_H) @@ -141,13 +160,18 @@ MOSTLYCLEANFILES += getopt.h getopt.h-t libmailutils_la_SOURCES += gettext.h -libmailutils_la_SOURCES += mbchar.h mbchar.c + +libmailutils_la_SOURCES += mbchar.h + +libmailutils_la_SOURCES += mbuiter.h libmailutils_la_SOURCES += minmax.h +libmailutils_la_SOURCES += size_max.h + BUILT_SOURCES += $(STDBOOL_H) EXTRA_DIST += stdbool_.h @@ -159,12 +183,23 @@ stdbool.h: stdbool_.h mv $@-t $@ MOSTLYCLEANFILES += stdbool.h stdbool.h-t +BUILT_SOURCES += $(STDINT_H) +EXTRA_DIST += stdint_.h + +# We need the following in order to create <stdint.h> when the system +# doesn't have one that works with the given compiler. +stdint.h: stdint_.h + sed -e 's/@''HAVE_LONG_64BIT''@/$(HAVE_LONG_64BIT)/g;s/@''HAVE_LONG_LONG_64BIT@/$(HAVE_LONG_LONG_64BIT)/g' < $(srcdir)/stdint_.h > $@-t + mv $@-t $@ +MOSTLYCLEANFILES += stdint.h stdint.h-t + libmailutils_la_SOURCES += strcase.h libmailutils_la_SOURCES += strchrnul.h + libmailutils_la_SOURCES += strnlen1.h strnlen1.c BUILT_SOURCES += $(SYSEXITS_H) @@ -177,19 +212,10 @@ sysexits.h: sysexit_.h mv sysexits.h-t sysexits.h MOSTLYCLEANFILES += sysexits.h sysexits.h-t - libmailutils_la_SOURCES += printf-args.h printf-parse.h vasnprintf.h libmailutils_la_SOURCES += vsnprintf.h libmailutils_la_SOURCES += xsize.h -EXTRA_DIST += getdelim.c getdelim.h getdelim.c getopt.c getopt1.c md5.c md5.h md5.c memchr.c mempcpy.c mempcpy.h mempcpy.c vasnprintf.c printf-args.c printf-parse.c asnprintf.c getline.c getline.c getline.h getline.c getndelim2.c vsnprintf.c unlocked-io.h strchrnul.c regex.c strcasecmp.c strncasecmp.c strndup.c strndup.h strndup.c strnlen.c strnlen.h strnlen.c strtok_r.c - -CFLOW_FLAGS=-i^s --brief -mailutils_CFLOW_INPUT=$(libmailutils_la_OBJECTS:.lo=.c) -mailutils.cflow: $(mailutils_CFLOW_INPUT) Makefile - cflow -o$@ $(CFLOW_FLAGS) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) \ - $(mailutils_CFLOW_INPUT) +EXTRA_DIST += fnmatch.c getline.c getline.c getline.h getline.c getndelim2.c getopt.c getopt1.c md5.c md5.h md5.c mempcpy.c mempcpy.h mempcpy.c regex.c strcasecmp.c strncasecmp.c strchrnul.c strndup.c strndup.h strndup.c strnlen.c strnlen.h strnlen.c strtok_r.c vasnprintf.c printf-args.c printf-parse.c asnprintf.c vsnprintf.c unlocked-io.h getdelim.c getdelim.h getdelim.c mbchar.c memchr.c getlogin_r.c getlogin_r.c glob.c glob_.h glob-libc.h glob.c stat-macros.h strdup.c strdup.h strdup.c diff --git a/mailbox/imap/Makefile.am b/mailbox/imap/Makefile.am index 9a62c72ca..0a4eb41c5 100644 --- a/mailbox/imap/Makefile.am +++ b/mailbox/imap/Makefile.am @@ -17,9 +17,7 @@ ## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA ## 02110-1301 USA -INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox \ - -I${top_srcdir}/mailbox/include -I${top_builddir}/include/mailutils/gnu \ - @INTLINCS@ +INCLUDES = @MU_COMMON_INCLUDES@ -I${top_srcdir}/mailbox/include @INTLINCS@ lib_LTLIBRARIES = libmu_imap.la libmu_imap_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@ diff --git a/mailbox/maildir/Makefile.am b/mailbox/maildir/Makefile.am index 4a945c1a3..f38d9e923 100644 --- a/mailbox/maildir/Makefile.am +++ b/mailbox/maildir/Makefile.am @@ -17,9 +17,7 @@ ## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA ## 02110-1301 USA -INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox \ - -I${top_srcdir}/mailbox/include -I${top_builddir}/include/mailutils/gnu \ - @INTLINCS@ +INCLUDES = @MU_COMMON_INCLUDES@ -I${top_srcdir}/mailbox/include @INTLINCS@ lib_LTLIBRARIES = libmu_maildir.la libmu_maildir_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@ diff --git a/mailbox/mbox/Makefile.am b/mailbox/mbox/Makefile.am index 6c52703f1..4adb45e2a 100644 --- a/mailbox/mbox/Makefile.am +++ b/mailbox/mbox/Makefile.am @@ -17,9 +17,7 @@ ## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA ## 02110-1301 USA -INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox \ - -I${top_srcdir}/mailbox/include -I${top_builddir}/include/mailutils/gnu \ - @INTLINCS@ +INCLUDES = @MU_COMMON_INCLUDES@ -I${top_srcdir}/mailbox/include @INTLINCS@ lib_LTLIBRARIES = libmu_mbox.la libmu_mbox_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@ diff --git a/mailbox/mh/Makefile.am b/mailbox/mh/Makefile.am index e700dba7a..5e44ad8a9 100644 --- a/mailbox/mh/Makefile.am +++ b/mailbox/mh/Makefile.am @@ -17,9 +17,7 @@ ## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA ## 02110-1301 USA -INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox \ - -I${top_srcdir}/mailbox/include \ - @INTLINCS@ +INCLUDES = @MU_COMMON_INCLUDES@ -I${top_srcdir}/mailbox/include @INTLINCS@ lib_LTLIBRARIES = libmu_mh.la libmu_mh_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@ diff --git a/mailbox/nntp/Makefile.am b/mailbox/nntp/Makefile.am index 1faec4a37..feb0a984b 100644 --- a/mailbox/nntp/Makefile.am +++ b/mailbox/nntp/Makefile.am @@ -17,9 +17,7 @@ ## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA ## 02110-1301 USA -INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox \ - -I${top_srcdir}/mailbox/include -I${top_builddir}/include/mailutils/gnu \ - @INTLINCS@ +INCLUDES = @MU_COMMON_INCLUDES@ -I${top_srcdir}/mailbox/include @INTLINCS@ lib_LTLIBRARIES = libmu_nntp.la libmu_nntp_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@ diff --git a/mailbox/pop/Makefile.am b/mailbox/pop/Makefile.am index 51592e662..997da60fb 100644 --- a/mailbox/pop/Makefile.am +++ b/mailbox/pop/Makefile.am @@ -17,9 +17,7 @@ ## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA ## 02110-1301 USA -INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox \ - -I${top_srcdir}/mailbox/include -I${top_builddir}/include/mailutils/gnu \ - @INTLINCS@ +INCLUDES = @MU_COMMON_INCLUDES@ -I${top_srcdir}/mailbox/include @INTLINCS@ lib_LTLIBRARIES = libmu_pop.la libmu_pop_la_LDFLAGS=-version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@ diff --git a/mapi/Makefile.am b/mapi/Makefile.am index c15a461a9..44e311f59 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 = -I${top_srcdir}/include -I${top_srcdir}/mailbox/include +INCLUDES = @MU_COMMON_INCLUDES@ SUBDIRS = include diff --git a/messages/Makefile.am b/messages/Makefile.am index 34421f58a..b6e1a957a 100644 --- a/messages/Makefile.am +++ b/messages/Makefile.am @@ -17,8 +17,7 @@ ## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA ## 02110-1301 USA -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib\ - -I${top_builddir}/include/mailutils/gnu @INTLINCS@ +INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@ SUBDIRS = testsuite diff --git a/mh/Makefile.am b/mh/Makefile.am index b5b0765e4..c880bf553 100644 --- a/mh/Makefile.am +++ b/mh/Makefile.am @@ -122,7 +122,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_builddir}/include/mailutils/gnu -I${top_srcdir}/mailbox @INTLINCS@ +INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@ AM_CPPFLAGS = -D_GNU_SOURCE -DMHLIBDIR=\"$(mhlibdir)\" -DMHBINDIR=\"$(bindir)\" mh_LIBS = \ ./libmh.a\ diff --git a/mimeview/Makefile.am b/mimeview/Makefile.am index 3d776334c..565ba83d0 100644 --- a/mimeview/Makefile.am +++ b/mimeview/Makefile.am @@ -17,8 +17,7 @@ ## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA ## 02110-1301 USA -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib\ - -I${top_builddir}/include/mailutils/gnu @INTLINCS@ +INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@ AM_CFLAGS = -DDEFAULT_CUPS_CONFDIR=\"@DEFAULT_CUPS_CONFDIR@\" diff --git a/movemail/Makefile.am b/movemail/Makefile.am index e297707fa..55fcdbd4a 100644 --- a/movemail/Makefile.am +++ b/movemail/Makefile.am @@ -17,7 +17,7 @@ ## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA ## 02110-1301 USA -INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_builddir}/include/mailutils/gnu -I${top_srcdir}/mailbox @INTLINCS@ @MU_AUTHINCS@ +INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@ @MU_AUTHINCS@ bin_PROGRAMS = movemail movemail_LDADD = \ diff --git a/pop3d/Makefile.am b/pop3d/Makefile.am index 7c47d36d1..584e7cdd8 100644 --- a/pop3d/Makefile.am +++ b/pop3d/Makefile.am @@ -17,7 +17,7 @@ ## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA ## 02110-1301 USA -INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/mailbox -I${top_builddir}/include/mailutils/gnu -I$(top_srcdir)/include @INTLINCS@ +INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@ sbin_PROGRAMS = pop3d bin_PROGRAMS = @POPAUTH@ diff --git a/readmsg/Makefile.am b/readmsg/Makefile.am index f2aff9e90..464c003c9 100644 --- a/readmsg/Makefile.am +++ b/readmsg/Makefile.am @@ -17,8 +17,7 @@ ## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA ## 02110-1301 USA -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib\ - -I${top_builddir}/include/mailutils/gnu @INTLINCS@ +INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@ SUBDIRS = testsuite diff --git a/sieve/Makefile.am b/sieve/Makefile.am index a01ba59ad..862d14074 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 = -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_builddir}/include/mailutils/gnu @INTLINCS@ +INCLUDES = @MU_COMMON_INCLUDES@ @INTLINCS@ SUBDIRS = testsuite bin_PROGRAMS = sieve diff --git a/sql/Makefile.am b/sql/Makefile.am index 989e80a17..834f94f29 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -25,7 +25,7 @@ EXTRA_DIST=\ postgres.c DISTCLEANFILES = modlist.h -INCLUDES=-I${top_srcdir}/include -I${top_srcdir}/mailbox/include -I${top_srcdir}/lib -I${top_builddir}/include/mailutils/gnu @INTLINCS@ +INCLUDES= @MU_COMMON_INCLUDES@ @INTLINCS@ libsql_la_SOURCES=sql.c libsql_la_LIBADD=@SQL_LTLIBOBJS@ |