From ad18fb995c808a63951fe7b1d7f0789e3260e409 Mon Sep 17 00:00:00 2001 From: ru Date: Sat, 31 Jan 2004 08:15:57 +0000 Subject: 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 --- kerberos5/usr.bin/klist/Makefile | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) (limited to 'kerberos5/usr.bin/klist') 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 -- cgit v1.1