===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/Makefile,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- src/usr.bin/rcs/Makefile	2005/10/16 10:12:59	1.17
+++ src/usr.bin/rcs/Makefile	2005/10/18 16:20:31	1.18
@@ -1,12 +1,12 @@
-#	$OpenBSD: Makefile,v 1.17 2005/10/16 10:12:59 xsa Exp $
+#	$OpenBSD: Makefile,v 1.18 2005/10/18 16:20:31 xsa Exp $
 
 .PATH:	${.CURDIR}/../cvs
 
 PROG=	rcs
-MAN=	ci.1 co.1 ident.1 rcs.1 rcsclean.1 rcsdiff.1 rlog.1
+MAN=	ci.1 co.1 ident.1 rcs.1 rcsclean.1 rcsdiff.1 rcsmerge.1 rlog.1
 
-SRCS=	ci.c co.c ident.c rcsclean.c rcsdiff.c rcsprog.c rlog.c buf.c date.y \
-	diff.c log.c rcs.c rcsnum.c strtab.c
+SRCS=	ci.c co.c ident.c rcsclean.c rcsdiff.c rcsmerge.c rcsprog.c rlog.c \
+	buf.c date.y diff.c log.c rcs.c rcsnum.c strtab.c
 CPPFLAGS+=-I${.CURDIR}/../cvs -DRCSPROG
 
 LINKS=	${BINDIR}/rcs ${BINDIR}/ci ${BINDIR}/rcs ${BINDIR}/co \