diff options
| author | Xavier Santolaria <xsa@cvs.openbsd.org> | 2006-11-27 14:19:54 +0000 |
|---|---|---|
| committer | Xavier Santolaria <xsa@cvs.openbsd.org> | 2006-11-27 14:19:54 +0000 |
| commit | f527cc584c2f1757f70b95388bcc2df690a03255 (patch) | |
| tree | 3583ae3b93d617a4d926395823b94f661bfab622 | |
| parent | c8d108405c2742083a623f5f1b8b71ebdaee339f (diff) | |
client-side of the annotate command is usable, build it too.
| -rw-r--r-- | usr.bin/cvs/Makefile | 12 | ||||
| -rw-r--r-- | usr.bin/cvs/cmd.c | 4 | ||||
| -rw-r--r-- | usr.bin/cvs/cvs.h | 3 |
3 files changed, 10 insertions, 9 deletions
diff --git a/usr.bin/cvs/Makefile b/usr.bin/cvs/Makefile index 227bc5886fd..cd7a67873bd 100644 --- a/usr.bin/cvs/Makefile +++ b/usr.bin/cvs/Makefile @@ -1,14 +1,14 @@ -# $OpenBSD: Makefile,v 1.32 2006/11/14 09:47:52 xsa Exp $ +# $OpenBSD: Makefile,v 1.33 2006/11/27 14:19:53 xsa Exp $ PROG= opencvs MAN= cvs.1 cvsignore.5 cvsrc.5 cvswrappers.5 cvsintro.7 CPPFLAGS+=-I${.CURDIR} -SRCS= cvs.c add.c admin.c commit.c config.c checkout.c client.c buf.c cmd.c \ - date.y diff.c diff3.c diff_internals.c entries.c fatal.c file.c \ - getlog.c log.c import.c init.c remove.c repository.c rcs.c rcsnum.c \ - rcstime.c remote.c root.c server.c status.c tag.c worklist.c util.c \ - update.c version.c xmalloc.c +SRCS= cvs.c add.c admin.c annotate.c commit.c config.c checkout.c client.c \ + buf.c cmd.c date.y diff.c diff3.c diff_internals.c entries.c fatal.c \ + file.c getlog.c log.c import.c init.c remove.c repository.c rcs.c \ + rcsnum.c rcstime.c remote.c root.c server.c status.c tag.c \ + worklist.c util.c update.c version.c xmalloc.c CFLAGS+=-Wall CFLAGS+=-Wstrict-prototypes -Wmissing-prototypes diff --git a/usr.bin/cvs/cmd.c b/usr.bin/cvs/cmd.c index 563f1f79e1c..44791037724 100644 --- a/usr.bin/cvs/cmd.c +++ b/usr.bin/cvs/cmd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd.c,v 1.54 2006/11/14 09:47:52 xsa Exp $ */ +/* $OpenBSD: cmd.c,v 1.55 2006/11/27 14:19:53 xsa Exp $ */ /* * Copyright (c) 2005 Joris Vink <joris@openbsd.org> * All rights reserved. @@ -34,6 +34,7 @@ extern char *cvs_rootstr; struct cvs_cmd *cvs_cdt[] = { &cvs_cmd_add, &cvs_cmd_admin, + &cvs_cmd_annotate, &cvs_cmd_commit, &cvs_cmd_checkout, &cvs_cmd_diff, @@ -48,7 +49,6 @@ struct cvs_cmd *cvs_cdt[] = { &cvs_cmd_update, &cvs_cmd_version, #if 0 - &cvs_cmd_annotate, &cvs_cmd_checkout, &cvs_cmd_edit, &cvs_cmd_editors, diff --git a/usr.bin/cvs/cvs.h b/usr.bin/cvs/cvs.h index 14b8241437c..9d207c6762e 100644 --- a/usr.bin/cvs/cvs.h +++ b/usr.bin/cvs/cvs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cvs.h,v 1.122 2006/11/14 15:39:41 xsa Exp $ */ +/* $OpenBSD: cvs.h,v 1.123 2006/11/27 14:19:53 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -365,6 +365,7 @@ int update_has_conflict_markers(struct cvs_file *); /* commands */ int cvs_add(int, char **); int cvs_admin(int, char **); +int cvs_annotate(int, char **); int cvs_commit(int, char **); int cvs_diff(int, char **); int cvs_getlog(int, char **); |