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.
This commit is contained in:
Bruce Evans 1998-03-07 09:49:12 +00:00
parent 06c779979a
commit b5f50e3158
5 changed files with 24 additions and 35 deletions

View File

@ -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"

View File

@ -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>

View File

@ -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

View File

@ -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>

View File

@ -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