Fixed dependencies on libraries which I broke in rev.1.39 of
bsd.prog.mk and didn't actually fix in rev.1.43 of bsd.lib.mk. The library names must be defined before they are used in dependencies.
This commit is contained in:
parent
9299d3c4bb
commit
1a5ed802d2
@ -1,5 +1,5 @@
|
||||
# from: @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91
|
||||
# $Id: bsd.lib.mk,v 1.44 1996/09/18 06:09:14 swallace Exp $
|
||||
# $Id: bsd.lib.mk,v 1.45 1996/09/19 07:01:45 peter Exp $
|
||||
#
|
||||
|
||||
.if exists(${.CURDIR}/../Makefile.inc)
|
||||
@ -24,6 +24,8 @@ CFLAGS+= ${DEBUG_FLAGS}
|
||||
STRIP?= -s
|
||||
.endif
|
||||
|
||||
.include <bsd.libnames.mk>
|
||||
|
||||
.MAIN: all
|
||||
|
||||
# prefer .s to a .c, add .po, remove stuff not used in the BSD libraries
|
||||
@ -261,5 +263,4 @@ all-man:
|
||||
.endif
|
||||
|
||||
.include <bsd.dep.mk>
|
||||
.include <bsd.libnames.mk>
|
||||
.include <bsd.obj.mk>
|
||||
|
@ -1,5 +1,5 @@
|
||||
# from: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91
|
||||
# $Id: bsd.prog.mk,v 1.39 1996/09/05 18:05:08 bde Exp $
|
||||
# $Id: bsd.prog.mk,v 1.40 1996/09/18 06:09:19 swallace Exp $
|
||||
|
||||
.if exists(${.CURDIR}/../Makefile.inc)
|
||||
.include "${.CURDIR}/../Makefile.inc"
|
||||
@ -25,6 +25,8 @@ LDFLAGS+= -static
|
||||
LDDESTDIR+= -L${DESTDIR}/usr/lib
|
||||
.endif
|
||||
|
||||
.include <bsd.libnames.mk>
|
||||
|
||||
.if defined(PROG)
|
||||
.if defined(SRCS)
|
||||
|
||||
@ -155,5 +157,4 @@ all-man:
|
||||
.endif
|
||||
|
||||
.include <bsd.dep.mk>
|
||||
.include <bsd.libnames.mk>
|
||||
.include <bsd.obj.mk>
|
||||
|
Loading…
Reference in New Issue
Block a user