diff --git a/usr.bin/colldef/Makefile b/usr.bin/colldef/Makefile
index 023859b1e16c..06500c2785f1 100644
--- a/usr.bin/colldef/Makefile
+++ b/usr.bin/colldef/Makefile
@@ -1,13 +1,13 @@
-# $Id: Makefile,v 1.2 1995/05/01 12:10:35 ache Exp $
+# $Id: Makefile,v 1.3 1995/06/19 22:15:35 asami Exp $
 
 PROG = colldef
 LFLAGS = -8 -i
 YFLAGS = -d
 CFLAGS += -I. -I${.CURDIR}/../../lib/libc/locale
-SRCS = parse.y scan.l
+SRCS = parse.c scan.c
 LDADD = -ll
 DPADD = ${LIBL}
-CLEANFILES = y.tab.[ch] lex.yy.c
+CLEANFILES += lex.yy.c parse.c scan.c y.tab.[ch]
 
 LOCALES=        ru_SU.KOI8-R ru_SU.CP866 lt_LN.ISO_8859-1
 LOCALEDIR=      ${DESTDIR}/usr/share/locale
diff --git a/usr.sbin/pcvt/kbdio/Makefile b/usr.sbin/pcvt/kbdio/Makefile
index 4576c4eae738..c67b3f650e8e 100644
--- a/usr.sbin/pcvt/kbdio/Makefile
+++ b/usr.sbin/pcvt/kbdio/Makefile
@@ -1,4 +1,3 @@
-
 .if !exists(${.CURDIR}/../Makefile.inc)
 error:
 	@echo
@@ -11,21 +10,24 @@ error:
 .else
 
 PROG=	kbdio
-SRCS=	kbdio.y lex.l
+SRCS=	kbdio.c lex.c
 
 #YACC=	bison
 #YFLAGS+= -yd	# Bison only
 
 YFLAGS+= -v	# verbose
+
 LFLAGS+= -I
+
+DPADD=	${LIBM} ${LIBY} ${LIBL}
 LDADD=	-lm -ly -ll
 
 NOMAN=
 NOSHARED=	no shared linkage
 
-CFLAGS+= -I ${.CURDIR}/obj -I ${.CURDIR} #-g
+CFLAGS+= -I${.CURDIR}/obj -I${.CURDIR} #-g
 
-CLEANFILES+= y.tab.h
+CLEANFILES+= kbdio.c lex.c lex.yy.c y.tab.[ch]
 CLEANFILES+= y.output	# comment file from bison
 
 install:
@@ -33,6 +35,4 @@ install:
 
 .include <bsd.prog.mk>
 
-lex.o: y.tab.h lex.l
-
 .endif
diff --git a/usr.sbin/pcvt/vgaio/Makefile b/usr.sbin/pcvt/vgaio/Makefile
index de3e661ba87b..3991d9d0800f 100644
--- a/usr.sbin/pcvt/vgaio/Makefile
+++ b/usr.sbin/pcvt/vgaio/Makefile
@@ -1,4 +1,3 @@
-
 .if !exists(${.CURDIR}/../Makefile.inc)
 error:
 	@echo
@@ -13,19 +12,21 @@ error:
 PROG=	vgaio
 MAN8=	vgaio.${MAN8EXT}
 
-SRCS=	vgaio.y lex.l
+SRCS=	vgaio.c lex.c
 YACC=	yacc
 
 #YFLAGS+= -yd	# Bison
 #YFLAGS+= -v	# verbose
 
 LFLAGS+= -I
+
+DPADD=	${LIBM} ${LIBY} ${LIBL}
 LDADD=	-lm -ly -ll
 
 CFLAGS=	-O2	# due to a gcc bug, it compiles only with -O2!
-CFLAGS+= -I ${.CURDIR}/obj -I ${.CURDIR} -g
+CFLAGS+= -I${.CURDIR}/obj -I${.CURDIR} -g
 
-CLEANFILES+= y.tab.h
+CLEANFILES+= lex.c lex.yy.c vgaio.c y.tab.[ch]
 CLEANFILES+= y.output	# comment file from bison
 
 install: