From 279fdb6b313cbaa9614199eff4369a838ea60403 Mon Sep 17 00:00:00 2001
From: Theo de Raadt <deraadt@cvs.openbsd.org>
Date: Fri, 8 Apr 2005 17:15:02 +0000
Subject: keynote and policy always compiled in

---
 sbin/isakmpd/Makefile | 29 ++++-------------------------
 1 file changed, 4 insertions(+), 25 deletions(-)

(limited to 'sbin/isakmpd/Makefile')

diff --git a/sbin/isakmpd/Makefile b/sbin/isakmpd/Makefile
index b99649bb781..2d1af2be5a9 100644
--- a/sbin/isakmpd/Makefile
+++ b/sbin/isakmpd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.67 2005/04/08 17:03:04 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.68 2005/04/08 17:15:01 deraadt Exp $
 #	$EOM: Makefile,v 1.78 2000/10/15 21:33:42 niklas Exp $
 
 #
@@ -113,38 +113,17 @@ DPADD+=		${LIBGMP}
 CFLAGS+=	-DMP_FLAVOUR=MP_FLAVOUR_OPENSSL
 .endif
 
-.ifdef USE_KEYNOTE
-USE_LIBCRYPTO=	yes
-USE_LIBDES=	yes
-LDADD+=		-lkeynote -lm
-DPADD+=		${LIBKEYNOTE} ${LIBM}
-CFLAGS+=	-DUSE_KEYNOTE
-.endif
-
 .ifdef USE_RAWKEY
-USE_LIBCRYPTO=	yes
 CFLAGS+=	-DUSE_RAWKEY
 .endif
 
-.ifdef USE_LIBCRYPTO
-CFLAGS+=	-DUSE_LIBCRYPTO
-LDADD+=		-lcrypto
-DPADD+=		${LIBCRYPTO}
-.endif
-
-.ifdef USE_LIBDES
-CFLAGS+=	-DUSE_LIBDES
-LDADD+=		-ldes
-DPADD+=		${LIBDES}
-.endif
-
-SRCS+=		${IPSEC_SRCS} ${POLICY} math_ec2n.c ${DNSSEC} \
+SRCS+=		${IPSEC_SRCS} ${DNSSEC} policy.c math_ec2n.c \
 		ike_aggressive.c isakmp_cfg.c dpd.c monitor.c monitor_fdpass.c \
 		nat_traversal.c udp_encap.c
 CFLAGS+=	${IPSEC_CFLAGS} ${DNSSEC_CFLAGS}
 
-LDADD+=		${DESLIB} ${LWRESLIB}
-DPADD+=		${DESLIBDEP} ${LWRESLIB}
+LDADD+=		${LWRESLIB} -lkeynote -lcrypto -ldes -lm
+DPADD+=		${LWRESLIB} ${LIBKEYNOTE} ${LIBCRYPTO} ${LIBDES} ${LIBM}
 
 exchange_num.c exchange_num.h: genconstants.sh exchange_num.cst
 	/bin/sh ${.CURDIR}/genconstants.sh ${.CURDIR}/exchange_num
-- 
cgit v1.2.3