summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--comsat/Makefile.am4
-rw-r--r--dotlock/Makefile.am4
-rw-r--r--frm/Makefile.am4
-rw-r--r--guimb/Makefile.am4
-rw-r--r--imap4d/Makefile.am6
-rw-r--r--mail.local/Makefile.am4
-rw-r--r--mail/Makefile.am8
-rw-r--r--messages/Makefile.am4
-rw-r--r--mh/Makefile.am4
-rw-r--r--pop3d/Makefile.am4
-rw-r--r--sieve/Makefile.am4
11 files changed, 25 insertions, 25 deletions
diff --git a/comsat/Makefile.am b/comsat/Makefile.am
index 0fe57abb2..4d549a493 100644
--- a/comsat/Makefile.am
+++ b/comsat/Makefile.am
@@ -1,8 +1,8 @@
AUTOMAKE_OPTIONS = ../lib/ansi2knr
-INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include @ARGPINCS@
+INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include
sbin_PROGRAMS = comsatd
comsatd_SOURCES = action.c cfg.c comsat.c comsat.h
-comsatd_LDADD = @ARGPLIBS@ ../mailbox/libmailbox.la ../lib/libmailutils.la
+comsatd_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la
diff --git a/dotlock/Makefile.am b/dotlock/Makefile.am
index b904cdeea..4365eb4fa 100644
--- a/dotlock/Makefile.am
+++ b/dotlock/Makefile.am
@@ -1,10 +1,10 @@
AUTOMAKE_OPTIONS = ../lib/ansi2knr
-INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir)/libmu_scm @ARGPINCS@
+INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir)/libmu_scm
bin_PROGRAMS = dotlock
#dotlock_SOURCES = dotlock.c
-dotlock_LDADD = ../mailbox/libmailbox.la @ARGPLIBS@ ../lib/libmailutils.la
+dotlock_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la
install-exec-hook:
for i in $(bin_PROGRAMS); do\
diff --git a/frm/Makefile.am b/frm/Makefile.am
index e2eecd04e..4bb9d6b03 100644
--- a/frm/Makefile.am
+++ b/frm/Makefile.am
@@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS = ../lib/ansi2knr
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib @ARGPINCS@
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib
bin_PROGRAMS = frm
-frm_LDADD = @ARGPLIBS@ ../mailbox/libmailbox.la ../lib/libmailutils.la
+frm_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la
diff --git a/guimb/Makefile.am b/guimb/Makefile.am
index 4426623c4..9d0b444be 100644
--- a/guimb/Makefile.am
+++ b/guimb/Makefile.am
@@ -1,12 +1,12 @@
AUTOMAKE_OPTIONS = ../lib/ansi2knr
INCLUDES = -I. -I$(top_builddir) -I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include \
- -I$(top_srcdir)/libmu_scm @ARGPINCS@
+ -I$(top_srcdir)/libmu_scm
SUBDIRS=scm
bin_PROGRAMS=@GUIMB@
EXTRA_PROGRAMS=guimb
guimb_SOURCES=main.c collect.c util.c guimb.h
-guimb_LDADD = @ARGPLIBS@ ../libmu_scm/libmu_scm.a ../mailbox/libmailbox.la \
+guimb_LDADD = ../libmu_scm/libmu_scm.a ../mailbox/libmailbox.la \
../lib/libmailutils.la @GUILE_LIBS@
diff --git a/imap4d/Makefile.am b/imap4d/Makefile.am
index ac3a4c3a0..d19a05210 100644
--- a/imap4d/Makefile.am
+++ b/imap4d/Makefile.am
@@ -1,9 +1,9 @@
AUTOMAKE_OPTIONS = ../lib/ansi2knr
-INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/include @ARGPINCS@ @AUTHINCS@
+INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/include @AUTHINCS@
sbin_PROGRAMS = imap4d
-imap4d_LDADD = @AUTHOBJS@ @ARGPLIBS@ ../mailbox/libmailbox.la @AUTHLIBS@ ../lib/libmailutils.la
+imap4d_LDADD = @AUTHOBJS@ ../mailbox/libmailbox.la @AUTHLIBS@ ../lib/libmailutils.la
imap4d_SOURCES = append.c authenticate.c bye.c capability.c check.c close.c \
commands.c copy.c create.c delete.c examine.c expunge.c fetch.c imap4d.c \
imap4d.h list.c logout.c login.c lsub.c namespace.c noop.c rename.c search.c \
@@ -12,6 +12,6 @@ imap4d_SOURCES = append.c authenticate.c bye.c capability.c check.c close.c \
## This kludge is necessary to correctly establish imap4d -> AUTHOBJS
## dependency. Think about better approach --gray
-imap4d_DEPENDENCIES = @AUTHOBJS@ @ARGPLIBS@ ../mailbox/libmailbox.la ../lib/libmailutils.la
+imap4d_DEPENDENCIES = @AUTHOBJS@ ../mailbox/libmailbox.la ../lib/libmailutils.la
EXTRA_DIST=auth_gss.c
diff --git a/mail.local/Makefile.am b/mail.local/Makefile.am
index 0fd29cad9..f0ef316d2 100644
--- a/mail.local/Makefile.am
+++ b/mail.local/Makefile.am
@@ -1,10 +1,10 @@
AUTOMAKE_OPTIONS = ../lib/ansi2knr
-INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir)/libmu_scm @ARGPINCS@
+INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir)/libmu_scm
libexec_PROGRAMS = mail.local
mail_local_SOURCES = main.c mailquota.c script.c mail.local.h
-mail_local_LDADD = @ARGPLIBS@ @LIBMU_SCM@ ../mailbox/libmailbox.la \
+mail_local_LDADD = @LIBMU_SCM@ ../mailbox/libmailbox.la \
@AUTHLIBS@ ../lib/libmailutils.la @GUILE_LIBS@
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 4bd121985..5d44575f9 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -1,12 +1,12 @@
-AUTOMAKE_OPTIONS = ../lib/ansi2knr no-dependencies
+AUTOMAKE_OPTIONS = ../lib/ansi2knr
AM_YFLAGS=-vt
-INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib @ARGPINCS@
+INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib
AM_CFLAGS = -DSITE_MAIL_RC=\"@SITE_MAIL_RC@\"
bin_PROGRAMS = mail
-mail_LDADD = @ARGPLIBS@ ../mailbox/libmailbox.la ../lib/libmailutils.la \
- @READLINE_LIBS@
+mail_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la \
+ @READLINE_LIBS@
EXTRA_DIST = msgset.c
diff --git a/messages/Makefile.am b/messages/Makefile.am
index 979064f7d..b9ab30dbd 100644
--- a/messages/Makefile.am
+++ b/messages/Makefile.am
@@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS = ../lib/ansi2knr
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib @ARGPINCS@
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib
bin_PROGRAMS = messages
-messages_LDADD = @ARGPLIBS@ ../mailbox/libmailbox.la ../lib/libmailutils.la
+messages_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la
diff --git a/mh/Makefile.am b/mh/Makefile.am
index 9b6874cba..f30dd1292 100644
--- a/mh/Makefile.am
+++ b/mh/Makefile.am
@@ -10,8 +10,8 @@ libmh_a_SOURCES= \
noinst_HEADERS = mh.h mh_getopt.h
scan_SOURCES = scan.c
inc_SOURCES = inc.c
-INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib @ARGPINCS@
-mh_LIBS = ./libmh.a @ARGPLIBS@ ../mailbox/libmailbox.la ../lib/libmailutils.la
+INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib
+mh_LIBS = ./libmh.a ../mailbox/libmailbox.la ../lib/libmailutils.la
scan_LDADD = $(mh_LIBS) -lcurses -ltermcap
inc_LDADD = $(mh_LIBS)
YFLAGS=-vt
diff --git a/pop3d/Makefile.am b/pop3d/Makefile.am
index 6deb0e5f2..0732280e8 100644
--- a/pop3d/Makefile.am
+++ b/pop3d/Makefile.am
@@ -1,5 +1,5 @@
AUTOMAKE_OPTIONS = ../lib/ansi2knr
-INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include @ARGPINCS@
+INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include
sbin_PROGRAMS = pop3d
bin_PROGRAMS = @POPAUTH@
@@ -9,7 +9,7 @@ pop3d_SOURCES = apop.c auth.c capa.c dele.c extra.c pop3d.c pop3d.h \
list.c lock.c noop.c quit.c retr.c rset.c stat.c signal.c top.c uidl.c \
user.c virtual.c
-pop3d_LDADD = @ARGPLIBS@ ../mailbox/libmailbox.la @AUTHLIBS@ ../lib/libmailutils.la
+pop3d_LDADD = ../mailbox/libmailbox.la @AUTHLIBS@ ../lib/libmailutils.la
popauth_SOURCES = popauth.c
popauth_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la
diff --git a/sieve/Makefile.am b/sieve/Makefile.am
index e2a53c964..6e4e9417e 100644
--- a/sieve/Makefile.am
+++ b/sieve/Makefile.am
@@ -1,6 +1,6 @@
#CFLAGS = -Wall -pedantic -g -DTESTING
AUTOMAKE_OPTIONS = ../lib/ansi2knr
-INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib @ARGPINCS@
+INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib
YLWRAP = $(SHELL) $(srcdir)/ylwrap
YFLAGS = -d
@@ -54,7 +54,7 @@ HDR = \
tree.h \
util.h
-sieve_LDADD = ../mailbox/libmailbox.la @ARGPLIBS@ ../lib/libmailutils.la
+sieve_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la
sieve_SOURCES = \
sieve.c \
${SRC} $(HDR)

Return to:

Send suggestions and report system problems to the System administrator.