aboutsummaryrefslogtreecommitdiffstats
path: root/usr.sbin/smtpd/smtpd/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin/smtpd/smtpd/Makefile')
-rw-r--r--usr.sbin/smtpd/smtpd/Makefile9
1 files changed, 7 insertions, 2 deletions
diff --git a/usr.sbin/smtpd/smtpd/Makefile b/usr.sbin/smtpd/smtpd/Makefile
index 34a4dc74..53853da6 100644
--- a/usr.sbin/smtpd/smtpd/Makefile
+++ b/usr.sbin/smtpd/smtpd/Makefile
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
# $OpenBSD: Makefile,v 1.91 2018/06/03 14:04:06 gilles Exp $
+=======
+# $OpenBSD: Makefile,v 1.108 2020/09/23 18:01:27 martijn Exp $
+>>>>>>> 770825c6930... Add support for agentx to smtpd.
.PATH: ${.CURDIR}/..
@@ -11,6 +15,7 @@ SRCS+= cert.c
SRCS+= compress_backend.c
SRCS+= config.c
SRCS+= control.c
+SRCS+= control_agentx.c
SRCS+= crypto.c
SRCS+= dict.c
SRCS+= dns.c
@@ -84,8 +89,8 @@ SRCS+= stat_ramstat.c
MAN= sendmail.8 smtpd.8 smtpd.conf.5 table.5
BINDIR= /usr/sbin
-LDADD+= -levent -lutil -lssl -lcrypto -lm -lz
-DPADD+= ${LIBEVENT} ${LIBUTIL} ${LIBSSL} ${LIBCRYPTO} ${LIBM} ${LIBZ}
+LDADD+= -levent -lutil -lssl -lcrypto -lm -lz -lagentx
+DPADD+= ${LIBEVENT} ${LIBUTIL} ${LIBSSL} ${LIBCRYPTO} ${LIBM} ${LIBZ} ${LIBAGENTX}
CFLAGS+= -fstack-protector-all
CFLAGS+= -I${.CURDIR}/..