diff options
author | ru <ru@FreeBSD.org> | 2004-01-31 08:15:57 +0000 |
---|---|---|
committer | ru <ru@FreeBSD.org> | 2004-01-31 08:15:57 +0000 |
commit | ad18fb995c808a63951fe7b1d7f0789e3260e409 (patch) | |
tree | 417a8210fba66662bdf1df5485b676fbe1a26449 /kerberos5/usr.bin | |
parent | 56844e70af38fc60cc6e46aedb529f107dfacee5 (diff) | |
download | FreeBSD-src-ad18fb995c808a63951fe7b1d7f0789e3260e409.zip FreeBSD-src-ad18fb995c808a63951fe7b1d7f0789e3260e409.tar.gz |
Overhaul of kerberos5/ makefiles. Most significant changes are:
- Dropped support for standalone builds, this was only partially
supported anyway, and required so much magic in makefiles that
made life dangerous (e.g., by using the custom yacc rules).
- Got rid of .OBJDIR in makefiles -- makes building of individual
files possible again.
- Made the .x.c transformations -j safe.
- Reprogrammed LDADD to fix static build of some utilities that
was broken.
- Fixed LDFLAGS and DPADD in the WITH_OPENLDAP case -- positively
affects the contents of .depend files.
- Removed redundant .h's from SRCS, only kept those that are
generated.
- libkrb5/ INCS were bogusly installed again with libgssapi/.
- Made build-tools real tools with their own makefiles in
separate directories. This allows us to properly track
their dependencies, etc.
- Faster build, 21% less of makefile code!
Approved by: nectar
Reviewed by: markm
Silence on: arch
Diffstat (limited to 'kerberos5/usr.bin')
-rw-r--r-- | kerberos5/usr.bin/Makefile | 2 | ||||
-rw-r--r-- | kerberos5/usr.bin/kadmin/Makefile | 39 | ||||
-rw-r--r-- | kerberos5/usr.bin/kdestroy/Makefile | 19 | ||||
-rw-r--r-- | kerberos5/usr.bin/kinit/Makefile | 19 | ||||
-rw-r--r-- | kerberos5/usr.bin/klist/Makefile | 19 | ||||
-rw-r--r-- | kerberos5/usr.bin/kpasswd/Makefile | 14 | ||||
-rw-r--r-- | kerberos5/usr.bin/krb5-config/Makefile | 1 | ||||
-rw-r--r-- | kerberos5/usr.bin/ksu/Makefile | 24 | ||||
-rw-r--r-- | kerberos5/usr.bin/verify_krb5_conf/Makefile | 15 |
9 files changed, 27 insertions, 125 deletions
diff --git a/kerberos5/usr.bin/Makefile b/kerberos5/usr.bin/Makefile index b7c3980..737f13e8 100644 --- a/kerberos5/usr.bin/Makefile +++ b/kerberos5/usr.bin/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SUBDIR= kadmin kdestroy kinit klist kpasswd ksu krb5-config \ +SUBDIR= kadmin kdestroy kinit klist kpasswd krb5-config ksu \ verify_krb5_conf .include <bsd.subdir.mk> diff --git a/kerberos5/usr.bin/kadmin/Makefile b/kerberos5/usr.bin/kadmin/Makefile index 8e9c568..68532c5 100644 --- a/kerberos5/usr.bin/kadmin/Makefile +++ b/kerberos5/usr.bin/kadmin/Makefile @@ -16,55 +16,28 @@ SRCS= \ mod.c \ rename.c \ util.c \ - random_password.c \ - kadmin_locl.h \ - ${.OBJDIR}/krb5_err.h \ - ${.OBJDIR}/heim_err.h \ - ${.OBJDIR}/hdb_err.h \ - ${.OBJDIR}/kadm5/private.h \ - ${.OBJDIR}/kadm5/admin.h \ - ${.OBJDIR}/kadm5/kadm5_err.h + random_password.c -CFLAGS+=-I${KRB5DIR}/include \ - -I${KRB5DIR}/lib/roken \ +CFLAGS+=-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} \ ${LDAPCFLAGS} LDADD= -lkadm5clnt -lkadm5srv -lkrb5 -lroken \ ${LIBVERS} -lhdb -lasn1 \ -lcrypto -lcrypt -lcom_err \ - ${LIBSL} -lreadline -lcurses ${LDAPLDADD} + ${LIBSL} -lreadline -lncurses ${LDAPLDADD} + +LDFLAGS=${LDAPLDFLAGS} DPADD= ${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBKRB5} ${LIBROKEN} \ ${LIBVERS} ${LIBHDB} ${LIBASN1} \ ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \ - ${LIBSL} ${LIBREADLINE} ${LIBCURSES} ${LDAPLIBS} + ${LIBSL} ${LIBREADLINE} ${LIBNCURSES} ${LDAPDPADD} MAN= kadmin.8 .include <bsd.prog.mk> .PATH: ${KRB5DIR}/kadmin - -${.OBJDIR}/kadm5/private.h: ${.OBJDIR}/kadm5 - cat ${KRB5DIR}/lib/kadm5/private.h > ${.TARGET} - -${.OBJDIR}/kadm5/admin.h: ${.OBJDIR}/kadm5 - cat ${KRB5DIR}/lib/kadm5/admin.h > ${.TARGET} - -${.OBJDIR}/kadm5/kadm5_err.h: ${.OBJDIR}/kadm5 ${.OBJDIR}/kadm5_err.h - cd ${.OBJDIR}/kadm5 && ln -sf ../kadm5_err.h - -${.OBJDIR}/kadm5: - mkdir ${.TARGET} - -CLEANFILES+= kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h -CLEANDIRS+= kadm5 diff --git a/kerberos5/usr.bin/kdestroy/Makefile b/kerberos5/usr.bin/kdestroy/Makefile index 1ba10cf..06006e4 100644 --- a/kerberos5/usr.bin/kdestroy/Makefile +++ b/kerberos5/usr.bin/kdestroy/Makefile @@ -2,25 +2,12 @@ PROG= kdestroy -SRCS= \ - kdestroy.c \ - ${.OBJDIR}/krb5_err.h \ - ${.OBJDIR}/heim_err.h \ - ${.OBJDIR}/k524_err.h +CFLAGS+=-I${KRB5DIR}/lib/roken -CFLAGS+=-I${KRB5DIR}/include \ - -I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/lib/kafs \ - -I${KRB5DIR}/lib/krb5 \ - -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/kuser \ - -I${ASN1OBJDIR} \ - -I${.OBJDIR} - -LDADD= -lkrb5 -lroken -lkafs5 ${LIBVERS} \ +LDADD= -lkafs5 -lkrb5 -lroken ${LIBVERS} \ -lasn1 -lcrypto -lcrypt -lcom_err -DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBKAFS5} ${LIBVERS} \ +DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} .include <bsd.prog.mk> diff --git a/kerberos5/usr.bin/kinit/Makefile b/kerberos5/usr.bin/kinit/Makefile index 222b6c4..913c83f 100644 --- a/kerberos5/usr.bin/kinit/Makefile +++ b/kerberos5/usr.bin/kinit/Makefile @@ -2,25 +2,12 @@ PROG= kinit -SRCS= kinit.c \ - ${.OBJDIR}/asn1_err.h \ - ${.OBJDIR}/krb5_err.h \ - ${.OBJDIR}/heim_err.h \ - ${.OBJDIR}/k524_err.h +CFLAGS+=-I${KRB5DIR}/lib/roken -CFLAGS+=-I${KRB5DIR}/include \ - -I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/lib/kafs \ - -I${KRB5DIR}/lib/krb5 \ - -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/kuser \ - -I${ASN1OBJDIR} \ - -I${.OBJDIR} - -LDADD= -lkrb5 -lroken -lkafs5 ${LIBVERS} \ +LDADD= -lkafs5 -lkrb5 -lroken ${LIBVERS} \ -lasn1 -lcrypto -lcrypt -lcom_err -DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBKAFS5} ${LIBVERS} \ +DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} .include <bsd.prog.mk> diff --git a/kerberos5/usr.bin/klist/Makefile b/kerberos5/usr.bin/klist/Makefile index 495c7e1..b113aa7 100644 --- a/kerberos5/usr.bin/klist/Makefile +++ b/kerberos5/usr.bin/klist/Makefile @@ -2,25 +2,12 @@ PROG= klist -SRCS= \ - klist.c \ - ${.OBJDIR}/krb5_err.h \ - ${.OBJDIR}/heim_err.h \ - ${.OBJDIR}/k524_err.h +CFLAGS+=-I${KRB5DIR}/lib/roken -CFLAGS+=-I${KRB5DIR}/include \ - -I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/lib/kafs \ - -I${KRB5DIR}/lib/krb5 \ - -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/kuser \ - -I${ASN1OBJDIR} \ - -I${.OBJDIR} - -LDADD= -lkrb5 -lroken -lkafs5 ${LIBVERS} \ +LDADD= -lkafs5 -lkrb5 -lroken ${LIBVERS} \ -lasn1 -lcrypto -lcrypt -lcom_err -DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBKAFS5} ${LIBVERS} \ +DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} .include <bsd.prog.mk> diff --git a/kerberos5/usr.bin/kpasswd/Makefile b/kerberos5/usr.bin/kpasswd/Makefile index 32e7a83..dbb7557 100644 --- a/kerberos5/usr.bin/kpasswd/Makefile +++ b/kerberos5/usr.bin/kpasswd/Makefile @@ -2,19 +2,7 @@ PROG= kpasswd -SRCS= \ - kpasswd.c \ - ${.OBJDIR}/krb5_err.h \ - ${.OBJDIR}/heim_err.h \ - ${.OBJDIR}/k524_err.h - -CFLAGS+=-I${KRB5DIR}/include \ - -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/lib/krb5 \ - -I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/kpasswd \ - -I${ASN1OBJDIR} \ - -I${.OBJDIR} +CFLAGS+=-I${KRB5DIR}/lib/roken LDADD= -lkrb5 -lroken ${LIBVERS} \ -lasn1 -lcrypto -lcrypt -lcom_err diff --git a/kerberos5/usr.bin/krb5-config/Makefile b/kerberos5/usr.bin/krb5-config/Makefile index 4551c34..e1bc4ff 100644 --- a/kerberos5/usr.bin/krb5-config/Makefile +++ b/kerberos5/usr.bin/krb5-config/Makefile @@ -19,7 +19,6 @@ krb5-config: krb5-config.in -e "s,@LIBS\@,-lcom_err,g" \ -e "s,@INCLUDE_des@,,g" \ ${.ALLSRC} > ${.TARGET} - chmod +x ${.TARGET} .include <bsd.prog.mk> diff --git a/kerberos5/usr.bin/ksu/Makefile b/kerberos5/usr.bin/ksu/Makefile index 15fd25d..43391d9 100644 --- a/kerberos5/usr.bin/ksu/Makefile +++ b/kerberos5/usr.bin/ksu/Makefile @@ -2,26 +2,14 @@ PROG= ksu -SRCS= \ - su.c \ - ${.OBJDIR}/asn1_err.h \ - ${.OBJDIR}/krb5_err.h \ - ${.OBJDIR}/heim_err.h \ - ${.OBJDIR}/k524_err.h - -CFLAGS+=-I${KRB5DIR}/include \ - -I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/lib/kafs \ - -I${KRB5DIR}/lib/krb5 \ - -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/kuser \ - -I${ASN1OBJDIR} \ - -I${.OBJDIR} - -LDADD= -lkrb5 -lroken -lkafs5 ${LIBVERS} \ +SRCS= su.c + +CFLAGS+=-I${KRB5DIR}/lib/roken + +LDADD= -lkafs5 -lkrb5 -lroken ${LIBVERS} \ -lasn1 -lcrypto -lcrypt -lcom_err -DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBKAFS5} ${LIBVERS} \ +DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} NOMAN= true diff --git a/kerberos5/usr.bin/verify_krb5_conf/Makefile b/kerberos5/usr.bin/verify_krb5_conf/Makefile index cd0dc7a..c3c4183 100644 --- a/kerberos5/usr.bin/verify_krb5_conf/Makefile +++ b/kerberos5/usr.bin/verify_krb5_conf/Makefile @@ -2,21 +2,14 @@ PROG= verify_krb5_conf -SRCS= verify_krb5_conf.c - -CFLAGS+=-I${KRB5DIR}/include \ - -I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/lib/kafs \ +CFLAGS+=-I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/lib/krb5 \ - -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/kuser \ - -I${ASN1OBJDIR} \ - -I${.OBJDIR} + -I${KRB5DIR}/lib/asn1 -LDADD= -lkrb5 -lroken -lkafs5 ${LIBVERS} \ +LDADD= -lkafs5 -lkrb5 -lroken ${LIBVERS} \ -lasn1 -lcrypto -lcrypt -lcom_err -DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBKAFS5} ${LIBVERS} \ +DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} MAN= verify_krb5_conf.8 |