aboutsummaryrefslogtreecommitdiff
path: root/kerberos5
diff options
context:
space:
mode:
Diffstat (limited to 'kerberos5')
-rw-r--r--kerberos5/libexec/hprop/Makefile4
-rw-r--r--kerberos5/libexec/hpropd/Makefile4
-rw-r--r--kerberos5/libexec/ipropd-master/Makefile4
-rw-r--r--kerberos5/libexec/ipropd-slave/Makefile4
-rw-r--r--kerberos5/libexec/kadmind/Makefile4
-rw-r--r--kerberos5/libexec/kdc/Makefile4
-rw-r--r--kerberos5/libexec/kpasswdd/Makefile4
-rw-r--r--kerberos5/usr.bin/kadmin/Makefile12
-rw-r--r--kerberos5/usr.sbin/ktutil/Makefile8
9 files changed, 24 insertions, 24 deletions
diff --git a/kerberos5/libexec/hprop/Makefile b/kerberos5/libexec/hprop/Makefile
index 6acfded56104..1c16078b272c 100644
--- a/kerberos5/libexec/hprop/Makefile
+++ b/kerberos5/libexec/hprop/Makefile
@@ -11,10 +11,10 @@ CFLAGS+=-I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/lib/krb5 \
-I${KRB5DIR}/lib/asn1
-LDADD= -lkrb5 -lhdb -lroken ${LIBVERS} \
+LDADD= -lhdb -lkrb5 -lroken ${LIBVERS} \
-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
-DPADD= ${LIBKRB5} ${LIBHDB} ${LIBROKEN} ${LIBVERS} \
+DPADD= ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
MAN= hprop.8
diff --git a/kerberos5/libexec/hpropd/Makefile b/kerberos5/libexec/hpropd/Makefile
index 408a5077e288..54a6038e1962 100644
--- a/kerberos5/libexec/hpropd/Makefile
+++ b/kerberos5/libexec/hpropd/Makefile
@@ -7,10 +7,10 @@ CFLAGS+=-I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/lib/asn1 \
${LDAPCFLAGS}
-LDADD= -lkrb5 -lhdb -lroken ${LIBVERS} \
+LDADD= -lhdb -lkrb5 -lroken ${LIBVERS} \
-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
-DPADD= ${LIBKRB5} ${LIBHDB} ${LIBROKEN} ${LIBVERS} \
+DPADD= ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
LDFLAGS= ${LDAPLDFLAGS}
diff --git a/kerberos5/libexec/ipropd-master/Makefile b/kerberos5/libexec/ipropd-master/Makefile
index acc3a0cfdd86..5cdd575159c8 100644
--- a/kerberos5/libexec/ipropd-master/Makefile
+++ b/kerberos5/libexec/ipropd-master/Makefile
@@ -12,12 +12,12 @@ CFLAGS+=-I${KRB5DIR}/lib/roken \
-I. \
${LDAPCFLAGS}
-LDADD= -lkadm5srv -lkrb5 -lhdb -lroken ${LIBVERS} \
+LDADD= -lkadm5srv -lhdb -lkrb5 -lroken ${LIBVERS} \
-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
LDFLAGS=${LDAPLDFLAGS}
-DPADD= ${LIBKADM5SRV} ${LIBKRB5} ${LIBHDB} ${LIBROKEN} ${LIBVERS} \
+DPADD= ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
NOMAN= yes
diff --git a/kerberos5/libexec/ipropd-slave/Makefile b/kerberos5/libexec/ipropd-slave/Makefile
index c363ab572eaf..6a1dbefc304d 100644
--- a/kerberos5/libexec/ipropd-slave/Makefile
+++ b/kerberos5/libexec/ipropd-slave/Makefile
@@ -12,12 +12,12 @@ CFLAGS+=-I${KRB5DIR}/lib/roken \
-I. \
${LDAPCFLAGS}
-LDADD= -lkadm5srv -lkrb5 -lhdb -lroken ${LIBVERS} \
+LDADD= -lkadm5srv -lhdb -lkrb5 -lroken ${LIBVERS} \
-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
LDFLAGS=${LDAPLDFLAGS}
-DPADD= ${LIBKADM5SRV} ${LIBKRB5} ${LIBHDB} ${LIBROKEN} ${LIBVERS} \
+DPADD= ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
NOMAN= yes
diff --git a/kerberos5/libexec/kadmind/Makefile b/kerberos5/libexec/kadmind/Makefile
index 93f995e88d1c..9eb06246fe4e 100644
--- a/kerberos5/libexec/kadmind/Makefile
+++ b/kerberos5/libexec/kadmind/Makefile
@@ -11,12 +11,12 @@ CFLAGS+=-I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/lib/asn1 \
${LDAPCFLAGS}
-LDADD= -lkrb5 -lroken ${LIBVERS} -lkadm5srv -lhdb \
+LDADD= -lkadm5srv -lhdb -lkrb5 -lroken ${LIBVERS} \
-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
LDFLAGS=${LDAPLDFLAGS}
-DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBVERS} ${LIBKADM5SRV} ${LIBHDB} \
+DPADD= ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
MAN= kadmind.8
diff --git a/kerberos5/libexec/kdc/Makefile b/kerberos5/libexec/kdc/Makefile
index 8e275461adb6..683274299e20 100644
--- a/kerberos5/libexec/kdc/Makefile
+++ b/kerberos5/libexec/kdc/Makefile
@@ -17,12 +17,12 @@ CFLAGS+=-I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/lib/asn1 \
${LDAPCFLAGS}
-LDADD= -lkrb5 -lhdb -lroken ${LIBVERS} \
+LDADD= -lhdb -lkrb5 -lroken ${LIBVERS} \
-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
LDFLAGS=${LDAPLDFLAGS}
-DPADD= ${LIBKRB5} ${LIBHDB} ${LIBROKEN} ${LIBVERS} \
+DPADD= ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
MAN= kdc.8
diff --git a/kerberos5/libexec/kpasswdd/Makefile b/kerberos5/libexec/kpasswdd/Makefile
index 884107cd1085..381197c5dbb4 100644
--- a/kerberos5/libexec/kpasswdd/Makefile
+++ b/kerberos5/libexec/kpasswdd/Makefile
@@ -5,12 +5,12 @@ PROG= kpasswdd
CFLAGS+=-I${KRB5DIR}/lib/roken \
${LDAPCFLAGS}
-LDADD= -lkrb5 -lroken ${LIBVERS} -lkadm5srv -lhdb \
+LDADD= -lkadm5srv -lhdb -lkrb5 -lroken ${LIBVERS} \
-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
LDFLAGS=${LDAPLDFLAGS}
-DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBVERS} ${LIBKADM5SRV} ${LIBHDB} \
+DPADD= ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
MAN= kpasswdd.8
diff --git a/kerberos5/usr.bin/kadmin/Makefile b/kerberos5/usr.bin/kadmin/Makefile
index 68532c585fb0..6cfc6731b33d 100644
--- a/kerberos5/usr.bin/kadmin/Makefile
+++ b/kerberos5/usr.bin/kadmin/Makefile
@@ -24,17 +24,17 @@ CFLAGS+=-I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/lib/sl \
${LDAPCFLAGS}
-LDADD= -lkadm5clnt -lkadm5srv -lkrb5 -lroken \
- ${LIBVERS} -lhdb -lasn1 \
+LDADD= -lkadm5clnt -lkadm5srv -lhdb -lkrb5 \
+ ${LIBSL} -lroken ${LIBVERS} -lasn1 \
-lcrypto -lcrypt -lcom_err \
- ${LIBSL} -lreadline -lncurses ${LDAPLDADD}
+ -lreadline -lncurses ${LDAPLDADD}
LDFLAGS=${LDAPLDFLAGS}
-DPADD= ${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBKRB5} ${LIBROKEN} \
- ${LIBVERS} ${LIBHDB} ${LIBASN1} \
+DPADD= ${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} \
+ ${LIBSL} ${LIBROKEN} ${LIBVERS} ${LIBASN1} \
${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \
- ${LIBSL} ${LIBREADLINE} ${LIBNCURSES} ${LDAPDPADD}
+ ${LIBREADLINE} ${LIBNCURSES} ${LDAPDPADD}
MAN= kadmin.8
diff --git a/kerberos5/usr.sbin/ktutil/Makefile b/kerberos5/usr.sbin/ktutil/Makefile
index 355d6704402c..f7f675fab8cf 100644
--- a/kerberos5/usr.sbin/ktutil/Makefile
+++ b/kerberos5/usr.sbin/ktutil/Makefile
@@ -16,12 +16,12 @@ SRCS= \
CFLAGS+= -I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/lib/sl \
-LDADD= -lkadm5clnt -lkrb5 -lroken ${LIBVERS} \
- ${LIBSL} -lasn1 -lcrypto -lcrypt -lcom_err \
+LDADD= -lkadm5clnt -lkrb5 ${LIBSL} -lroken ${LIBVERS} \
+ -lasn1 -lcrypto -lcrypt -lcom_err \
-lreadline -lncurses
-DPADD= ${LIBKADM5CLNT} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
- ${LIBSL} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \
+DPADD= ${LIBKADM5CLNT} ${LIBKRB5} ${LIBSL} ${LIBROKEN} ${LIBVERS} \
+ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \
${LIBREADLINE} ${LIBNCURSES}
MAN= ktutil.8