Commit bde28d00 bde28d00b0112d51b36a79da0dd4c84e4eff6569 by Sergey Poznyakoff

Removed @ARGPINCS@ and @ARGPLIBS@

1 parent 264490fe
1 AUTOMAKE_OPTIONS = ../lib/ansi2knr 1 AUTOMAKE_OPTIONS = ../lib/ansi2knr
2 INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include @ARGPINCS@ 2 INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include
3 3
4 sbin_PROGRAMS = comsatd 4 sbin_PROGRAMS = comsatd
5 5
6 comsatd_SOURCES = action.c cfg.c comsat.c comsat.h 6 comsatd_SOURCES = action.c cfg.c comsat.c comsat.h
7 7
8 comsatd_LDADD = @ARGPLIBS@ ../mailbox/libmailbox.la ../lib/libmailutils.la 8 comsatd_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la
......
1 AUTOMAKE_OPTIONS = ../lib/ansi2knr 1 AUTOMAKE_OPTIONS = ../lib/ansi2knr
2 INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir)/libmu_scm @ARGPINCS@ 2 INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir)/libmu_scm
3 3
4 bin_PROGRAMS = dotlock 4 bin_PROGRAMS = dotlock
5 #dotlock_SOURCES = dotlock.c 5 #dotlock_SOURCES = dotlock.c
6 6
7 dotlock_LDADD = ../mailbox/libmailbox.la @ARGPLIBS@ ../lib/libmailutils.la 7 dotlock_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la
8 8
9 install-exec-hook: 9 install-exec-hook:
10 for i in $(bin_PROGRAMS); do\ 10 for i in $(bin_PROGRAMS); do\
......
1 AUTOMAKE_OPTIONS = ../lib/ansi2knr 1 AUTOMAKE_OPTIONS = ../lib/ansi2knr
2 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib @ARGPINCS@ 2 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib
3 3
4 bin_PROGRAMS = frm 4 bin_PROGRAMS = frm
5 5
6 frm_LDADD = @ARGPLIBS@ ../mailbox/libmailbox.la ../lib/libmailutils.la 6 frm_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la
......
1 AUTOMAKE_OPTIONS = ../lib/ansi2knr 1 AUTOMAKE_OPTIONS = ../lib/ansi2knr
2 INCLUDES = -I. -I$(top_builddir) -I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include \ 2 INCLUDES = -I. -I$(top_builddir) -I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include \
3 -I$(top_srcdir)/libmu_scm @ARGPINCS@ 3 -I$(top_srcdir)/libmu_scm
4 4
5 SUBDIRS=scm 5 SUBDIRS=scm
6 6
7 bin_PROGRAMS=@GUIMB@ 7 bin_PROGRAMS=@GUIMB@
8 EXTRA_PROGRAMS=guimb 8 EXTRA_PROGRAMS=guimb
9 guimb_SOURCES=main.c collect.c util.c guimb.h 9 guimb_SOURCES=main.c collect.c util.c guimb.h
10 guimb_LDADD = @ARGPLIBS@ ../libmu_scm/libmu_scm.a ../mailbox/libmailbox.la \ 10 guimb_LDADD = ../libmu_scm/libmu_scm.a ../mailbox/libmailbox.la \
11 ../lib/libmailutils.la @GUILE_LIBS@ 11 ../lib/libmailutils.la @GUILE_LIBS@
12 12
......
1 AUTOMAKE_OPTIONS = ../lib/ansi2knr 1 AUTOMAKE_OPTIONS = ../lib/ansi2knr
2 INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/include @ARGPINCS@ @AUTHINCS@ 2 INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/include @AUTHINCS@
3 3
4 sbin_PROGRAMS = imap4d 4 sbin_PROGRAMS = imap4d
5 5
6 imap4d_LDADD = @AUTHOBJS@ @ARGPLIBS@ ../mailbox/libmailbox.la @AUTHLIBS@ ../lib/libmailutils.la 6 imap4d_LDADD = @AUTHOBJS@ ../mailbox/libmailbox.la @AUTHLIBS@ ../lib/libmailutils.la
7 imap4d_SOURCES = append.c authenticate.c bye.c capability.c check.c close.c \ 7 imap4d_SOURCES = append.c authenticate.c bye.c capability.c check.c close.c \
8 commands.c copy.c create.c delete.c examine.c expunge.c fetch.c imap4d.c \ 8 commands.c copy.c create.c delete.c examine.c expunge.c fetch.c imap4d.c \
9 imap4d.h list.c logout.c login.c lsub.c namespace.c noop.c rename.c search.c \ 9 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 \ ...@@ -12,6 +12,6 @@ imap4d_SOURCES = append.c authenticate.c bye.c capability.c check.c close.c \
12 12
13 ## This kludge is necessary to correctly establish imap4d -> AUTHOBJS 13 ## This kludge is necessary to correctly establish imap4d -> AUTHOBJS
14 ## dependency. Think about better approach --gray 14 ## dependency. Think about better approach --gray
15 imap4d_DEPENDENCIES = @AUTHOBJS@ @ARGPLIBS@ ../mailbox/libmailbox.la ../lib/libmailutils.la 15 imap4d_DEPENDENCIES = @AUTHOBJS@ ../mailbox/libmailbox.la ../lib/libmailutils.la
16 16
17 EXTRA_DIST=auth_gss.c 17 EXTRA_DIST=auth_gss.c
......
1 AUTOMAKE_OPTIONS = ../lib/ansi2knr 1 AUTOMAKE_OPTIONS = ../lib/ansi2knr
2 INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir)/libmu_scm @ARGPINCS@ 2 INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir)/libmu_scm
3 3
4 libexec_PROGRAMS = mail.local 4 libexec_PROGRAMS = mail.local
5 mail_local_SOURCES = main.c mailquota.c script.c mail.local.h 5 mail_local_SOURCES = main.c mailquota.c script.c mail.local.h
6 6
7 mail_local_LDADD = @ARGPLIBS@ @LIBMU_SCM@ ../mailbox/libmailbox.la \ 7 mail_local_LDADD = @LIBMU_SCM@ ../mailbox/libmailbox.la \
8 @AUTHLIBS@ ../lib/libmailutils.la @GUILE_LIBS@ 8 @AUTHLIBS@ ../lib/libmailutils.la @GUILE_LIBS@
9 9
10 10
......
1 AUTOMAKE_OPTIONS = ../lib/ansi2knr no-dependencies 1 AUTOMAKE_OPTIONS = ../lib/ansi2knr
2 AM_YFLAGS=-vt 2 AM_YFLAGS=-vt
3 INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib @ARGPINCS@ 3 INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib
4 AM_CFLAGS = -DSITE_MAIL_RC=\"@SITE_MAIL_RC@\" 4 AM_CFLAGS = -DSITE_MAIL_RC=\"@SITE_MAIL_RC@\"
5 5
6 bin_PROGRAMS = mail 6 bin_PROGRAMS = mail
7 7
8 mail_LDADD = @ARGPLIBS@ ../mailbox/libmailbox.la ../lib/libmailutils.la \ 8 mail_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la \
9 @READLINE_LIBS@ 9 @READLINE_LIBS@
10 10
11 EXTRA_DIST = msgset.c 11 EXTRA_DIST = msgset.c
12 12
......
1 AUTOMAKE_OPTIONS = ../lib/ansi2knr 1 AUTOMAKE_OPTIONS = ../lib/ansi2knr
2 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib @ARGPINCS@ 2 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib
3 3
4 bin_PROGRAMS = messages 4 bin_PROGRAMS = messages
5 5
6 messages_LDADD = @ARGPLIBS@ ../mailbox/libmailbox.la ../lib/libmailutils.la 6 messages_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la
......
...@@ -10,8 +10,8 @@ libmh_a_SOURCES= \ ...@@ -10,8 +10,8 @@ libmh_a_SOURCES= \
10 noinst_HEADERS = mh.h mh_getopt.h 10 noinst_HEADERS = mh.h mh_getopt.h
11 scan_SOURCES = scan.c 11 scan_SOURCES = scan.c
12 inc_SOURCES = inc.c 12 inc_SOURCES = inc.c
13 INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib @ARGPINCS@ 13 INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib
14 mh_LIBS = ./libmh.a @ARGPLIBS@ ../mailbox/libmailbox.la ../lib/libmailutils.la 14 mh_LIBS = ./libmh.a ../mailbox/libmailbox.la ../lib/libmailutils.la
15 scan_LDADD = $(mh_LIBS) -lcurses -ltermcap 15 scan_LDADD = $(mh_LIBS) -lcurses -ltermcap
16 inc_LDADD = $(mh_LIBS) 16 inc_LDADD = $(mh_LIBS)
17 YFLAGS=-vt 17 YFLAGS=-vt
......
1 AUTOMAKE_OPTIONS = ../lib/ansi2knr 1 AUTOMAKE_OPTIONS = ../lib/ansi2knr
2 INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include @ARGPINCS@ 2 INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include
3 3
4 sbin_PROGRAMS = pop3d 4 sbin_PROGRAMS = pop3d
5 bin_PROGRAMS = @POPAUTH@ 5 bin_PROGRAMS = @POPAUTH@
...@@ -9,7 +9,7 @@ pop3d_SOURCES = apop.c auth.c capa.c dele.c extra.c pop3d.c pop3d.h \ ...@@ -9,7 +9,7 @@ pop3d_SOURCES = apop.c auth.c capa.c dele.c extra.c pop3d.c pop3d.h \
9 list.c lock.c noop.c quit.c retr.c rset.c stat.c signal.c top.c uidl.c \ 9 list.c lock.c noop.c quit.c retr.c rset.c stat.c signal.c top.c uidl.c \
10 user.c virtual.c 10 user.c virtual.c
11 11
12 pop3d_LDADD = @ARGPLIBS@ ../mailbox/libmailbox.la @AUTHLIBS@ ../lib/libmailutils.la 12 pop3d_LDADD = ../mailbox/libmailbox.la @AUTHLIBS@ ../lib/libmailutils.la
13 13
14 popauth_SOURCES = popauth.c 14 popauth_SOURCES = popauth.c
15 popauth_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la 15 popauth_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la
......
1 #CFLAGS = -Wall -pedantic -g -DTESTING 1 #CFLAGS = -Wall -pedantic -g -DTESTING
2 AUTOMAKE_OPTIONS = ../lib/ansi2knr 2 AUTOMAKE_OPTIONS = ../lib/ansi2knr
3 INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib @ARGPINCS@ 3 INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib
4 YLWRAP = $(SHELL) $(srcdir)/ylwrap 4 YLWRAP = $(SHELL) $(srcdir)/ylwrap
5 YFLAGS = -d 5 YFLAGS = -d
6 6
...@@ -54,7 +54,7 @@ HDR = \ ...@@ -54,7 +54,7 @@ HDR = \
54 tree.h \ 54 tree.h \
55 util.h 55 util.h
56 56
57 sieve_LDADD = ../mailbox/libmailbox.la @ARGPLIBS@ ../lib/libmailutils.la 57 sieve_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la
58 sieve_SOURCES = \ 58 sieve_SOURCES = \
59 sieve.c \ 59 sieve.c \
60 ${SRC} $(HDR) 60 ${SRC} $(HDR)
......