diff options
Diffstat (limited to 'kerberos5/libexec')
-rw-r--r-- | kerberos5/libexec/Makefile | 2 | ||||
-rw-r--r-- | kerberos5/libexec/hprop/Makefile | 7 | ||||
-rw-r--r-- | kerberos5/libexec/hpropd/Makefile | 7 | ||||
-rw-r--r-- | kerberos5/libexec/ipropd-master/Makefile | 7 | ||||
-rw-r--r-- | kerberos5/libexec/ipropd-slave/Makefile | 7 | ||||
-rw-r--r-- | kerberos5/libexec/k5admind/Makefile | 51 | ||||
-rw-r--r-- | kerberos5/libexec/k5passwdd/Makefile | 43 | ||||
-rw-r--r-- | kerberos5/libexec/kadmind/Makefile | 10 | ||||
-rw-r--r-- | kerberos5/libexec/kdc/Makefile | 12 | ||||
-rw-r--r-- | kerberos5/libexec/kpasswdd/Makefile | 9 | ||||
-rw-r--r-- | kerberos5/libexec/telnetd/Makefile | 12 |
11 files changed, 14 insertions, 153 deletions
diff --git a/kerberos5/libexec/Makefile b/kerberos5/libexec/Makefile index c1f685e..b81f769 100644 --- a/kerberos5/libexec/Makefile +++ b/kerberos5/libexec/Makefile @@ -1,5 +1,5 @@ # $FreeBSD$ -SUBDIR= ipropd-master ipropd-slave hpropd k5admind kdc k5passwdd telnetd +SUBDIR= ipropd-master ipropd-slave hpropd kadmind kdc kpasswdd telnetd .include <bsd.subdir.mk> diff --git a/kerberos5/libexec/hprop/Makefile b/kerberos5/libexec/hprop/Makefile index a49f27b..20db261 100644 --- a/kerberos5/libexec/hprop/Makefile +++ b/kerberos5/libexec/hprop/Makefile @@ -12,16 +12,11 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -.if defined(MAKE_KERBEROS4) -_krb4libs= -lkrb -lkafs -lkdb -_krb4deps= ${LIBKRB} ${LIBKAFS} ${LIBKDB} -.endif LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \ -L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \ -L${VERSOBJDIR} -lvers \ - ${_krb4libs} \ -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \ +DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} MAN= hprop.8 diff --git a/kerberos5/libexec/hpropd/Makefile b/kerberos5/libexec/hpropd/Makefile index abbbbbf..0b98752 100644 --- a/kerberos5/libexec/hpropd/Makefile +++ b/kerberos5/libexec/hpropd/Makefile @@ -12,16 +12,11 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -.if defined(MAKE_KERBEROS4) -_krb4libs= -lkrb -lkafs -lkdb -_krb4deps= ${LIBKRB} ${LIBKAFS} ${LIBKDB} -.endif LDADD= -L${KRB5OBJDIR} -lkrb5 \ -L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \ -L${VERSOBJDIR} -lvers \ - ${_krb4libs} \ -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \ +DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} MAN= hpropd.8 diff --git a/kerberos5/libexec/ipropd-master/Makefile b/kerberos5/libexec/ipropd-master/Makefile index 8b55173..f77b54e 100644 --- a/kerberos5/libexec/ipropd-master/Makefile +++ b/kerberos5/libexec/ipropd-master/Makefile @@ -12,18 +12,13 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -.if defined(MAKE_KERBEROS4) -_krb4libs= -lkrb -lkafs -_krb4deps= ${LIBKRB} ${LIBKAFS} -.endif LDADD= \ -L${KADM5SOBJDIR} -lkadm5srv \ -L${KRB5OBJDIR} -lkrb5 \ -L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \ -L${VERSOBJDIR} -lvers \ - ${_krb4libs} \ -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \ +DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} NOMAN= yes diff --git a/kerberos5/libexec/ipropd-slave/Makefile b/kerberos5/libexec/ipropd-slave/Makefile index ab4b2c7..0614f5a 100644 --- a/kerberos5/libexec/ipropd-slave/Makefile +++ b/kerberos5/libexec/ipropd-slave/Makefile @@ -12,18 +12,13 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -.if defined(MAKE_KERBEROS4) -_krb4libs= -lkrb -lkafs -_krb4deps= ${LIBKRB} ${LIBKAFS} -.endif LDADD= \ -L${KADM5SOBJDIR} -lkadm5srv \ -L${KRB5OBJDIR} -lkrb5 \ -L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \ -L${VERSOBJDIR} -lvers \ - ${_krb4libs} \ -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \ +DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} NOMAN= yes diff --git a/kerberos5/libexec/k5admind/Makefile b/kerberos5/libexec/k5admind/Makefile deleted file mode 100644 index 70beef6..0000000 --- a/kerberos5/libexec/k5admind/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -# $FreeBSD$ - -PROG= k5admind -SRCS= kadmind.c server.c kadm_conn.c \ - kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h -CFLAGS+= -I${KRB5DIR}/include \ - -I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/lib/krb5 \ - -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/lib/hdb \ - -I${KRB5DIR}/lib/sl \ - -I${KRB5DIR}/lib/kadm5 \ - -I${KRB5DIR}/kadmin \ - -I${ASN1OBJDIR} \ - -I${HDBOBJDIR} \ - -I${.OBJDIR} -.if defined(MAKE_KERBEROS4) -SRCS+= version4.c -_krb4libs= -lkrb -lkafs -_krb4deps= ${LIBKRB} ${LIBKAFS} -.endif -LDADD= -L${KRB5OBJDIR} -lkrb5 \ - -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - ${_krb4libs} \ - -L${KADM5SOBJDIR} -lkadm5srv \ - -L${HDBOBJDIR} -lhdb \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \ - ${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} -NOMAN= yes - -.include <bsd.prog.mk> - -.PATH: ${KRB5DIR}/kadmin - -kadm5/private.h: kadm5 - cat ${KRB5DIR}/lib/kadm5/private.h > ${.TARGET} - -kadm5/admin.h: kadm5 - cat ${KRB5DIR}/lib/kadm5/admin.h > ${.TARGET} - -kadm5/kadm5_err.h: kadm5 kadm5_err.h - cd ${.OBJDIR}/kadm5 && ln -sf ../kadm5_err.h - -kadm5: - mkdir ${.TARGET} - -CLEANFILES+= kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h -CLEANDIRS+= kadm5 diff --git a/kerberos5/libexec/k5passwdd/Makefile b/kerberos5/libexec/k5passwdd/Makefile deleted file mode 100644 index 3b53959..0000000 --- a/kerberos5/libexec/k5passwdd/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# $FreeBSD$ - -PROG= k5passwdd -SRCS= kpasswdd.c krb5_err.h heim_err.h hdb_err.h \ - kadm5/admin.h kadm5/private.h -CFLAGS+= -I${KRB5DIR}/include \ - -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/lib/hdb \ - -I${KRB5DIR}/lib/krb5 \ - -I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/lib/kadm5 \ - -I${KRB5DIR}/kpasswd \ - -I${ASN1OBJDIR} \ - -I${HDBOBJDIR} \ - -I${.OBJDIR} -.if defined(MAKE_KERBEROS4) -_krb4libs= -lkrb -lkafs -_krb4deps= ${LIBKRB} ${LIBKAFS} -.endif -LDADD= -L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - ${_krb4libs} \ - -L${KADM5SOBJDIR} -lkadm5srv -L${HDBOBJDIR} -lhdb \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err -DPADD= ${LIBKRB5} ${LIBROKEN} ${_krb4deps} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} -MAN= kpasswdd.8 - -.include <bsd.prog.mk> - -.PATH: ${KRB5DIR}/kpasswd - -kadm5/admin.h: kadm5 - cat ${KRB5DIR}/lib/kadm5/admin.h > ${.TARGET} - -kadm5/private.h: kadm5 - cat ${KRB5DIR}/lib/kadm5/private.h > ${.TARGET} - -kadm5: - mkdir ${.TARGET} - -CLEANFILES+= kadm5/admin.h kadm5/private.h -CLEANDIRS+= kadm5 diff --git a/kerberos5/libexec/kadmind/Makefile b/kerberos5/libexec/kadmind/Makefile index 70beef6..46ca5d5 100644 --- a/kerberos5/libexec/kadmind/Makefile +++ b/kerberos5/libexec/kadmind/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PROG= k5admind +PROG= kadmind SRCS= kadmind.c server.c kadm_conn.c \ kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h CFLAGS+= -I${KRB5DIR}/include \ @@ -14,19 +14,13 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -.if defined(MAKE_KERBEROS4) -SRCS+= version4.c -_krb4libs= -lkrb -lkafs -_krb4deps= ${LIBKRB} ${LIBKAFS} -.endif LDADD= -L${KRB5OBJDIR} -lkrb5 \ -L${ROKENOBJDIR} -lroken \ -L${VERSOBJDIR} -lvers \ - ${_krb4libs} \ -L${KADM5SOBJDIR} -lkadm5srv \ -L${HDBOBJDIR} -lhdb \ -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \ +DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \ ${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} NOMAN= yes diff --git a/kerberos5/libexec/kdc/Makefile b/kerberos5/libexec/kdc/Makefile index ecf601e..ac0d3ba 100644 --- a/kerberos5/libexec/kdc/Makefile +++ b/kerberos5/libexec/kdc/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ -PROG= kdc -SRCS= \ +PROG= kdc +SRCS= \ config.c \ connect.c \ kdc_locl.h \ @@ -20,17 +20,11 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -.if defined(MAKE_KERBEROS4) -SRCS+= 524.c kerberos4.c kaserver.c rx.h -_krb4libs= -lkrb -lkafs -_krb4deps= ${LIBKRB} ${LIBKAFS} -.endif LDADD= -L${KRB5OBJDIR} -lkrb5 \ -L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \ -L${VERSOBJDIR} -lvers \ - ${_krb4libs} \ -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \ +DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} MAN= kdc.8 diff --git a/kerberos5/libexec/kpasswdd/Makefile b/kerberos5/libexec/kpasswdd/Makefile index 3b53959..faae574 100644 --- a/kerberos5/libexec/kpasswdd/Makefile +++ b/kerberos5/libexec/kpasswdd/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PROG= k5passwdd +PROG= kpasswdd SRCS= kpasswdd.c krb5_err.h heim_err.h hdb_err.h \ kadm5/admin.h kadm5/private.h CFLAGS+= -I${KRB5DIR}/include \ @@ -13,16 +13,11 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -.if defined(MAKE_KERBEROS4) -_krb4libs= -lkrb -lkafs -_krb4deps= ${LIBKRB} ${LIBKAFS} -.endif LDADD= -L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken \ -L${VERSOBJDIR} -lvers \ - ${_krb4libs} \ -L${KADM5SOBJDIR} -lkadm5srv -L${HDBOBJDIR} -lhdb \ -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err -DPADD= ${LIBKRB5} ${LIBROKEN} ${_krb4deps} \ +DPADD= ${LIBKRB5} ${LIBROKEN} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} MAN= kpasswdd.8 diff --git a/kerberos5/libexec/telnetd/Makefile b/kerberos5/libexec/telnetd/Makefile index 9b12a00..8ea60d4 100644 --- a/kerberos5/libexec/telnetd/Makefile +++ b/kerberos5/libexec/telnetd/Makefile @@ -16,18 +16,10 @@ CFLAGS+= -DKRB5 -DFORWARD -Dnet_write=telnet_net_write WARNS?= 2 -DPADD= -LDADD= - -.if defined(MAKE_KERBEROS4) -DPADD+= ${LIBKRB} ${LIBCOM_ERR} -LDADD+= -lkrb -lcom_err -.endif - -DPADD+= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} ${LIBCRYPTO} \ +DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} ${LIBCRYPTO} \ ${LIBKRB5} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR} \ ${LIBCRYPT} ${LIBPAM} -LDADD+= -lutil -ltermcap ${LIBTELNET} -lmp -lcrypto \ +LDADD= -lutil -ltermcap ${LIBTELNET} -lmp -lcrypto \ -L${KRB5OBJDIR} -lkrb5 -L${ASN1OBJDIR} -lasn1 \ -L${ROKENOBJDIR} -lroken -lcom_err \ -lcrypt ${MINUSLPAM} |