mirror of
https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git
synced 2024-11-16 15:44:04 +01:00
sysinstall/Makefile:
Fixed DPADD again. mk/bsd.README Don't list the LIBXXX identifiers here. Describe them better. mk/bsd.prog.mk Updated the list of LIBXXX identifiers. - recently added library libdisk.a wasn't mentioned (required for sysinstall) - old objects kz*.o weren't mentioned - old libraries libc_pic.a, libcom_err.a, libf2c.a, libg++.a, libgcc_pic.a, libgmp.a, libipx.a, libkeycap.a, libss.a and libxpg4.a weren't mentioned - old libraries libgnumalloc.a and libftp.a no longer exist - old library libmp.a was said to not exist - deprecated links libfl.a and libln.a weren't mentioned
This commit is contained in:
Bruce Evans
parent
7041dd8c4b
commit
580ccec473
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=14701
@ -13,7 +13,7 @@ SRCS= anonFTP.c apache.c attr.c cdrom.c command.c config.c decode.c \
|
||||
|
||||
CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog
|
||||
|
||||
DPADD= ${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL}
|
||||
DPADD= ${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL} ${LIBDISK}
|
||||
LDADD= -ldialog -lncurses -lmytinfo -lutil -ldisk
|
||||
|
||||
makedevs.c: Makefile rtermcap
|
||||
|
||||
@ -205,39 +205,19 @@ DPADD Additional dependencies for the program. Usually used for
|
||||
|
||||
SRCLIB=${LIBCOMPAT} ${LIBUTIL}
|
||||
|
||||
The following libraries are predefined for DPADD:
|
||||
There is a predefined identifier for each (non-profiled,
|
||||
non-shared) library and object. Library file names are
|
||||
transformed to identifiers by removing the extension and
|
||||
converting to upper case.
|
||||
|
||||
LIBCRT0 /usr/lib/crt0.o (sic)
|
||||
LIBC /usr/lib/libc.a
|
||||
LIBCOMPAT /usr/lib/libcompat.a
|
||||
LIBCRYPT /usr/lib/libcrypt.a
|
||||
LIBCURSES /usr/lib/libcurses.a
|
||||
LIBDES /usr/lib/libdes.a
|
||||
LIBDIALOG /usr/lib/libdialog.a
|
||||
LIBEDIT /usr/lib/libedit.a
|
||||
LIBGCC /usr/lib/libgcc.a
|
||||
LIBGNUMALLOC /usr/lib/libgnumalloc.a
|
||||
LIBGNUREGEX /usr/lib/libgnuregex.a
|
||||
LIBKDB /usr/lib/libkdb.a
|
||||
LIBKRB /usr/lib/libkrb.a
|
||||
LIBKVM /usr/lib/libkvm.a
|
||||
LIBL /usr/lib/libl.a
|
||||
LIBM /usr/lib/libm.a
|
||||
LIBMD /usr/lib/libmd.a
|
||||
LIBMP /usr/lib/libmp.a
|
||||
LIBMYTINFO /usr/lib/libmytinfo.a
|
||||
LIBNCURSES /usr/lib/libncurses.a
|
||||
LIBPC /usr/lib/libpc.a
|
||||
LIBPLOT /usr/lib/libplot.a
|
||||
LIBREADLINE /usr/lib/libreadline.a
|
||||
LIBRESOLV /usr/lib/libresolv.a
|
||||
LIBRPCSVC /usr/lib/librpcsvc.a
|
||||
LIBSCRYPT /usr/lib/libscrypt.a
|
||||
LIBSKEY /usr/lib/libskey.a
|
||||
LIBTELNET /usr/lib/libtelnet.a
|
||||
LIBTERMCAP /usr/lib/libtermcap.a
|
||||
LIBUTIL /usr/lib/libutil.a
|
||||
LIBY /usr/lib/liby.a
|
||||
There are no special identifiers for profiled or shared
|
||||
libraries or objects. The identifiers for the standard
|
||||
libraries are used in DPADD. This works correctly iff all
|
||||
the libraries are built at the same time. Unfortunately,
|
||||
it causes unnecessary relinks to shared libraries when
|
||||
only the static libraries have changed. Dependencies on
|
||||
shared libraries should be only on the library version
|
||||
numbers.
|
||||
|
||||
STRIP The flag passed to the install program to cause the binary
|
||||
to be stripped.
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# from: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91
|
||||
# $Id: bsd.prog.mk,v 1.27 1995/10/02 20:01:53 wollman Exp $
|
||||
# $Id: bsd.prog.mk,v 1.28 1996/03/09 23:48:55 wosch Exp $
|
||||
|
||||
.if exists(${.CURDIR}/../Makefile.inc)
|
||||
.include "${.CURDIR}/../Makefile.inc"
|
||||
@ -22,25 +22,37 @@ BINOWN?= bin
|
||||
BINMODE?= 555
|
||||
|
||||
LIBCRT0?= ${DESTDIR}/usr/lib/crt0.o
|
||||
LIBKZHEAD?= ${DESTDIR}/usr/lib/kzhead.o
|
||||
LIBKZTAIL?= ${DESTDIR}/usr/lib/kztail.o
|
||||
|
||||
LIBC?= ${DESTDIR}/usr/lib/libc.a
|
||||
LIBC_PIC= ${DESTDIR}/usr/lib/libc_pic.a
|
||||
LIBCOM_ERR= ${DESTDIR}/usr/lib/libcom_err.a
|
||||
LIBCOMPAT?= ${DESTDIR}/usr/lib/libcompat.a
|
||||
LIBCRYPT?= ${DESTDIR}/usr/lib/libcrypt.a
|
||||
LIBCURSES?= ${DESTDIR}/usr/lib/libcurses.a
|
||||
LIBDES?= ${DESTDIR}/usr/lib/libdes.a # XXX doesn't exist
|
||||
LIBDIALOG?= ${DESTDIR}/usr/lib/libdialog.a
|
||||
LIBDISK?= ${DESTDIR}/usr/lib/libdisk.a
|
||||
LIBEDIT?= ${DESTDIR}/usr/lib/libedit.a
|
||||
LIBF2C?= ${DESTDIR}/usr/lib/libf2c.a
|
||||
LIBFL?= "don't use LIBFL, use LIBL"
|
||||
LIBFORMS?= ${DESTDIR}/usr/lib/libforms.a
|
||||
LIBFTP?= ${DESTDIR}/usr/lib/libftp.a
|
||||
LIBGPLUSPLUS?= ${DESTDIR}/usr/lib/libg++.a
|
||||
LIBGCC?= ${DESTDIR}/usr/lib/libgcc.a
|
||||
LIBGNUMALLOC?= ${DESTDIR}/usr/lib/libgnumalloc.a
|
||||
LIBGCC_PIC?= ${DESTDIR}/usr/lib/libgcc_pic.a
|
||||
LIBGMP?= ${DESTDIR}/usr/lib/libgmp.a
|
||||
LIBGNUREGEX?= ${DESTDIR}/usr/lib/libgnuregex.a
|
||||
LIBIPX?= ${DESTDIR}/usr/lib/libipx.a
|
||||
LIBKDB?= ${DESTDIR}/usr/lib/libkdb.a # XXX doesn't exist
|
||||
LIBKRB?= ${DESTDIR}/usr/lib/libkrb.a # XXX doesn't exist
|
||||
LIBKEYCAP?= ${DESTDIR}/usr/lib/libkeycap.a
|
||||
LIBKVM?= ${DESTDIR}/usr/lib/libkvm.a
|
||||
LIBL?= ${DESTDIR}/usr/lib/libl.a
|
||||
LIBLN?= "don't use, LIBLN, use LIBL"
|
||||
LIBM?= ${DESTDIR}/usr/lib/libm.a
|
||||
LIBMD?= ${DESTDIR}/usr/lib/libmd.a
|
||||
LIBMP?= ${DESTDIR}/usr/lib/libmp.a # XXX doesn't exist
|
||||
LIBMP?= ${DESTDIR}/usr/lib/libmp.a
|
||||
LIBMYTINFO?= ${DESTDIR}/usr/lib/libmytinfo.a
|
||||
LIBNCURSES?= ${DESTDIR}/usr/lib/libncurses.a
|
||||
LIBPC?= ${DESTDIR}/usr/lib/libpc.a # XXX doesn't exist
|
||||
@ -49,12 +61,15 @@ LIBPLOT?= ${DESTDIR}/usr/lib/libplot.a # XXX doesn't exist
|
||||
LIBREADLINE?= ${DESTDIR}/usr/lib/libreadline.a
|
||||
LIBRESOLV?= ${DESTDIR}/usr/lib/libresolv.a
|
||||
LIBRPCSVC?= ${DESTDIR}/usr/lib/librpcsvc.a
|
||||
LIBSCRYPT?= ${DESTDIR}/usr/lib/libscrypt.a # XXX don't use, use LIBCRYPT
|
||||
LIBSCRYPT?= "don't use LIBSCRYPT, use LIBCRYPT"
|
||||
LIBSCSI?= ${DESTDIR}/usr/lib/libscsi.a
|
||||
LIBSKEY?= ${DESTDIR}/usr/lib/libskey.a
|
||||
LIBSS?= ${DESTDIR}/usr/lib/libss.a
|
||||
LIBTELNET?= ${DESTDIR}/usr/lib/libtelnet.a
|
||||
LIBTERMCAP?= ${DESTDIR}/usr/lib/libtermcap.a
|
||||
LIBTERMLIB?= "don't use LIBTERMLIB, use LIBTERMCAP"
|
||||
LIBUTIL?= ${DESTDIR}/usr/lib/libutil.a
|
||||
LIBXPG4?= ${DESTDIR}/usr/lib/libxpg4.a
|
||||
LIBY?= ${DESTDIR}/usr/lib/liby.a
|
||||
|
||||
.if defined(NOSHARED)
|
||||
|
||||
@ -13,7 +13,7 @@ SRCS= anonFTP.c apache.c attr.c cdrom.c command.c config.c decode.c \
|
||||
|
||||
CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog
|
||||
|
||||
DPADD= ${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL}
|
||||
DPADD= ${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL} ${LIBDISK}
|
||||
LDADD= -ldialog -lncurses -lmytinfo -lutil -ldisk
|
||||
|
||||
makedevs.c: Makefile rtermcap
|
||||
|
||||
@ -13,7 +13,7 @@ SRCS= anonFTP.c apache.c attr.c cdrom.c command.c config.c decode.c \
|
||||
|
||||
CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog
|
||||
|
||||
DPADD= ${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL}
|
||||
DPADD= ${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL} ${LIBDISK}
|
||||
LDADD= -ldialog -lncurses -lmytinfo -lutil -ldisk
|
||||
|
||||
makedevs.c: Makefile rtermcap
|
||||
|
||||
Loading…
Reference in New Issue
Block a user