diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2005-04-15 15:47:09 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2005-04-15 15:47:09 +0000 |
| commit | 001aae0cffd6f05f2f054b20a1ab66510c564dfb (patch) | |
| tree | 3eddf1a05654996bd073d256268ccab466fffd2a /usr.bin/cvs | |
| parent | 19b75a1a690e40a7a022d348bb1329485a220608 (diff) | |
build cvs right out of the base directory, no need for a subdir (you may
need some obj cleaning as a result of this); ok jfb
Diffstat (limited to 'usr.bin/cvs')
| -rw-r--r-- | usr.bin/cvs/Makefile | 29 | ||||
| -rw-r--r-- | usr.bin/cvs/cvs/Makefile | 30 |
2 files changed, 25 insertions, 34 deletions
diff --git a/usr.bin/cvs/Makefile b/usr.bin/cvs/Makefile index 95f24627f71..fb2ac8da25e 100644 --- a/usr.bin/cvs/Makefile +++ b/usr.bin/cvs/Makefile @@ -1,7 +1,28 @@ -# $OpenBSD: Makefile,v 1.4 2005/04/06 22:08:53 joris Exp $ +# $OpenBSD: Makefile,v 1.5 2005/04/15 15:47:06 deraadt Exp $ -.include <bsd.own.mk> +PROG= cvs +MAN= cvs.1 cvsrc.5 cvsintro.7 -SUBDIR= cvs rcs +SRCS= cvs.c add.c admin.c annotate.c buf.c checkout.c cmd.c commit.c date.y \ + diff.c entries.c file.c getlog.c history.c hist.c import.c init.c \ + log.c logmsg.c proto.c rcs.c rcsnum.c remove.c req.c resp.c root.c \ + server.c status.c strtab.c tag.c update.c util.c version.c -.include <bsd.subdir.mk> +BINDIR= /usr/bin +BINOWN= root + +#BINGRP=_cvsd +#BINMODE=555 + +CFLAGS= -g -ggdb +CFLAGS+= -I${.CURDIR} -Wall +CFLAGS+= -Wstrict-prototypes -Wmissing-prototypes +CFLAGS+= -Wmissing-declarations +CFLAGS+= -Wshadow -Wpointer-arith -Wcast-qual +CFLAGS+= -Wsign-compare +CFLAGS+= -DCVS +YFLAGS= + +INSTALL_STRIP= + +.include <bsd.prog.mk> diff --git a/usr.bin/cvs/cvs/Makefile b/usr.bin/cvs/cvs/Makefile deleted file mode 100644 index 4a250bd706c..00000000000 --- a/usr.bin/cvs/cvs/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# $OpenBSD: Makefile,v 1.24 2005/03/31 17:21:45 xsa Exp $ - -.PATH: ${.CURDIR}/.. - -PROG= cvs -MAN= cvs.1 cvsrc.5 cvsintro.7 - -SRCS= cvs.c add.c admin.c annotate.c buf.c checkout.c cmd.c commit.c date.y \ - diff.c entries.c file.c getlog.c history.c hist.c import.c init.c \ - log.c logmsg.c proto.c rcs.c rcsnum.c remove.c req.c resp.c root.c \ - server.c status.c strtab.c tag.c update.c util.c version.c - -BINDIR= /usr/bin -BINOWN= root - -#BINGRP=_cvsd -#BINMODE=555 - -CFLAGS= -g -ggdb -CFLAGS+= -I${.CURDIR}/.. -Wall -CFLAGS+= -Wstrict-prototypes -Wmissing-prototypes -CFLAGS+= -Wmissing-declarations -CFLAGS+= -Wshadow -Wpointer-arith -Wcast-qual -CFLAGS+= -Wsign-compare -CFLAGS+= -DCVS -YFLAGS= - -INSTALL_STRIP= - -.include <bsd.prog.mk> |