aboutsummaryrefslogtreecommitdiff
path: root/kerberos5/libexec
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2014-11-25 09:57:42 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2014-11-25 09:57:42 +0000
commitd65af1e7b1ff4806881f2c46d684d004b70e5cc9 (patch)
treebb41aaf2a8a206515fdcf1f5a5d9fa6523213ef1 /kerberos5/libexec
parent85abe78406f14f8a494562f48e279c8a060f6a90 (diff)
downloadsrc-d65af1e7b1ff4806881f2c46d684d004b70e5cc9.tar.gz
src-d65af1e7b1ff4806881f2c46d684d004b70e5cc9.zip
Convert kerberos to LIBADD and reduce overlinking of the kerberos binaries and
libraries
Notes
Notes: svn path=/head/; revision=275022
Diffstat (limited to 'kerberos5/libexec')
-rw-r--r--kerberos5/libexec/digest-service/Makefile6
-rw-r--r--kerberos5/libexec/hprop/Makefile7
-rw-r--r--kerberos5/libexec/hpropd/Makefile7
-rw-r--r--kerberos5/libexec/ipropd-master/Makefile7
-rw-r--r--kerberos5/libexec/ipropd-slave/Makefile7
-rw-r--r--kerberos5/libexec/kadmind/Makefile7
-rw-r--r--kerberos5/libexec/kcm/Makefile8
-rw-r--r--kerberos5/libexec/kdc/Makefile4
-rw-r--r--kerberos5/libexec/kdigest/Makefile5
-rw-r--r--kerberos5/libexec/kfd/Makefile5
-rw-r--r--kerberos5/libexec/kimpersonate/Makefile5
-rw-r--r--kerberos5/libexec/kpasswdd/Makefile7
12 files changed, 26 insertions, 49 deletions
diff --git a/kerberos5/libexec/digest-service/Makefile b/kerberos5/libexec/digest-service/Makefile
index 0c45c37ed1cb..f018aac64da8 100644
--- a/kerberos5/libexec/digest-service/Makefile
+++ b/kerberos5/libexec/digest-service/Makefile
@@ -8,11 +8,7 @@ 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 ${LDHEIMIPCS} -lkrb5 -lroken -lasn1 -lcrypto -lcrypt \
- ${LIBVERS} -lheimntlm
-USEPRIVATELIB= heimipcs
+LIBADD= hdb kdc heimipcs krb5 roken asn1 crypto vers heimntlm
.include <bsd.prog.mk>
diff --git a/kerberos5/libexec/hprop/Makefile b/kerberos5/libexec/hprop/Makefile
index ac1dffa81a65..88f3dadcff71 100644
--- a/kerberos5/libexec/hprop/Makefile
+++ b/kerberos5/libexec/hprop/Makefile
@@ -10,10 +10,9 @@ CFLAGS+=-I${KRB5DIR}/lib/hx509
CFLAGS+=-I${KRB5DIR}/lib/ntlm
CFLAGS+=-I${KRB5DIR}/kdc
CFLAGS+=-I${.OBJDIR}/../../lib/libkrb5
-DPADD= ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
- ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
-LDADD= -lhdb -lkrb5 -lhx509 -lroken ${LIBVERS} \
- -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
+LIBADD= hdb krb5 roken vers
+DPADD= ${LDAPDPADD}
+LDADD= ${LDAPLDADD}
LDFLAGS=${LDAPLDFLAGS}
.include <bsd.prog.mk>
diff --git a/kerberos5/libexec/hpropd/Makefile b/kerberos5/libexec/hpropd/Makefile
index e0722bd38640..9f7f9e712838 100644
--- a/kerberos5/libexec/hpropd/Makefile
+++ b/kerberos5/libexec/hpropd/Makefile
@@ -4,10 +4,9 @@ PROG= hpropd
MAN= hpropd.8
CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/kdc ${LDAPCFLAGS}
-DPADD= ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
- ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
-LDADD= -lhdb -lkrb5 -lhx509 -lroken ${LIBVERS} \
- -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
+LIBADD= hdb krb5 roken vers
+DPADD= ${LDAPDPADD}
+LDADD= ${LDAPLDADD}
LDFLAGS=${LDAPLDFLAGS}
.include <bsd.prog.mk>
diff --git a/kerberos5/libexec/ipropd-master/Makefile b/kerberos5/libexec/ipropd-master/Makefile
index 99a4f9c3ca30..53e6adebf5fb 100644
--- a/kerberos5/libexec/ipropd-master/Makefile
+++ b/kerberos5/libexec/ipropd-master/Makefile
@@ -5,10 +5,9 @@ MAN= iprop.8
SRCS= ipropd_common.c ipropd_master.c kadm5_err.h
CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
-I. ${LDAPCFLAGS}
-DPADD= ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
- ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
-LDADD= -lkadm5srv -lhdb -lkrb5 -lhx509 -lroken ${LIBVERS} \
- -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
+LIBADD= kadm5srv hdb krb5 roken vers
+DPADD= ${LDAPDPADD}
+LDADD= ${LDAPLDADD}
LDFLAGS=${LDAPLDFLAGS}
foo::
diff --git a/kerberos5/libexec/ipropd-slave/Makefile b/kerberos5/libexec/ipropd-slave/Makefile
index 8a72d9e8b2e2..cae84aa5ffb5 100644
--- a/kerberos5/libexec/ipropd-slave/Makefile
+++ b/kerberos5/libexec/ipropd-slave/Makefile
@@ -5,10 +5,9 @@ MAN=
SRCS= ipropd_common.c ipropd_slave.c kadm5_err.h
CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
-I. ${LDAPCFLAGS}
-DPADD= ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
- ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
-LDADD= -lkadm5srv -lhdb -lkrb5 -lhx509 -lroken ${LIBVERS} \
- -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
+LIBADD= kadm5srv hdb krb5 roken vers
+DPADD= ${LDAPDPADD}
+LDADD= ${LDAPLDADD}
LDFLAGS=${LDAPLDFLAGS}
.include <bsd.prog.mk>
diff --git a/kerberos5/libexec/kadmind/Makefile b/kerberos5/libexec/kadmind/Makefile
index f88ac2f1b330..27200d6d98ca 100644
--- a/kerberos5/libexec/kadmind/Makefile
+++ b/kerberos5/libexec/kadmind/Makefile
@@ -9,10 +9,9 @@ SRCS= rpc.c \
CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
${LDAPCFLAGS}
-DPADD= ${LIBKADM5SRV} ${LIBGSSAPI} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} \
- ${LIBASN1} ${LIBVERS} ${LIBCRYPTO} ${LIBCRYPT} ${LDAPDPADD}
-LDADD= -lkadm5srv -lgssapi -lhdb -lkrb5 -lroken \
- -lasn1 ${LIBVERS} -lcrypto -lcrypt ${LDAPLDADD}
+LIBADD= kadm5srv gssapi hdb krb5 roken vers
+DPADD= ${LDAPDPADD}
+LDADD= ${LDAPLDADD}
LDFLAGS=${LDAPLDFLAGS}
.include <bsd.prog.mk>
diff --git a/kerberos5/libexec/kcm/Makefile b/kerberos5/libexec/kcm/Makefile
index c0e15447ab38..fa7a0cfce9cf 100644
--- a/kerberos5/libexec/kcm/Makefile
+++ b/kerberos5/libexec/kcm/Makefile
@@ -19,11 +19,9 @@ SRCS= acl.c \
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 ${LDHEIMIPCS} \
- -lcrypto -lcrypt ${LIBVERS} ${LDAPLDADD}
-USEPRIVATELIB= heimipcs
+LIBADD= krb5 roken heimntlm heimipcs crypto
+DPADD= ${LDAPDPADD}
+LDADD= ${LIBVERS} ${LDAPLDADD}
LDFLAGS=${LDAPLDFLAGS}
.include <bsd.prog.mk>
diff --git a/kerberos5/libexec/kdc/Makefile b/kerberos5/libexec/kdc/Makefile
index 4ca5c3a201b2..c88a5cd7040e 100644
--- a/kerberos5/libexec/kdc/Makefile
+++ b/kerberos5/libexec/kdc/Makefile
@@ -10,9 +10,7 @@ SRCS= config.c \
CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/kdc ${LDAPCFLAGS}
-DPADD= ${LIBKDC} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} \
- ${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS}
-LDADD= -lkdc -lhdb -lkrb5 -lroken -lasn1 -lcrypto -lcrypt ${LIBVERS}
+LIBADD= kdc hdb krb5 roken crypt vers
.include <bsd.prog.mk>
diff --git a/kerberos5/libexec/kdigest/Makefile b/kerberos5/libexec/kdigest/Makefile
index c88e3b990f0f..f9b42e56851e 100644
--- a/kerberos5/libexec/kdigest/Makefile
+++ b/kerberos5/libexec/kdigest/Makefile
@@ -5,10 +5,7 @@ MAN= kdigest.8
CFLAGS+= -I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/lib/sl -I.
-DPADD= ${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
- ${LIBCRYPT} ${LIBSL} ${LIBVERS} ${LIBEDIT}
-LDADD= -lkrb5 -lheimntlm -lroken -lasn1 -lcrypto -lcrypt ${LIBSL} \
- ${LIBVERS} -ledit
+LIBADD= krb5 heimntlm roken crypto edit sl vers
SRCS= kdigest.c \
kdigest-commands.c \
kdigest-commands.h
diff --git a/kerberos5/libexec/kfd/Makefile b/kerberos5/libexec/kfd/Makefile
index f5081f18bed2..82df3adbb6da 100644
--- a/kerberos5/libexec/kfd/Makefile
+++ b/kerberos5/libexec/kfd/Makefile
@@ -4,10 +4,7 @@ PROG= kfd
MAN= kfd.8
CFLAGS+= -I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/lib/roken
-DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
- ${LIBCRYPT} ${LIBVERS}
-LDADD= -lkrb5 -lroken -lasn1 -lcrypto -lcrypt \
- ${LIBVERS}
+LIBADD= krb5 roken vers
.include <bsd.prog.mk>
diff --git a/kerberos5/libexec/kimpersonate/Makefile b/kerberos5/libexec/kimpersonate/Makefile
index 32f97772c9b5..3c94db6857d0 100644
--- a/kerberos5/libexec/kimpersonate/Makefile
+++ b/kerberos5/libexec/kimpersonate/Makefile
@@ -6,10 +6,7 @@ CFLAGS+= -I${KRB5DIR}/lib/hx509 \
-I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/lib/sl -I.
-DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
- ${LIBCRYPT} ${LIBVERS}
-LDADD= -lkafs5 -lkrb5 -lheimntlm -lroken -lasn1 -lcrypto -lcrypt \
- ${LIBVERS}
+LIBADD= krb5 roken asn1 vers
.include <bsd.prog.mk>
diff --git a/kerberos5/libexec/kpasswdd/Makefile b/kerberos5/libexec/kpasswdd/Makefile
index 22876861edaa..2fe79646aae6 100644
--- a/kerberos5/libexec/kpasswdd/Makefile
+++ b/kerberos5/libexec/kpasswdd/Makefile
@@ -3,10 +3,9 @@
PROG= kpasswdd
MAN= kpasswdd.8
CFLAGS+=-I${KRB5DIR}/lib/roken -I../../lib/libhdb ${LDAPCFLAGS}
-DPADD= ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
- ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
-LDADD= -lkadm5srv -lhdb -lkrb5 -lhx509 -lroken ${LIBVERS} \
- -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
+LIBADD= kadm5srv hdb krb5 roken vers asn1
+DPADD= ${LDAPDPADD}
+LDADD= ${LDAPLDADD}
LDFLAGS=${LDAPLDFLAGS}
.include <bsd.prog.mk>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-16 03:04:40 +0000