diff options
| author | des <des@FreeBSD.org> | 2013-09-10 18:40:43 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2013-09-10 18:40:43 +0000 |
| commit | c3bd2283835242173e76312c8ec97a6dfefe43b1 (patch) | |
| tree | 02fd2ef6470c8bcbe977410f3b3f1b0f7a2465c8 /kerberos5/libexec | |
| parent | 4a76b49949900686f74510b7e0b3fec1fe456016 (diff) | |
| download | FreeBSD-src-c3bd2283835242173e76312c8ec97a6dfefe43b1.zip FreeBSD-src-c3bd2283835242173e76312c8ec97a6dfefe43b1.tar.gz | |
Clean up the Kerberos build by turning libheimipcc and libheimipcs into
private shared libraries, instead of hacked-together archives of PIC
objects. This makes it possible to build a static libkrb5 that works.
Reviewed by: stas
Approved by: re (gjb)
Diffstat (limited to 'kerberos5/libexec')
| -rw-r--r-- | kerberos5/libexec/digest-service/Makefile | 7 | ||||
| -rw-r--r-- | kerberos5/libexec/kcm/Makefile | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/kerberos5/libexec/digest-service/Makefile b/kerberos5/libexec/digest-service/Makefile index 82a8bc4..79a7c8b 100644 --- a/kerberos5/libexec/digest-service/Makefile +++ b/kerberos5/libexec/digest-service/Makefile @@ -8,10 +8,11 @@ CFLAGS+= -I${KRB5DIR}/kdc \ -I${KRB5DIR}/lib/ipc \ -I${KRB5DIR}/lib/wind \ -I${KRB5DIR}/lib/roken -DPADD= ${LIBHDB} ${LIBKDC} ${LIBHEIMIPCS} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \ - ${LIBCRYPT} ${LIBVERS} -LDADD= -lhdb -lkdc ${LIBHEIMIPCS} -lkrb5 -lroken -lasn1 -lcrypto -lcrypt \ +DPADD= ${LIBHDB} ${LIBKDC} ${LIBHEIMIPCS} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} \ + ${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS} +LDADD= -lhdb -lkdc -lheimipcs -lkrb5 -lroken -lasn1 -lcrypto -lcrypt \ ${LIBVERS} -lheimntlm +USEPRIVATELIB= heimipcs .include <bsd.prog.mk> diff --git a/kerberos5/libexec/kcm/Makefile b/kerberos5/libexec/kcm/Makefile index 2643b83..bc84c05 100644 --- a/kerberos5/libexec/kcm/Makefile +++ b/kerberos5/libexec/kcm/Makefile @@ -21,8 +21,9 @@ 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 ${LIBHEIMIPCS} \ +LDADD= -lhdb -lkrb5 -lroken -lasn1 -lheimntlm -lheimipcs \ -lcrypto -lcrypt ${LIBVERS} ${LDAPLDADD} +USEPRIVATELIB= heimipcs LDFLAGS=${LDAPLDFLAGS} .include <bsd.prog.mk> |
