diff options
author | peter <peter@FreeBSD.org> | 1998-01-26 04:21:52 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 1998-01-26 04:21:52 +0000 |
commit | 8520bf47b3bb1c599a3f6b850217c4ad5f85dfb1 (patch) | |
tree | 7dfc12d7f5ff3a7f2fdd6f3755c6d3dadc1d70bb | |
parent | 32b0e7a8bd59395750af40c2d0f6e3e4fe49fd6f (diff) | |
download | FreeBSD-src-8520bf47b3bb1c599a3f6b850217c4ad5f85dfb1.zip FreeBSD-src-8520bf47b3bb1c599a3f6b850217c4ad5f85dfb1.tar.gz |
Add libdiff
-rw-r--r-- | gnu/usr.bin/cvs/Makefile | 4 | ||||
-rw-r--r-- | gnu/usr.bin/cvs/Makefile.inc | 14 | ||||
-rw-r--r-- | gnu/usr.bin/cvs/cvs/Makefile | 6 |
3 files changed, 16 insertions, 8 deletions
diff --git a/gnu/usr.bin/cvs/Makefile b/gnu/usr.bin/cvs/Makefile index 70ba49f..4602139 100644 --- a/gnu/usr.bin/cvs/Makefile +++ b/gnu/usr.bin/cvs/Makefile @@ -1,5 +1,5 @@ -# $Id$ +# $Id: Makefile,v 1.10 1997/02/22 15:45:10 peter Exp $ -SUBDIR = lib cvs contrib cvsbug doc tools +SUBDIR = lib libdiff cvs contrib cvsbug doc tools .include <bsd.subdir.mk> diff --git a/gnu/usr.bin/cvs/Makefile.inc b/gnu/usr.bin/cvs/Makefile.inc index e8a0c54..e1889d6 100644 --- a/gnu/usr.bin/cvs/Makefile.inc +++ b/gnu/usr.bin/cvs/Makefile.inc @@ -3,12 +3,20 @@ CVSDIR= $(.CURDIR)/../../../../contrib/cvs .if exists(${.OBJDIR}/../lib) -LIBDESTDIR= ${.OBJDIR}/../lib +LIBCVSDIR= ${.OBJDIR}/../lib .else -LIBDESTDIR= ${.CURDIR}/../lib +LIBCVSDIR= ${.CURDIR}/../lib .endif -LIBCVS= ${LIBDESTDIR}/libcvs.a +LIBCVS= ${LIBCVSDIR}/libcvs.a + +.if exists(${.OBJDIR}/../libdiff) +LIBDIFFDIR= ${.OBJDIR}/../libdiff +.else +LIBDIFFDIR= ${.CURDIR}/../libdiff +.endif + +LIBDIFF= ${LIBDIFFDIR}/libdiff.a .if exists(${.CURDIR}/../../Makefile.inc) .include "${.CURDIR}/../../Makefile.inc" diff --git a/gnu/usr.bin/cvs/cvs/Makefile b/gnu/usr.bin/cvs/cvs/Makefile index 4ec4847..f752a68 100644 --- a/gnu/usr.bin/cvs/cvs/Makefile +++ b/gnu/usr.bin/cvs/cvs/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.18 1997/10/10 04:03:17 peter Exp $ +# $Id: Makefile,v 1.19 1997/12/17 15:11:41 bde Exp $ .include "${.CURDIR}/../Makefile.inc" @@ -21,8 +21,8 @@ SRCS= add.c admin.c buffer.c checkin.c checkout.c classify.c client.c \ CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../lib -I${CVSDIR}/src -I${CVSDIR}/lib -DHAVE_CONFIG_H -DPADD+= ${LIBCVS} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ} -LDADD+= -L${LIBDESTDIR} -lcvs -lgnuregex -lmd -lcrypt -lz +DPADD+= ${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ} +LDADD+= ${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz .if exists(${DESTDIR}/usr/lib/libkrb.a) && defined(MAKE_KERBEROS4) CFLAGS+=-DHAVE_KERBEROS -DHAVE_KRB_GET_ERR_TEXT |