Rework privatelib/internallib
Make sure everything linking to a privatelib and/or an internallib does it directly from the OBJDIR rather than DESTDIR. Add src.libnames.mk so bsd.libnames.mk is not polluted by libraries not existsing in final installation Introduce the LD* variable which is what ld(1) is expecting (via LDADD) to link to internal/privatelib Directly link to the .so in case of private library to avoid having to complexify LDFLAGS. Phabric: https://phabric.freebsd.org/D553 Reviewed by: imp, emaste
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
LIB= krb5
|
||||
LDFLAGS= -Wl,--no-undefined
|
||||
VERSION_MAP= ${KRB5DIR}/lib/krb5/version-script.map
|
||||
LDADD= -lasn1 -lcom_err -lcrypt -lcrypto -lhx509 -lroken -lwind -lheimbase -lheimipcc
|
||||
LDADD= -lasn1 -lcom_err -lcrypt -lcrypto -lhx509 -lroken -lwind -lheimbase ${LDHEIMIPCC}
|
||||
DPADD= ${LIBASN1} ${LIBCOM_ERR} ${LIBCRYPT} ${LIBCRYPTO} ${LIBHX509} ${LIBROKEN} ${LIBWIND} ${LIBHEIMBASE} ${LIBHEIMIPCC}
|
||||
USEPRIVATELIB= heimipcc
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ CFLAGS+= -I${KRB5DIR}/kdc \
|
||||
-I${KRB5DIR}/lib/roken
|
||||
DPADD= ${LIBHDB} ${LIBKDC} ${LIBHEIMIPCS} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} \
|
||||
${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS}
|
||||
LDADD= -lhdb -lkdc -lheimipcs -lkrb5 -lroken -lasn1 -lcrypto -lcrypt \
|
||||
LDADD= -lhdb -lkdc ${LDHEIMIPCS} -lkrb5 -lroken -lasn1 -lcrypto -lcrypt \
|
||||
${LIBVERS} -lheimntlm
|
||||
USEPRIVATELIB= heimipcs
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
|
||||
-I${KRB5DIR}/kcm -I${KRB5DIR}/lib/ipc ${LDAPCFLAGS}
|
||||
DPADD= ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBHEIMNTLM} \
|
||||
${LIBHEIMIPCS} ${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS} ${LDAPDPADD}
|
||||
LDADD= -lhdb -lkrb5 -lroken -lasn1 -lheimntlm -lheimipcs \
|
||||
LDADD= -lhdb -lkrb5 -lroken -lasn1 -lheimntlm ${LDHEIMIPCS} \
|
||||
-lcrypto -lcrypt ${LIBVERS} ${LDAPLDADD}
|
||||
USEPRIVATELIB= heimipcs
|
||||
LDFLAGS=${LDAPLDFLAGS}
|
||||
|
||||
Reference in New Issue
Block a user