diff options
| author | bapt <bapt@FreeBSD.org> | 2014-08-06 22:17:26 +0000 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2014-08-06 22:17:26 +0000 |
| commit | 8a9380f42cca5e897a1ccdfa1d7a4d0e624e4864 (patch) | |
| tree | 55e479f80b3d04d5fd6accb8908787cccd17d895 /kerberos5/libexec | |
| parent | 8b0ef17c97fe79b895e87452fef5f810ade727fd (diff) | |
| download | FreeBSD-src-8a9380f42cca5e897a1ccdfa1d7a4d0e624e4864.zip FreeBSD-src-8a9380f42cca5e897a1ccdfa1d7a4d0e624e4864.tar.gz | |
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
Diffstat (limited to 'kerberos5/libexec')
| -rw-r--r-- | kerberos5/libexec/digest-service/Makefile | 2 | ||||
| -rw-r--r-- | kerberos5/libexec/kcm/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kerberos5/libexec/digest-service/Makefile b/kerberos5/libexec/digest-service/Makefile index 937d0bf..bc55a1a 100644 --- a/kerberos5/libexec/digest-service/Makefile +++ b/kerberos5/libexec/digest-service/Makefile @@ -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 diff --git a/kerberos5/libexec/kcm/Makefile b/kerberos5/libexec/kcm/Makefile index 003c510..8daf958 100644 --- a/kerberos5/libexec/kcm/Makefile +++ b/kerberos5/libexec/kcm/Makefile @@ -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} |
