diff options
| author | bde <bde@FreeBSD.org> | 1994-08-28 18:18:19 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1994-08-28 18:18:19 +0000 |
| commit | 52042be9920e69da55124767b39e354479499414 (patch) | |
| tree | 451d148bbfab4d6aee72e0115aca9f07cf05054a /gnu/usr.bin | |
| parent | 60115a8ba9b5a157713a79db0e9cc751ca1c3954 (diff) | |
| download | FreeBSD-src-52042be9920e69da55124767b39e354479499414.zip FreeBSD-src-52042be9920e69da55124767b39e354479499414.tar.gz | |
Add dependencies on libraries to DPADD.
Move another include of bsd.prog.mk to the end.
Diffstat (limited to 'gnu/usr.bin')
| -rw-r--r-- | gnu/usr.bin/cvs/cvs/Makefile | 11 | ||||
| -rw-r--r-- | gnu/usr.bin/cvs/mkmodules/Makefile | 11 |
2 files changed, 8 insertions, 14 deletions
diff --git a/gnu/usr.bin/cvs/cvs/Makefile b/gnu/usr.bin/cvs/cvs/Makefile index 6af8b81..d506fd1 100644 --- a/gnu/usr.bin/cvs/cvs/Makefile +++ b/gnu/usr.bin/cvs/cvs/Makefile @@ -7,12 +7,8 @@ PROG = ncvs CFLAGS += -I${.CURDIR}/../lib \ -DDIRENT -DSTDC_HEADERS -DPOSIX -DBROKEN_SIGISMEMBER \ -DFTIME_MISSING -DHAVE_TIMEZONE -DUTIME_NULL_MISSING - -.if exists(${.CURDIR}/../lib/obj) -LDADD= -L${.CURDIR}/../lib/obj -lcvs -.else -LDADD= -L${.CURDIR}/../lib/ -lcvs -.endif +DPADD+= ${LIBCVS} +LDADD+= -lcvs .if defined(FREEBSD_DEVELOPER) CFLAGS+= -DFREEBSD_DEVELOPER @@ -32,5 +28,6 @@ MAN5= cvs.5 check: @echo `pwd` ${.CURDIR} -.include <bsd.prog.mk> .include "../../Makefile.inc" +.include "../Makefile.inc" +.include <bsd.prog.mk> diff --git a/gnu/usr.bin/cvs/mkmodules/Makefile b/gnu/usr.bin/cvs/mkmodules/Makefile index bec0bd6..4a6ec7c 100644 --- a/gnu/usr.bin/cvs/mkmodules/Makefile +++ b/gnu/usr.bin/cvs/mkmodules/Makefile @@ -1,12 +1,9 @@ PROG = mkmodules SRCS = mkmodules.c CFLAGS += -I${.CURDIR}/../cvs -I${.CURDIR}/../lib +DPADD+= ${LIBCVS} +LDADD+= -lcvs -.if exists(${.CURDIR}/../lib/obj) -LDADD= -L${.CURDIR}/../lib/obj -lcvs -.else -LDADD= -L${.CURDIR}/../lib/ -lcvs -.endif - -.include <bsd.prog.mk> .include "../../Makefile.inc" +.include "../Makefile.inc" +.include <bsd.prog.mk> |
