===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/keynote/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- src/usr.bin/keynote/Makefile	1999/08/14 20:36:07	1.6
+++ src/usr.bin/keynote/Makefile	1999/10/01 01:08:29	1.7
@@ -1,31 +1,15 @@
-# $OpenBSD: Makefile,v 1.6 1999/08/14 20:36:07 angelos Exp $
+#	$OpenBSD: Makefile,v 1.7 1999/10/01 01:08:29 angelos Exp $
 
-PROG=	keynote
+all:
+	@cd ${.CURDIR}/../../lib && ${MAKE} libkeynote
 
-BINOWN= root
-BINGRP= bin
-BINMODE= 555
-BINDIR= /usr/bin
-LDADD=	-lkeynote -lm -lcrypto
-MAN=	keynote.1
-CLEANFILES+= lex.kv.c z.tab.c z.tab.h
+install:
+	@cd ${.CURDIR}/../../lib/libkeynote && ${MAKE} -f Makefile.bsd-wrapper install-keynote
 
-CFLAGS+= -Wall -DCRYPTO -I. -I${.CURDIR} -I/usr/include/ssl
-LEXFLAGS2 = -Pkv -s -i
-YACCFLAGS2 = -d -p kv -b z
+clean:
+	@cd ${.CURDIR}/../../lib/libkeynote && ${MAKE} -f Makefile.bsd-wrapper clean
 
-KEYNOTEDIST= lib/libkeynote
-KEYNOTE_SRC= ${.CURDIR}/../../${KEYNOTEDIST}
+cleandir:
+	@cd ${.CURDIR}/../../lib/libkeynote && ${MAKE} -f Makefile.bsd-wrapper cleandir
 
-SRCS=	keynote-sign.c keynote-keygen.c keynote-sigver.c keynote-verify.c \
-	keynote-main.c z.tab.c lex.kv.c
-
-z.tab.c: keynote-ver.y keynote.h header.h
-	$(YACC.y) $(YACCFLAGS2) ${KEYNOTE_SRC}/keynote-ver.y
-
-lex.kv.c: keynote-ver.l keynote.h header.h
-	$(LEX.l) $(LEXFLAGS2) ${KEYNOTE_SRC}/keynote-ver.l
-
-.PATH:	${KEYNOTE_SRC}
-
-.include<bsd.prog.mk>
+.include <bsd.prog.mk>