summaryrefslogtreecommitdiff
path: root/usr.bin/rcs/Makefile
diff options
context:
space:
mode:
authorXavier Santolaria <xsa@cvs.openbsd.org>2005-10-18 16:20:32 +0000
committerXavier Santolaria <xsa@cvs.openbsd.org>2005-10-18 16:20:32 +0000
commitc2cda5e17980798dfbdf7be30710d74612597597 (patch)
tree7d330e6597e444c9a2e6dd1e3cd18c528b062c3b /usr.bin/rcs/Makefile
parent0939148c12661b498e45f24c8ae9447f77bf461e (diff)
more rcsmerge(1) bits;
Diffstat (limited to 'usr.bin/rcs/Makefile')
-rw-r--r--usr.bin/rcs/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/rcs/Makefile b/usr.bin/rcs/Makefile
index c450f36e67f..e8a25aa140b 100644
--- a/usr.bin/rcs/Makefile
+++ b/usr.bin/rcs/Makefile
@@ -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 \