diff options
author | jkh <jkh@FreeBSD.org> | 1996-06-24 04:26:21 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 1996-06-24 04:26:21 +0000 |
commit | 8eb37231d4405088a481324c2ec41ac851e8d8f7 (patch) | |
tree | dc80da53186aab7c56424c2574b0cd7928930721 /usr.sbin/mrouted | |
parent | 3acbd3cce674dab9a0afdee1f6e50196f4585ffa (diff) | |
download | FreeBSD-src-8eb37231d4405088a481324c2ec41ac851e8d8f7.zip FreeBSD-src-8eb37231d4405088a481324c2ec41ac851e8d8f7.tar.gz |
Bring in my changes for removing the pestilent obj links (unless you
really want them) from /usr/src. This is the final version of the
patches, incorporating the feedback I've received from -current.
Diffstat (limited to 'usr.sbin/mrouted')
-rw-r--r-- | usr.sbin/mrouted/map-mbone/Makefile | 8 | ||||
-rw-r--r-- | usr.sbin/mrouted/mrinfo/Makefile | 8 | ||||
-rw-r--r-- | usr.sbin/mrouted/mrouted/Makefile | 8 | ||||
-rw-r--r-- | usr.sbin/mrouted/mtrace/Makefile | 8 |
4 files changed, 16 insertions, 16 deletions
diff --git a/usr.sbin/mrouted/map-mbone/Makefile b/usr.sbin/mrouted/map-mbone/Makefile index b707344..2110b32 100644 --- a/usr.sbin/mrouted/map-mbone/Makefile +++ b/usr.sbin/mrouted/map-mbone/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 1994/09/08 02:51:33 wollman Exp $ +# $Id: Makefile,v 1.2 1995/03/31 21:16:56 wollman Exp $ PROG= map-mbone @@ -6,9 +6,9 @@ S= ${.CURDIR}/.. .PATH: $S CFLAGS+= -I$S LDADD+= -lmrouted -.if exists($S/common/obj) -LDDESTDIR+= -L$S/common/obj -DPADD+= $S/common/obj/libmrouted.a +.if exists(${.OBJDIR}/../common) +LDDESTDIR+= -L${.OBJDIR}/../common +DPADD+= ${.OBJDIR}/../common/libmrouted.a .else LDDESTDIR+= -L$S/common DPADD+= $S/common/libmrouted.a diff --git a/usr.sbin/mrouted/mrinfo/Makefile b/usr.sbin/mrouted/mrinfo/Makefile index fdf83fc..34d51cd 100644 --- a/usr.sbin/mrouted/mrinfo/Makefile +++ b/usr.sbin/mrouted/mrinfo/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.3 1995/06/21 18:30:10 wollman Exp $ +# $Id: Makefile,v 1.4 1996/05/20 16:42:30 pst Exp $ PROG= mrinfo @@ -6,9 +6,9 @@ S= ${.CURDIR}/.. .PATH: $S CFLAGS+= -I$S LDADD+= -lmrouted -.if exists($S/common/obj) -LDDESTDIR+= -L$S/common/obj -DPADD+= $S/common/obj/libmrouted.a +.if exists(${.OBJDIR}/../common) +LDDESTDIR+= -L${.OBJDIR}/../common +DPADD+= ${.OBJDIR}/../common/libmrouted.a .else LDDESTDIR+= -L$S/common DPADD+= $S/common/libmrouted.a diff --git a/usr.sbin/mrouted/mrouted/Makefile b/usr.sbin/mrouted/mrouted/Makefile index dca5762..1c5dcc5 100644 --- a/usr.sbin/mrouted/mrouted/Makefile +++ b/usr.sbin/mrouted/mrouted/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 1995/06/13 18:05:16 wollman Exp $ +# $Id: Makefile,v 1.3 1995/07/08 22:36:06 ats Exp $ PROG= mrouted @@ -6,9 +6,9 @@ S= ${.CURDIR}/.. .PATH: $S CFLAGS+= -I$S LDADD+= -lmrouted -.if exists($S/common/obj) -LDDESTDIR+= -L$S/common/obj -DPADD+= $S/common/obj/libmrouted.a +.if exists(${.OBJDIR}/../common) +LDDESTDIR+= -L${.OBJDIR}/../common +DPADD+= ${.OBJDIR}/../common/libmrouted.a .else LDDESTDIR+= -L$S/common DPADD+= $S/common/libmrouted.a diff --git a/usr.sbin/mrouted/mtrace/Makefile b/usr.sbin/mrouted/mtrace/Makefile index 0d17ec0..6e79dea 100644 --- a/usr.sbin/mrouted/mtrace/Makefile +++ b/usr.sbin/mrouted/mtrace/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 1995/06/21 18:30:16 wollman Exp $ +# $Id: Makefile,v 1.3 1996/05/20 16:42:32 pst Exp $ PROG= mtrace @@ -6,9 +6,9 @@ S= ${.CURDIR}/.. .PATH: $S CFLAGS+= -I$S LDADD+= -lmrouted -.if exists($S/common/obj) -LDDESTDIR+= -L$S/common/obj -DPADD+= $S/common/obj/libmrouted.a +.if exists(${.OBJDIR}/../common) +LDDESTDIR+= -L${.OBJDIR}/../common +DPADD+= ${.OBJDIR}/../common/libmrouted.a .else LDDESTDIR+= -L$S/common DPADD+= $S/common/libmrouted.a |