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.sbin/ktutil | |
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.sbin/ktutil')
-rw-r--r-- | kerberos5/usr.sbin/ktutil/Makefile | 38 |
1 files changed, 5 insertions, 33 deletions
diff --git a/kerberos5/usr.sbin/ktutil/Makefile b/kerberos5/usr.sbin/ktutil/Makefile index 2f70adf..355d670 100644 --- a/kerberos5/usr.sbin/ktutil/Makefile +++ b/kerberos5/usr.sbin/ktutil/Makefile @@ -11,49 +11,21 @@ SRCS= \ list.c \ purge.c \ remove.c \ - rename.c \ - ${.OBJDIR}/kadm5/private.h \ - ${.OBJDIR}/kadm5/admin.h \ - ${.OBJDIR}/kadm5/kadm5_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/krb5 \ - -I${KRB5DIR}/lib/asn1 \ + rename.c + +CFLAGS+= -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/lib/sl \ - -I${KRB5DIR}/lib/kadm5 \ - -I${KRB5DIR}/admin \ - -I${ASN1OBJDIR} \ - -I${.OBJDIR} LDADD= -lkadm5clnt -lkrb5 -lroken ${LIBVERS} \ ${LIBSL} -lasn1 -lcrypto -lcrypt -lcom_err \ - -lreadline -lcurses + -lreadline -lncurses DPADD= ${LIBKADM5CLNT} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ ${LIBSL} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \ - ${LIBREADLINE} ${LIBCURSES} + ${LIBREADLINE} ${LIBNCURSES} MAN= ktutil.8 .include <bsd.prog.mk> .PATH: ${KRB5DIR}/admin - -${.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 |