fix list of libraries to reflect reality.

This commit is contained in:
christos 2011-10-16 01:14:33 +00:00
parent 81d02375cb
commit c4fb05f751
2 changed files with 218 additions and 36 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.README,v 1.287 2011/10/05 12:34:04 apb Exp $
# $NetBSD: bsd.README,v 1.288 2011/10/16 01:14:33 christos Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@ -1386,38 +1386,48 @@ DPADD Additional dependencies for the program. Usually used for
DPADD+=${LIBCOMPAT} ${LIBUTIL}
The following libraries are predefined for DPADD:
The following system libraries are predefined for DPADD:
LIBCRT0?= ${DESTDIR}/usr/lib/crt0.o
LIBARCHIVE?= ${DESTDIR}/usr/lib/libarchive.a
LIBASN1?= ${DESTDIR}/usr/lib/libasn1.a
LIBATF_C?= ${DESTDIR}/usr/lib/libatf-c.a
LIBATF_CXX?= ${DESTDIR}/usr/lib/libatf-c++.a
LIBBIND9?= ${DESTDIR}/usr/lib/libbind9.a
LIBBLUETOOTH?= ${DESTDIR}/usr/lib/libbluetooth.a
LIBBSDMALLOC?= ${DESTDIR}/usr/lib/libbsdmalloc.a
LIBBZ2?= ${DESTDIR}/usr/lib/libbz2.a
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
LIBCOM_ERR?= ${DESTDIR}/usr/lib/libcom_err.a
LIBCRT0?= ${DESTDIR}/usr/lib/crt0.o
LIBCRYPT?= ${DESTDIR}/usr/lib/libcrypt.a
LIBCRYPTO?= ${DESTDIR}/usr/lib/libcrypto.a
LIBCRYPTO_IDEA?=${DESTDIR}/usr/lib/libcrypto_idea.a
LIBCRYPTO_MDC2?=${DESTDIR}/usr/lib/libcrypto_mdc2.a
LIBCRYPTO_RC5?= ${DESTDIR}/usr/lib/libcrypto_rc5.a
LIBCURSES?= ${DESTDIR}/usr/lib/libcurses.a
LIBC_PIC?= ${DESTDIR}/usr/lib/libc_pic.a
LIBDBM?= ${DESTDIR}/usr/lib/libdbm.a
LIBDES?= ${DESTDIR}/usr/lib/libdes.a
LIBDNS?= ${DESTDIR}/usr/lib/libdns.a
LIBEDIT?= ${DESTDIR}/usr/lib/libedit.a
LIBEVENT?= ${DESTDIR}/usr/lib/libevent.a
LIBFETCH?= ${DESTDIR}/usr/lib/libfetch.a
LIBFORM?= ${DESTDIR}/usr/lib/libform.a
LIBFL?= ${DESTDIR}/usr/lib/libfl.a
LIBG2C?= ${DESTDIR}/usr/lib/libg2c.a
LIBGCC?= ${DESTDIR}/usr/lib/libgcc.a
LIBGNUMALLOC?= ${DESTDIR}/usr/lib/libgnumalloc.a
LIBGSSAPI?= ${DESTDIR}/usr/lib/libgssapi.a
LIBHDB?= ${DESTDIR}/usr/lib/libhdb.a
LIBHEIMBASE?= ${DESTDIR}/usr/lib/libheimbase.a
LIBHEIMNTLM?= ${DESTDIR}/usr/lib/libheimntlm.a
LIBHX500?= ${DESTDIR}/usr/lib/libhx500.a
LIBINTL?= ${DESTDIR}/usr/lib/libintl.a
LIBIPSEC?= ${DESTDIR}/usr/lib/libipsec.a
LIBISC?= ${DESTDIR}/usr/lib/libisc.a
LIBISCCC?= ${DESTDIR}/usr/lib/libisccc.a
LIBISCFG?= ${DESTDIR}/usr/lib/libiscfg.a
LIBKADM5CLNT?= ${DESTDIR}/usr/lib/libkadm5clnt.a
LIBKADM5SRV?= ${DESTDIR}/usr/lib/libkadm5srv.a
LIBKAFS?= ${DESTDIR}/usr/lib/libkafs.a
@ -1428,7 +1438,9 @@ DPADD Additional dependencies for the program. Usually used for
LIBLDAP?= ${DESTDIR}/usr/lib/libldap.a
LIBLDAP_R?= ${DESTDIR}/usr/lib/libldap_r.a
LIBLUA?= ${DESTDIR}/usr/lib/liblua.a
LIBLWRES?= ${DESTDIR}/usr/lib/liblwres.a
LIBM?= ${DESTDIR}/usr/lib/libm.a
LIBMAGIC?= ${DESTDIR}/usr/lib/libmagic.a
LIBMENU?= ${DESTDIR}/usr/lib/libmenu.a
LIBOBJC?= ${DESTDIR}/usr/lib/libobjc.a
LIBOSSAUDIO?= ${DESTDIR}/usr/lib/libossaudio.a
@ -1437,17 +1449,35 @@ DPADD Additional dependencies for the program. Usually used for
LIBPCI?= ${DESTDIR}/usr/lib/libpci.a
LIBPMC?= ${DESTDIR}/usr/lib/libpmc.a
LIBPOSIX?= ${DESTDIR}/usr/lib/libposix.a
LIBQUOTA?= ${DESTDIR}/usr/lib/libquota.a
LIBPTHREAD?= ${DESTDIR}/usr/lib/libpthread.a
LIBPTHREAD_DBG?=${DESTDIR}/usr/lib/libpthread_dbg.a
LIBPUFFS?= ${DESTDIR}/usr/lib/libpuffs.a
LIBQUOTA?= ${DESTDIR}/usr/lib/libquota.a
LIBRADIUS?= ${DESTDIR}/usr/lib/libradius.a
LIBRESOLV?= ${DESTDIR}/usr/lib/libresolv.a
LIBRMT?= ${DESTDIR}/usr/lib/librmt.a
LIBROKEN?= ${DESTDIR}/usr/lib/libroken.a
LIBRPCSVC?= ${DESTDIR}/usr/lib/librpcsvc.a
LIBRT?= ${DESTDIR}/usr/lib/librt.a
LIBRUMP?= ${DESTDIR}/usr/lib/librump.a
LIBRUMFS_CD9660FS?=${DESTDIR}/usr/lib/librumpfs_cd9660fs.a
LIBRUMFS_EFS?= ${DESTDIR}/usr/lib/librumpfs_efs.a
LIBRUMFS_EXT2FS?=${DESTDIR}/usr/lib/librumpfs_ext2fs.a
LIBRUMFS_FFS?= ${DESTDIR}/usr/lib/librumpfs_ffs.a
LIBRUMFS_HFS?= ${DESTDIR}/usr/lib/librumpfs_hfs.a
LIBRUMFS_LFS?= ${DESTDIR}/usr/lib/librumpfs_lfs.a
LIBRUMFS_MSDOSFS?=${DESTDIR}/usr/lib/librumpfs_msdosfs.a
LIBRUMFS_NFS?= ${DESTDIR}/usr/lib/librumpfs_nfs.a
LIBRUMFS_NTFS?= ${DESTDIR}/usr/lib/librumpfs_ntfs.a
LIBRUMFS_SYSPUFFS?=${DESTDIR}/usr/lib/librumpfs_syspuffs.a
LIBRUMFS_TMPFS?=${DESTDIR}/usr/lib/librumpfs_tmpfs.a
LIBRUMFS_UDF?= ${DESTDIR}/usr/lib/librumpfs_udf.a
LIBRUMFS_UFS?= ${DESTDIR}/usr/lib/librumpfs_ufs.a
LIBRUMPUSER?= ${DESTDIR}/usr/lib/librumpuser.a
LIBSASLC?= ${DESTDIR}/usr/lib/libsaslc.a
LIBSKEY?= ${DESTDIR}/usr/lib/libskey.a
LIBSL?= ${DESTDIR}/usr/lib/libsl.a
LIBSQLITE3?= ${DESTDIR}/usr/lib/libsqlite3.a
LIBSS?= ${DESTDIR}/usr/lib/libss.a
LIBSSH?= ${DESTDIR}/usr/lib/libssh.a
LIBSSL?= ${DESTDIR}/usr/lib/libssl.a
@ -1457,10 +1487,50 @@ DPADD Additional dependencies for the program. Usually used for
LIBTERMINFO?= ${DESTDIR}/usr/lib/libterminfo.a
LIBUSBHID?= ${DESTDIR}/usr/lib/libusbhid.a
LIBUTIL?= ${DESTDIR}/usr/lib/libutil.a
LIBWIND?= ${DESTDIR}/usr/lib/libwind.a
LIBWRAP?= ${DESTDIR}/usr/lib/libwrap.a
LIBY?= ${DESTDIR}/usr/lib/liby.a
LIBZ?= ${DESTDIR}/usr/lib/libz.a
The following X-Windows libraries are predefined for DPADD:
LIBFS?= ${DESTDIR}/usr/X11R7/lib/libFS.a
LIBGL?= ${DESTDIR}/usr/X11R7/lib/libGL.a
LIBGLU?= ${DESTDIR}/usr/X11R7/lib/libGLU.a
LIBICE?= ${DESTDIR}/usr/X11R7/lib/libICE.a
LIBSM?= ${DESTDIR}/usr/X11R7/lib/libSM.a
LIBX11?= ${DESTDIR}/usr/X11R7/lib/libX11.a
LIBXTRAP?= ${DESTDIR}/usr/X11R7/lib/libXTrap.a
LIBXAU?= ${DESTDIR}/usr/X11R7/lib/libXau.a
LIBXAW?= ${DESTDIR}/usr/X11R7/lib/libXaw.a
LIBXDMCP?= ${DESTDIR}/usr/X11R7/lib/libXdmcp.a
LIBXEXT?= ${DESTDIR}/usr/X11R7/lib/libXext.a
LIBXFONT?= ${DESTDIR}/usr/X11R7/lib/libXfont.a
LIBXFT?= ${DESTDIR}/usr/X11R7/lib/libXft.a
LIBXI?= ${DESTDIR}/usr/X11R7/lib/libXi.a
LIBXINERAMA?= ${DESTDIR}/usr/X11R7/lib/libXinerama.a
LIBXMU?= ${DESTDIR}/usr/X11R7/lib/libXmu.a
LIBXMUU?= ${DESTDIR}/usr/X11R7/lib/libXmuu.a
LIBXPM?= ${DESTDIR}/usr/X11R7/lib/libXpm.a
LIBXRANDR?= ${DESTDIR}/usr/X11R7/lib/libXrandr.a
LIBXRENDER?= ${DESTDIR}/usr/X11R7/lib/libXrender.a
LIBXSS?= ${DESTDIR}/usr/X11R7/lib/libXss.a
LIBXT?= ${DESTDIR}/usr/X11R7/lib/libXt.a
LIBXTST?= ${DESTDIR}/usr/X11R7/lib/libXtst.a
LIBXV?= ${DESTDIR}/usr/X11R7/lib/libXv.a
LIBXXF86DGA?= ${DESTDIR}/usr/X11R7/lib/libXxf86dga.a
LIBXXF86MISC?= ${DESTDIR}/usr/X11R7/lib/libXxf86misc.a
LIBXXF86VM?= ${DESTDIR}/usr/X11R7/lib/libXxf86vm.a
LIBDPS?= ${DESTDIR}/usr/X11R7/lib/libdps.a
LIBEXPAT?= ${DESTDIR}/usr/X11R7/lib/libexpat.a
LIBFNTSTUBS?= ${DESTDIR}/usr/X11R7/lib/libfntstubs.a
LIBFONTCACHE?= ${DESTDIR}/usr/X11R7/lib/libfontcache.a
LIBFONTCONFIG?= ${DESTDIR}/usr/X11R7/lib/libfontconfig.a
LIBFONTENC?= ${DESTDIR}/usr/X11R7/lib/libfontenc.a
LIBFREETYPE?= ${DESTDIR}/usr/X11R7/lib/libfreetype.a
LIBLBXUTIL?= ${DESTDIR}/usr/X11R7/lib/liblbxutil.a
LIBXKBFILE?= ${DESTDIR}/usr/X11R7/lib/libxkbfile.a
SHAREDSTRINGS If defined, a new .c.o rule is used that results in shared
strings, using xstr(1). Note that this will not work with
parallel makes.

View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.prog.mk,v 1.267 2011/09/10 16:57:35 apb Exp $
# $NetBSD: bsd.prog.mk,v 1.268 2011/10/16 01:14:33 christos Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@ -82,20 +82,105 @@ LIBCRT0= ${DESTDIR}/usr/lib/crt0.o
# etc..
.for _lib in \
archive asn1 bluetooth bsdmalloc bz2 c c_pic cdk com_err compat \
crypt crypto crypto_idea crypto_mdc2 crypto_rc5 \
curses dbm des edit event \
fetch form fl g2c gcc gnumalloc gssapi hdb heimbase heimntlm hx509 \
intl ipsec \
kadm5clnt kadm5srv kafs krb5 kvm l lber ldap ldap_r lua \
m magic menu objc ossaudio pam pcap pci pmc posix pthread pthread_dbg \
puffs radius resolv rmt roken rpcsvc rt rump rumpuser saslc skey sl ss \
ssh ssl termcap usbhid util wrap y z bind9 dns lwres isccfg isccc isc \
\
rumpfs_cd9660fs rumpfs_efs rumpfs_ext2fs rumpfs_ffs rumpfs_hfs \
rumpfs_lfs rumpfs_msdosfs rumpfs_nfs rumpfs_ntfs rumpfs_syspuffs \
rumpfs_tmpfs rumpfs_udf rumpfs_ufs \
wind
archive \
asn1 \
bind9 \
bluetooth \
bsdmalloc \
bz2 \
c \
c_pic \
com_err \
compat \
crt0 \
crypt \
crypto \
crypto_idea \
crypto_mdc2 \
crypto_rc5 \
curses \
dbm \
des \
dns \
edit \
event \
fetch \
fl \
form \
g2c \
gcc \
gnumalloc \
gssapi \
hdb \
heimbase \
heimntlm \
hx509 \
intl \
ipsec \
isc \
isccc \
isccfg \
kadm5clnt \
kadm5srv \
kafs \
krb5 \
kvm \
l \
lber \
ldap \
ldap_r \
lua \
lwres \
m \
magic \
menu \
objc \
ossaudio \
pam \
pcap \
pci \
pmc \
posix \
pthread \
pthread_dbg \
puffs \
quota \
radius \
resolv \
rmt \
roken \
rpcsvc \
rt \
rump \
rumpfs_cd9660fs \
rumpfs_efs \
rumpfs_ext2fs \
rumpfs_ffs \
rumpfs_hfs \
rumpfs_lfs \
rumpfs_msdosfs \
rumpfs_nfs \
rumpfs_ntfs \
rumpfs_syspuffs \
rumpfs_tmpfs \
rumpfs_udf \
rumpfs_ufs \
rumpuser \
saslc \
skey \
sl \
sqlite3 \
ss \
ssh \
ssl \
ssp \
terminfo \
usbhid \
util \
wind \
wrap \
y \
z
.ifndef LIB${_lib:tu}
LIB${_lib:tu}= ${DESTDIR}/usr/lib/lib${_lib}.a
.MADE: ${LIB${_lib:tu}} # Note: ${DESTDIR} will be expanded
@ -104,9 +189,13 @@ LIB${_lib:tu}= ${DESTDIR}/usr/lib/lib${_lib}.a
# atf-c and atf-c++ are special cases because we cannot use [-+] as part of
# make(1) variable names. Just define them here.
LIBATF_C= ${DESTDIR}/usr/lib/libatf-c.a
.MADE: ${LIBATF_C}
LIBATF_CXX= ${DESTDIR}/usr/lib/libatf-c++.a
.MADE: ${LIBATF_C} ${LIBATF_CXX}
.MADE: ${LIBATF_CXX}
LIBSTDCXX= ${DESTDIR}/usr/lib/libstdc++.a
.MADE: ${LIBSTDCXX}
LIBSUPCXX= ${DESTDIR}/usr/lib/libsupc++.a
.MADE: ${LIBSUPCXX}
# PAM applications, if linked statically, need more libraries
.if (${MKPIC} == "no")
.if (${MKCRYPTO} != "no")
@ -131,21 +220,44 @@ PAM_STATIC_DPADD=
.endif
# These need + -> X transformations
.ifndef LIBSTDCXX
LIBSTDCXX= ${DESTDIR}/usr/lib/libstdc++.a
.MADE: ${LIBSTDCXX}
.endif
.ifndef LIBSUPCXX
LIBSUPCXX= ${DESTDIR}/usr/lib/libsupc++.a
.MADE: ${LIBSUPCXX}
.endif
.for _lib in \
dps expat fntstubs fontcache fontconfig fontenc freetype FS \
GL GLU ICE lbxutil SM X11 Xau Xaw Xdmcp Xext Xfont Xft \
Xi Xinerama xkbfile Xmu Xmuu Xpm Xrandr Xrender Xss Xt \
XTrap Xtst Xv Xxf86dga Xxf86misc Xxf86vm
FS \
GL \
GLU \
ICE \
SM \
X11 \
XTrap \
Xau \
Xaw \
Xdmcp \
Xext \
Xfont \
Xft \
Xi \
Xinerama \
Xmu \
Xmuu \
Xpm \
Xrandr \
Xrender \
Xss \
Xt \
Xtst \
Xv \
Xxf86dga \
Xxf86misc \
Xxf86vm \
dps \
expat \
fntstubs \
fontcache \
fontconfig \
fontenc \
freetype \
lbxutil \
xkbfile
.ifndef LIB${_lib:tu}
LIB${_lib:tu}= ${DESTDIR}${X11USRLIBDIR}/lib${_lib}.a
.MADE: ${LIB${_lib:tu}} # Note: ${DESTDIR} will be expanded