diff options
| author | Xavier Santolaria <xsa@cvs.openbsd.org> | 2006-01-03 17:04:54 +0000 |
|---|---|---|
| committer | Xavier Santolaria <xsa@cvs.openbsd.org> | 2006-01-03 17:04:54 +0000 |
| commit | 800b909afb8211376c486653ab2fef3e0f871ed7 (patch) | |
| tree | 4d6ec6457e9ebe18762f3ea90b86d5a2795c16a3 /usr.bin | |
| parent | 55ed8f9dae7c6ebf9dc3ef03fd9d7a93303d8a4f (diff) | |
renaming zlib.{c,h} files to compress.{c,h} and link to build;
was pretty stupid calling them that way;
ok joris@ niallo@.
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/cvs/Makefile | 15 | ||||
| -rw-r--r-- | usr.bin/cvs/compress.c (renamed from usr.bin/cvs/zlib.c) | 4 | ||||
| -rw-r--r-- | usr.bin/cvs/compress.h (renamed from usr.bin/cvs/zlib.h) | 12 | ||||
| -rw-r--r-- | usr.bin/cvs/includes.h | 3 |
4 files changed, 17 insertions, 17 deletions
diff --git a/usr.bin/cvs/Makefile b/usr.bin/cvs/Makefile index ec09208b5c6..e5108024a89 100644 --- a/usr.bin/cvs/Makefile +++ b/usr.bin/cvs/Makefile @@ -1,14 +1,14 @@ -# $OpenBSD: Makefile,v 1.17 2005/12/10 20:27:45 joris Exp $ +# $OpenBSD: Makefile,v 1.18 2006/01/03 17:04:53 xsa Exp $ PROG= cvs MAN= cvs.1 cvsignore.5 cvsrc.5 cvswrappers.5 cvsintro.7 CPPFLAGS+=-I${.CURDIR} -SRCS= cvs.c add.c admin.c annotate.c buf.c checkout.c cmd.c commit.c date.y \ - diff.c diff3.c edit.c entries.c fatal.c file.c getlog.c history.c hist.c \ - import.c init.c log.c logmsg.c proto.c rcs.c rcsnum.c release.c \ - remove.c req.c resp.c root.c server.c status.c tag.c \ - update.c util.c version.c watch.c xmalloc.c +SRCS= cvs.c add.c admin.c annotate.c buf.c checkout.c cmd.c commit.c \ + compress.c date.y diff.c diff3.c edit.c entries.c fatal.c file.c \ + getlog.c history.c hist.c import.c init.c log.c logmsg.c proto.c \ + rcs.c rcsnum.c release.c remove.c req.c resp.c root.c server.c \ + status.c tag.c update.c util.c version.c watch.c xmalloc.c CFLAGS= -g -ggdb CFLAGS+= -Wall @@ -18,6 +18,9 @@ CFLAGS+= -Wshadow -Wpointer-arith -Wcast-qual CFLAGS+= -Wsign-compare YFLAGS= +DPADD+= ${LIBZ} +LDADD+= -lz + INSTALL_STRIP= .include <bsd.prog.mk> diff --git a/usr.bin/cvs/zlib.c b/usr.bin/cvs/compress.c index 4035abe76c4..aafa862c32b 100644 --- a/usr.bin/cvs/zlib.c +++ b/usr.bin/cvs/compress.c @@ -1,4 +1,4 @@ -/* $OpenBSD: zlib.c,v 1.6 2006/01/02 08:11:56 xsa Exp $ */ +/* $OpenBSD: compress.c,v 1.1 2006/01/03 17:04:53 xsa Exp $ */ /* * Copyright (c) 2005 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -28,7 +28,7 @@ #include "log.h" #include "cvs.h" -#include "zlib.h" +#include "compress.h" #define CVS_ZLIB_BUFSIZE 1024 diff --git a/usr.bin/cvs/zlib.h b/usr.bin/cvs/compress.h index 11536f9df40..cb55fc277b8 100644 --- a/usr.bin/cvs/zlib.h +++ b/usr.bin/cvs/compress.h @@ -1,4 +1,4 @@ -/* $OpenBSD: zlib.h,v 1.2 2005/07/25 11:32:20 xsa Exp $ */ +/* $OpenBSD: compress.h,v 1.1 2006/01/03 17:04:53 xsa Exp $ */ /* * Copyright (c) 2005 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -24,12 +24,8 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef CVSZLIB_H -#define CVSZLIB_H - -#include <sys/param.h> - -#include <zlib.h> +#ifndef COMPRESS_H +#define COMPRESS_H #include "buf.h" @@ -41,4 +37,4 @@ void cvs_zlib_free(CVSZCTX *); int cvs_zlib_deflate(CVSZCTX *, BUF *, u_char *, size_t); int cvs_zlib_inflate(CVSZCTX *, BUF *, u_char *, size_t); -#endif /* CVSZLIB_H */ +#endif /* COMPRESS_H */ diff --git a/usr.bin/cvs/includes.h b/usr.bin/cvs/includes.h index be972db6ce7..81f09185cf8 100644 --- a/usr.bin/cvs/includes.h +++ b/usr.bin/cvs/includes.h @@ -1,4 +1,4 @@ -/* $OpenBSD: includes.h,v 1.2 2006/01/02 17:06:10 xsa Exp $ */ +/* $OpenBSD: includes.h,v 1.3 2006/01/03 17:04:53 xsa Exp $ */ /* * Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org> * All rights reserved. @@ -55,5 +55,6 @@ #include <syslog.h> #include <time.h> #include <unistd.h> +#include <zlib.h> #endif /* INCLUDES_H */ |