summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>1998-03-07 09:49:12 +0000
committerbde <bde@FreeBSD.org>1998-03-07 09:49:12 +0000
commitd3607b7ed922720a17174f18b989376a78a77a91 (patch)
tree1c24c45597a7d232df365c6114ec3143df8458d4 /usr.sbin
parent2f15ee67243320d906c911e1d8c24806b7bc4ed2 (diff)
downloadFreeBSD-src-d3607b7ed922720a17174f18b989376a78a77a91.zip
FreeBSD-src-d3607b7ed922720a17174f18b989376a78a77a91.tar.gz
Use `foo/bar.a' instead of `-Lfoo -lbar' for linking to static internal
libraries so that `ld -f' in can create correct dependencies for yet-to-be-built libraries. Get the default BINDIR correctly (by including ../Makefile.inc recursively. Override the default it it is wrong. Don't override defaults when the defaults are correct. Don't give absolute paths to man page sources.
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/mrouted/Makefile.inc11
-rw-r--r--usr.sbin/mrouted/map-mbone/Makefile14
-rw-r--r--usr.sbin/mrouted/mrinfo/Makefile15
-rw-r--r--usr.sbin/mrouted/mrouted/Makefile14
-rw-r--r--usr.sbin/mrouted/mtrace/Makefile5
5 files changed, 24 insertions, 35 deletions
diff --git a/usr.sbin/mrouted/Makefile.inc b/usr.sbin/mrouted/Makefile.inc
index dd437b1..46ce8d7 100644
--- a/usr.sbin/mrouted/Makefile.inc
+++ b/usr.sbin/mrouted/Makefile.inc
@@ -1,2 +1,11 @@
-.include "${.CURDIR}/../../Makefile.inc"
+# $Id$
+
CFLAGS+= -DRSRR
+
+.if exists(${.OBJDIR}/../common)
+LIBMROUTED= ${.OBJDIR}/../common/libmrouted.a
+.else
+LIBMROUTED= ${.CURDIR}/../common/libmrouted.a
+.endif
+
+.include "../Makefile.inc"
diff --git a/usr.sbin/mrouted/map-mbone/Makefile b/usr.sbin/mrouted/map-mbone/Makefile
index 2d7bf2f..862ad29 100644
--- a/usr.sbin/mrouted/map-mbone/Makefile
+++ b/usr.sbin/mrouted/map-mbone/Makefile
@@ -1,20 +1,14 @@
-# $Id: Makefile,v 1.5 1997/02/22 16:07:26 peter Exp $
+# $Id: Makefile,v 1.6 1997/12/17 15:11:42 bde Exp $
PROG= map-mbone
S= ${.CURDIR}/..
.PATH: $S
CFLAGS+= -I$S
-.if exists(${.OBJDIR}/../common)
-LDADD+= -L${.OBJDIR}/../common
-DPADD+= ${.OBJDIR}/../common/libmrouted.a
-.else
-LDADD+= -L$S/common
-DPADD+= $S/common/libmrouted.a
-.endif
-LDADD+= -lmrouted
+DPADD= ${LIBMROUTED}
+LDADD= ${LIBMROUTED}
SRCS= mapper.c
-MAN8= ${.CURDIR}/../map-mbone.8
+MAN8= map-mbone.8
.include <bsd.prog.mk>
diff --git a/usr.sbin/mrouted/mrinfo/Makefile b/usr.sbin/mrouted/mrinfo/Makefile
index 606a9fd..0c4d3fc 100644
--- a/usr.sbin/mrouted/mrinfo/Makefile
+++ b/usr.sbin/mrouted/mrinfo/Makefile
@@ -1,21 +1,14 @@
-# $Id: Makefile,v 1.7 1997/02/22 16:07:29 peter Exp $
+# $Id: Makefile,v 1.8 1997/12/17 15:11:43 bde Exp $
PROG= mrinfo
S= ${.CURDIR}/..
.PATH: $S
CFLAGS+= -I$S
-.if exists(${.OBJDIR}/../common)
-LDADD+= -L${.OBJDIR}/../common
-DPADD+= ${.OBJDIR}/../common/libmrouted.a
-.else
-LDADD+= -L$S/common
-DPADD+= $S/common/libmrouted.a
-.endif
-LDADD+= -lmrouted
+DPADD= ${LIBMROUTED}
+LDADD= ${LIBMROUTED}
-SRCS= mrinfo.c
-MAN8= ${.CURDIR}/../mrinfo.8
+MAN8= mrinfo.8
BINOWN= root
BINMODE=4555
diff --git a/usr.sbin/mrouted/mrouted/Makefile b/usr.sbin/mrouted/mrouted/Makefile
index eb310f7..ad3bf3e 100644
--- a/usr.sbin/mrouted/mrouted/Makefile
+++ b/usr.sbin/mrouted/mrouted/Makefile
@@ -1,21 +1,15 @@
-# $Id: Makefile,v 1.6 1997/02/22 16:07:34 peter Exp $
+# $Id: Makefile,v 1.7 1997/12/17 15:11:43 bde Exp $
PROG= mrouted
S= ${.CURDIR}/..
.PATH: $S
CFLAGS+= -I$S
-.if exists(${.OBJDIR}/../common)
-LDADD+= -L${.OBJDIR}/../common
-DPADD+= ${.OBJDIR}/../common/libmrouted.a
-.else
-LDADD+= -L$S/common
-DPADD+= $S/common/libmrouted.a
-.endif
-LDADD+= -lmrouted
+DPADD= ${LIBMROUTED}
+LDADD= ${LIBMROUTED}
SRCS= config.c cfparse.y main.c route.c vif.c prune.c callout.c rsrr.c
CLEANFILES+= y.tab.h
-MAN8= ${.CURDIR}/../mrouted.8
+MAN8= mrouted.8
.include <bsd.prog.mk>
diff --git a/usr.sbin/mrouted/mtrace/Makefile b/usr.sbin/mrouted/mtrace/Makefile
index 1927f0d..c1eae50 100644
--- a/usr.sbin/mrouted/mtrace/Makefile
+++ b/usr.sbin/mrouted/mtrace/Makefile
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: Makefile,v 1.7 1997/02/22 16:07:39 peter Exp $
PROG= mtrace
@@ -6,8 +6,7 @@ S= ${.CURDIR}/..
.PATH: $S
CFLAGS+= -I$S
-SRCS= mtrace.c
-MAN8= ${.CURDIR}/../mtrace.8
+MAN8= mtrace.8
BINOWN= root
BINMODE=4555
OpenPOWER on IntegriCloud