diff options
-rw-r--r-- | auth/Makefile.am | 2 | ||||
-rw-r--r-- | comsat/Makefile.am | 4 | ||||
-rw-r--r-- | dotlock/Makefile.am | 4 | ||||
-rw-r--r-- | examples/Makefile.am | 2 | ||||
-rw-r--r-- | frm/Makefile.am | 4 | ||||
-rw-r--r-- | from/Makefile.am | 4 | ||||
-rw-r--r-- | guimb/Makefile.am | 4 | ||||
-rw-r--r-- | imap4d/Makefile.am | 4 | ||||
-rw-r--r-- | libmu_scm/Makefile.am | 2 | ||||
-rw-r--r-- | libsieve/Makefile.am | 2 | ||||
-rw-r--r-- | mail.local/Makefile.am | 4 | ||||
-rw-r--r-- | mail/Makefile.am | 4 | ||||
-rw-r--r-- | mailbox/Makefile.am | 6 | ||||
-rw-r--r-- | messages/Makefile.am | 4 | ||||
-rw-r--r-- | mh/Makefile.am | 4 | ||||
-rw-r--r-- | pop3d/Makefile.am | 6 | ||||
-rw-r--r-- | readmsg/Makefile.am | 4 | ||||
-rw-r--r-- | sieve/Makefile.am | 4 |
18 files changed, 34 insertions, 34 deletions
diff --git a/auth/Makefile.am b/auth/Makefile.am index 54f6dbb85..dfbc1a16f 100644 --- a/auth/Makefile.am +++ b/auth/Makefile.am @@ -4,3 +4,3 @@ -INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox/include -I${top_srcdir}/lib +INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox/include -I${top_srcdir}/lib @INTLINCS@ AM_CFLAGS = -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\" diff --git a/comsat/Makefile.am b/comsat/Makefile.am index 7e5f67f62..a2d95a893 100644 --- a/comsat/Makefile.am +++ b/comsat/Makefile.am @@ -4,3 +4,3 @@ -INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include +INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include @INTLINCS@ @@ -10,2 +10,2 @@ comsatd_SOURCES = action.c cfg.c comsat.c comsat.h -comsatd_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la +comsatd_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la @LTLIBINTL@ diff --git a/dotlock/Makefile.am b/dotlock/Makefile.am index 4b5f7e027..8efec4975 100644 --- a/dotlock/Makefile.am +++ b/dotlock/Makefile.am @@ -4,3 +4,3 @@ -INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir)/libmu_scm +INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir)/libmu_scm @INTLINCS@ @@ -9,3 +9,3 @@ bin_PROGRAMS = dotlock -dotlock_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la +dotlock_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la @LTLIBINTL@ diff --git a/examples/Makefile.am b/examples/Makefile.am index f7be816d3..ee4fcb535 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -18,3 +18,3 @@ mod_LTLIBRARIES = numaddr.la -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib +INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib @INTLINCS@ AM_LDFLAGS = ../mailbox/libmailbox.la ../lib/libmailutils.la diff --git a/frm/Makefile.am b/frm/Makefile.am index da51ff785..739956936 100644 --- a/frm/Makefile.am +++ b/frm/Makefile.am @@ -4,3 +4,3 @@ -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib +INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib @INTLINCS@ SUBDIRS = testsuite @@ -9,2 +9,2 @@ bin_PROGRAMS = frm frm_SOURCES = frm.c -frm_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la +frm_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la @LTLIBINTL@ diff --git a/from/Makefile.am b/from/Makefile.am index c81454c58..86804f45d 100644 --- a/from/Makefile.am +++ b/from/Makefile.am @@ -4,3 +4,3 @@ -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib +INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib @INTLINCS@ SUBDIRS = testsuite @@ -9,2 +9,2 @@ bin_PROGRAMS = from -from_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la +from_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la @LTLIBINTL@ diff --git a/guimb/Makefile.am b/guimb/Makefile.am index b0c5d2da1..acf8623a6 100644 --- a/guimb/Makefile.am +++ b/guimb/Makefile.am @@ -5,3 +5,3 @@ INCLUDES = -I. -I$(top_builddir) -I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include \ - -I$(top_srcdir)/libmu_scm @GUILE_INCLUDES@ + -I$(top_srcdir)/libmu_scm @GUILE_INCLUDES@ @INTLINCS@ @@ -13,3 +13,3 @@ guimb_SOURCES=main.c collect.c util.c guimb.h guimb_LDADD = ../libmu_scm/libmu_scm.la ../mailbox/libmailbox.la \ - ../lib/libmailutils.la @GUILE_LIBS@ + ../lib/libmailutils.la @GUILE_LIBS@ @LTLIBINTL@ diff --git a/imap4d/Makefile.am b/imap4d/Makefile.am index 3e3dfd1d4..e9cb9eedd 100644 --- a/imap4d/Makefile.am +++ b/imap4d/Makefile.am @@ -4,3 +4,3 @@ -INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/include @AUTHINCS@ +INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/include @AUTHINCS@ @INTLINCS@ SUBDIRS = testsuite @@ -9,3 +9,3 @@ sbin_PROGRAMS = imap4d -imap4d_LDADD = @AUTHOBJS@ ../mailbox/libmailbox.la @AUTHLIBS@ ../lib/libmailutils.la +imap4d_LDADD = @AUTHOBJS@ ../mailbox/libmailbox.la @AUTHLIBS@ ../lib/libmailutils.la @LTLIBINTL@ imap4d_SOURCES = append.c authenticate.c bye.c capability.c check.c close.c \ diff --git a/libmu_scm/Makefile.am b/libmu_scm/Makefile.am index d087aebc0..2ed7b43f6 100644 --- a/libmu_scm/Makefile.am +++ b/libmu_scm/Makefile.am @@ -4,3 +4,3 @@ -INCLUDES =-I. -I$(top_builddir) -I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include @GUILE_INCLUDES@ +INCLUDES =-I. -I$(top_builddir) -I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include @GUILE_INCLUDES@ @INTLINCS@ diff --git a/libsieve/Makefile.am b/libsieve/Makefile.am index a3ce43df0..b73eefe57 100644 --- a/libsieve/Makefile.am +++ b/libsieve/Makefile.am @@ -4,3 +4,3 @@ -INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib +INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib @INTLINCS@ YLWRAP = $(SHELL) $(top_srcdir)/scripts/ylwrap diff --git a/mail.local/Makefile.am b/mail.local/Makefile.am index 88264f5a1..a02834f13 100644 --- a/mail.local/Makefile.am +++ b/mail.local/Makefile.am @@ -4,3 +4,3 @@ -INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/mailbox -I$(top_srcdir)/include -I$(top_srcdir)/libmu_scm @GUILE_INCLUDES@ +INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/mailbox -I$(top_srcdir)/include -I$(top_srcdir)/libmu_scm @GUILE_INCLUDES@ @INTLINCS@ SUBDIRS = testsuite @@ -11,3 +11,3 @@ mail_local_SOURCES = main.c mailquota.c script.c mail.local.h mail_local_LDADD = @LIBMU_SCM@ @GUILE_LIBS@ ../mailbox/libmailbox.la \ - @AUTHLIBS@ ../libsieve/libsieve.la ../lib/libmailutils.la + @AUTHLIBS@ ../libsieve/libsieve.la ../lib/libmailutils.la @LTLIBINTL@ diff --git a/mail/Makefile.am b/mail/Makefile.am index a54f5e335..c712c05af 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -5,3 +5,3 @@ AM_YFLAGS=-vt -INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_srcdir}/mailbox +INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_srcdir}/mailbox @INTLINCS@ AM_CFLAGS = -DSITE_MAIL_RC=\"@SITE_MAIL_RC@\" @@ -11,3 +11,3 @@ bin_PROGRAMS = mail mail_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la \ - @READLINE_LIBS@ + @READLINE_LIBS@ @LTLIBINTL@ diff --git a/mailbox/Makefile.am b/mailbox/Makefile.am index 101570d29..5a4f01d18 100644 --- a/mailbox/Makefile.am +++ b/mailbox/Makefile.am @@ -4,3 +4,3 @@ -INCLUDES = -I${top_srcdir}/include -I$(top_srcdir)/intl -I${top_srcdir}/mailbox -I${top_srcdir}/mailbox/include -I${top_srcdir}/include/mailutils/gnu +INCLUDES = -I${top_srcdir}/include -I$(top_srcdir)/intl -I${top_srcdir}/mailbox -I${top_srcdir}/mailbox/include -I${top_srcdir}/include/mailutils/gnu @INTLINCS@ AM_CFLAGS = -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\" @@ -88,3 +88,3 @@ wicket.c libmailbox_la_DEPENDENCIES = @MU_LTLIBOBJS@ -libmailbox_la_LIBADD = @MU_LTLIBOBJS@ @LIBINTL@ +libmailbox_la_LIBADD = @MU_LTLIBOBJS@ @LTLIBINTL@ libmailbox_la_LDFLAGS = -version-info 0:0:0 @@ -92,3 +92,3 @@ libmailbox_la_LDFLAGS = -version-info 0:0:0 mailutils_config_SOURCES = mailutils-config.c -mailutils_config_LDADD = ./libmailbox.la ../lib/libmailutils.la +mailutils_config_LDADD = ./libmailbox.la ../lib/libmailutils.la @LTLIBINTL@ mailutils_config_CFLAGS = -DCOMPILE_FLAGS="\"-I$(includedir)\"" -I$(top_srcdir)/intl -DLINK_FLAGS="\"-L$(libdir)\"" -DAUTHLIBS="\"$(MYSQLLIBS)\"" -DGUILE_LIBS="\"$(GUILE_LIBS)\"" diff --git a/messages/Makefile.am b/messages/Makefile.am index c3e7790d1..7dcfa4899 100644 --- a/messages/Makefile.am +++ b/messages/Makefile.am @@ -4,3 +4,3 @@ -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib +INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib @INTLINCS@ SUBDIRS = testsuite @@ -9,2 +9,2 @@ bin_PROGRAMS = messages -messages_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la +messages_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la @LTLIBINTL@ diff --git a/mh/Makefile.am b/mh/Makefile.am index e279f3019..54c2c6e44 100644 --- a/mh/Makefile.am +++ b/mh/Makefile.am @@ -33,4 +33,4 @@ fmtcheck_SOURCES = fmtcheck.c repl_SOURCES = repl.c -INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib -mh_LIBS = ./libmh.a ../mailbox/libmailbox.la ../lib/libmailutils.la +INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib @INTLINCS@ +mh_LIBS = ./libmh.a ../mailbox/libmailbox.la ../lib/libmailutils.la @LTLIBINTL@ scan_LDADD = $(mh_LIBS) @CURSES_LIBS@ diff --git a/pop3d/Makefile.am b/pop3d/Makefile.am index c15da760e..b0543a82f 100644 --- a/pop3d/Makefile.am +++ b/pop3d/Makefile.am @@ -4,3 +4,3 @@ -INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include +INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include @INTLINCS@ @@ -15,5 +15,5 @@ pop3d_SOURCES = apop.c auth.c capa.c dele.c extra.c pop3d.c pop3d.h \ -pop3d_LDADD = ../mailbox/libmailbox.la @AUTHLIBS@ ../lib/libmailutils.la +pop3d_LDADD = ../mailbox/libmailbox.la @AUTHLIBS@ ../lib/libmailutils.la @LTLIBINTL@ popauth_SOURCES = popauth.c -popauth_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la +popauth_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la @LTLIBINTL@ diff --git a/readmsg/Makefile.am b/readmsg/Makefile.am index 7a42926fd..389710233 100644 --- a/readmsg/Makefile.am +++ b/readmsg/Makefile.am @@ -4,3 +4,3 @@ -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib +INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib @INTLINCS@ SUBDIRS = testsuite @@ -10,2 +10,2 @@ bin_PROGRAMS = readmsg readmsg_SOURCES = readmsg.c msglist.c readmsg.h -readmsg_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la +readmsg_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la @LTLIBINTL@ diff --git a/sieve/Makefile.am b/sieve/Makefile.am index 9fa8b4fe2..edd870374 100644 --- a/sieve/Makefile.am +++ b/sieve/Makefile.am @@ -4,3 +4,3 @@ -INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib +INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib @INTLINCS@ SUBDIRS = testsuite @@ -9,3 +9,3 @@ bin_PROGRAMS = sieve sieve_SOURCES = sieve.c -sieve_LDADD = ../libsieve/libsieve.la ../mailbox/libmailbox.la ../lib/libmailutils.la +sieve_LDADD = ../libsieve/libsieve.la ../mailbox/libmailbox.la ../lib/libmailutils.la @LTLIBINTL@ sieve_LDFLAGS = -export-dynamic |