d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't use LDDESTDIR. Just put the -L arg in LDADD.

Browse Source
This commit is contained in:
Bruce Evans 1997-12-17 15:11:43 +00:00
parent e51d1e8707
commit f34b67af93
7 changed files with 31 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gnu/usr.bin/cvs/Makefile.inc
View File

@ -8,7 +8,6 @@ LIBDESTDIR= ${.OBJDIR}/../lib
LIBDESTDIR= ${.CURDIR}/../lib
.endif
LDDESTDIR= -L${LIBDESTDIR}
LIBCVS= ${LIBDESTDIR}/libcvs.a
.if exists(${.CURDIR}/../../Makefile.inc)

4
gnu/usr.bin/cvs/cvs/Makefile
View File

@ -1,4 +1,4 @@
# $Id: Makefile,v 1.17 1997/05/15 23:00:05 peter Exp $
# $Id: Makefile,v 1.18 1997/10/10 04:03:17 peter Exp $
.include "${.CURDIR}/../Makefile.inc"
@ -22,7 +22,7 @@ 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+= -lcvs -lgnuregex -lmd -lcrypt -lz
LDADD+= -L${LIBDESTDIR} -lcvs -lgnuregex -lmd -lcrypt -lz
.if exists(${DESTDIR}/usr/lib/libkrb.a) && defined(MAKE_KERBEROS4)
CFLAGS+=-DHAVE_KERBEROS -DHAVE_KRB_GET_ERR_TEXT

11
usr.sbin/cron/cron/Makefile
View File

@ -7,16 +7,15 @@ MAN8= cron.8
CFLAGS+=-DLOGIN_CAP
.if exists(${.OBJDIR}/../lib)
LDDESTDIR+= -L${.OBJDIR}/../lib
LDADD+= -L${.OBJDIR}/../lib
DPADD+= ${.OBJDIR}/../lib/libcron.a
.else
LDDESTDIR+= -L${.CURDIR}/../lib
LDADD+= -L${.CURDIR}/../lib
DPADD+= ${.CURDIR}/../lib/libcron.a
.endif
LDADD+= -lcron
LDADD+= -lcron
LDADD+= -lutil
DPADD+= ${LIBUTIL}
LDADD+= -lutil
DPADD+= ${LIBUTIL}
.include <bsd.prog.mk>

13
usr.sbin/cron/crontab/Makefile
View File

@ -2,24 +2,23 @@ BINDIR?= /usr/bin
PROG= crontab
SRCS= crontab.c
CFLAGS+= -I${.CURDIR}/../cron
CFLAGS+=-I${.CURDIR}/../cron
MAN1= crontab.1
MAN5= crontab.5
.if exists(${.OBJDIR}/../lib)
LDDESTDIR+= -L${.OBJDIR}/../lib
LDADD+= -L${.OBJDIR}/../lib
DPADD+= ${.OBJDIR}/../lib/libcron.a
.else
LDDESTDIR+= -L${.CURDIR}/../lib
LDADD+= -L${.CURDIR}/../lib
DPADD+= ${.CURDIR}/../lib/libcron.a
.endif
LDADD+= -lcron
LDADD+= -lutil
DPADD+= ${LIBUTIL}
LDADD+= -lutil
DPADD+= ${LIBUTIL}
BINOWN= root
BINOWN= root
BINMODE=4555
INSTALLFLAGS=-fschg

12
usr.sbin/mrouted/map-mbone/Makefile
View File

@ -1,18 +1,18 @@
# $Id$
# $Id: Makefile,v 1.5 1997/02/22 16:07:26 peter Exp $
PROG= map-mbone
S= ${.CURDIR}/..
.PATH: $S
CFLAGS+= -I$S
LDADD+= -lmrouted
.if exists(${.OBJDIR}/../common)
LDDESTDIR+= -L${.OBJDIR}/../common
DPADD+= ${.OBJDIR}/../common/libmrouted.a
LDADD+= -L${.OBJDIR}/../common
DPADD+= ${.OBJDIR}/../common/libmrouted.a
.else
LDDESTDIR+= -L$S/common
DPADD+= $S/common/libmrouted.a
LDADD+= -L$S/common
DPADD+= $S/common/libmrouted.a
.endif
LDADD+= -lmrouted
SRCS= mapper.c
MAN8= ${.CURDIR}/../map-mbone.8

12
usr.sbin/mrouted/mrinfo/Makefile
View File

@ -1,18 +1,18 @@
# $Id$
# $Id: Makefile,v 1.7 1997/02/22 16:07:29 peter Exp $
PROG= mrinfo
S= ${.CURDIR}/..
.PATH: $S
CFLAGS+= -I$S
LDADD+= -lmrouted
.if exists(${.OBJDIR}/../common)
LDDESTDIR+= -L${.OBJDIR}/../common
DPADD+= ${.OBJDIR}/../common/libmrouted.a
LDADD+= -L${.OBJDIR}/../common
DPADD+= ${.OBJDIR}/../common/libmrouted.a
.else
LDDESTDIR+= -L$S/common
DPADD+= $S/common/libmrouted.a
LDADD+= -L$S/common
DPADD+= $S/common/libmrouted.a
.endif
LDADD+= -lmrouted
SRCS= mrinfo.c
MAN8= ${.CURDIR}/../mrinfo.8

12
usr.sbin/mrouted/mrouted/Makefile
View File

@ -1,18 +1,18 @@
# $Id$
# $Id: Makefile,v 1.6 1997/02/22 16:07:34 peter Exp $
PROG= mrouted
S= ${.CURDIR}/..
.PATH: $S
CFLAGS+= -I$S
LDADD+= -lmrouted
.if exists(${.OBJDIR}/../common)
LDDESTDIR+= -L${.OBJDIR}/../common
DPADD+= ${.OBJDIR}/../common/libmrouted.a
LDADD+= -L${.OBJDIR}/../common
DPADD+= ${.OBJDIR}/../common/libmrouted.a
.else
LDDESTDIR+= -L$S/common
DPADD+= $S/common/libmrouted.a
LDADD+= -L$S/common
DPADD+= $S/common/libmrouted.a
.endif
LDADD+= -lmrouted
SRCS= config.c cfparse.y main.c route.c vif.c prune.c callout.c rsrr.c
CLEANFILES+= y.tab.h