summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2009-03-23 15:27:42 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2009-03-23 15:27:42 +0000
commitcaac2dc08325a60ea646bec5862ab756fe8e6320 (patch)
tree5973eeb6875e8dee7dae7ac37ddd8cbf02bfa9f5
parent67dee8b0cd8a689f9afbf8b79e1e4777552bac7e (diff)
repair library use. this was detected on the vax, a nice static linking
architecture. it was silently creating broken code on other architectures.
-rw-r--r--usr.sbin/smtpd/smtpctl/Makefile5
-rw-r--r--usr.sbin/smtpd/smtpd/Makefile6
2 files changed, 6 insertions, 5 deletions
diff --git a/usr.sbin/smtpd/smtpctl/Makefile b/usr.sbin/smtpd/smtpctl/Makefile
index 018ebb3af4a..dcacdaae430 100644
--- a/usr.sbin/smtpd/smtpctl/Makefile
+++ b/usr.sbin/smtpd/smtpctl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2009/03/16 22:03:42 jacekm Exp $
+# $OpenBSD: Makefile,v 1.8 2009/03/23 15:27:39 deraadt Exp $
.PATH: ${.CURDIR}/..
@@ -17,5 +17,6 @@ CFLAGS+= -Wshadow -Wpointer-arith -Wcast-qual
CFLAGS+= -Wsign-compare -Wbounded
SRCS= smtpctl.c parser.c buffer.c imsg.c log.c enqueue.c queue_shared.c util.c
-LDFLAGS= -lutil
+LDADD+= -lutil
+DPADD+= ${LIBUTIL}
.include <bsd.prog.mk>
diff --git a/usr.sbin/smtpd/smtpd/Makefile b/usr.sbin/smtpd/smtpd/Makefile
index 71b7810c204..3fa315e2e7e 100644
--- a/usr.sbin/smtpd/smtpd/Makefile
+++ b/usr.sbin/smtpd/smtpd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2009/01/27 22:54:01 gilles Exp $
+# $OpenBSD: Makefile,v 1.7 2009/03/23 15:27:41 deraadt Exp $
PROG= smtpd
SRCS= parse.y log.c config.c buffer.c imsg.c \
@@ -9,8 +9,8 @@ SRCS= parse.y log.c config.c buffer.c imsg.c \
MAN= smtpd.8 smtpd.conf.5
BINDIR= /usr/sbin
-LDADD= -levent -lutil -lssl -lcrypto -lkeynote -lm
-DPADD= ${LIBEVENT} ${LIBSSL} ${LIBCRYPTO}
+LDADD+= -levent -lutil -lkeynote -lssl -lcrypto -lm
+DPADD+= ${LIBEVENT} ${LIBUTIL} ${LIBKEYNOTE} ${LIBSSL} ${LIBCRYPTO} ${LIBM}
CFLAGS= -g3 -ggdb -I${.CURDIR}/..
CFLAGS+= -Wall -Wstrict-prototypes -Wmissing-prototypes
CFLAGS+= -Wmissing-declarations