diff options
author | markm <markm@FreeBSD.org> | 2003-07-18 13:21:58 +0000 |
---|---|---|
committer | markm <markm@FreeBSD.org> | 2003-07-18 13:21:58 +0000 |
commit | 522acafcec81cffcf59023810c4d1aaf993e9523 (patch) | |
tree | e4ab7a15fc814ecddfc47d6ca2e6a4d349c00031 /kerberos5/usr.sbin | |
parent | 50a6550a0f5f689cfc020096581e64a446d8dd52 (diff) | |
download | FreeBSD-src-522acafcec81cffcf59023810c4d1aaf993e9523.zip FreeBSD-src-522acafcec81cffcf59023810c4d1aaf993e9523.tar.gz |
Big fixup of the makefiles. Sort out the dependancies so that "make"
without "make depend" works, "make -j N" works, and lists of source
files are made vertical to reduce future diffs.
Diffstat (limited to 'kerberos5/usr.sbin')
-rw-r--r-- | kerberos5/usr.sbin/kstash/Makefile | 41 | ||||
-rw-r--r-- | kerberos5/usr.sbin/ktutil/Makefile | 24 |
2 files changed, 39 insertions, 26 deletions
diff --git a/kerberos5/usr.sbin/kstash/Makefile b/kerberos5/usr.sbin/kstash/Makefile index 557e48f..461d054 100644 --- a/kerberos5/usr.sbin/kstash/Makefile +++ b/kerberos5/usr.sbin/kstash/Makefile @@ -1,22 +1,29 @@ # $FreeBSD$ -PROG= kstash -SRCS= kstash.c hdb_err.h -CFLAGS+= -I${KRB5DIR}/include \ - -I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/lib/krb5 \ - -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/lib/hdb \ - -I${KRB5DIR}/kdc \ - -I${ASN1OBJDIR} \ - -I${HDBOBJDIR} \ - -I${.OBJDIR} \ - ${LDAPCFLAGS} -LDADD= -lhdb -lkrb5 -lroken ${LIBVERS} \ - -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} -DPADD= ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS} -MAN= kstash.8 +PROG= kstash + +SRCS= \ + kstash.c \ + ${.OBJDIR}/hdb_err.h + +CFLAGS+=-I${KRB5DIR}/include \ + -I${KRB5DIR}/lib/roken \ + -I${KRB5DIR}/lib/krb5 \ + -I${KRB5DIR}/lib/asn1 \ + -I${KRB5DIR}/lib/hdb \ + -I${KRB5DIR}/kdc \ + -I${ASN1OBJDIR} \ + -I${HDBOBJDIR} \ + -I${.OBJDIR} \ + ${LDAPCFLAGS} + +LDADD= -lhdb -lkrb5 -lroken ${LIBVERS} \ + -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} + +DPADD= ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ + ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS} + +MAN= kstash.8 .include <bsd.prog.mk> diff --git a/kerberos5/usr.sbin/ktutil/Makefile b/kerberos5/usr.sbin/ktutil/Makefile index 5f2e5ee..2f70adf 100644 --- a/kerberos5/usr.sbin/ktutil/Makefile +++ b/kerberos5/usr.sbin/ktutil/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ PROG= ktutil + SRCS= \ add.c \ change.c \ @@ -10,11 +11,13 @@ SRCS= \ list.c \ purge.c \ remove.c \ - rename.c \ - kadm5/private.h \ - kadm5/admin.h \ - kadm5/kadm5_err.h \ - krb5_err.h heim_err.h k524_err.h + 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 \ @@ -25,28 +28,31 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/admin \ -I${ASN1OBJDIR} \ -I${.OBJDIR} + LDADD= -lkadm5clnt -lkrb5 -lroken ${LIBVERS} \ ${LIBSL} -lasn1 -lcrypto -lcrypt -lcom_err \ -lreadline -lcurses + DPADD= ${LIBKADM5CLNT} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ ${LIBSL} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \ ${LIBREADLINE} ${LIBCURSES} + MAN= ktutil.8 .include <bsd.prog.mk> .PATH: ${KRB5DIR}/admin -kadm5/private.h: kadm5 +${.OBJDIR}/kadm5/private.h: ${.OBJDIR}/kadm5 cat ${KRB5DIR}/lib/kadm5/private.h > ${.TARGET} -kadm5/admin.h: kadm5 +${.OBJDIR}/kadm5/admin.h: ${.OBJDIR}/kadm5 cat ${KRB5DIR}/lib/kadm5/admin.h > ${.TARGET} -kadm5/kadm5_err.h: kadm5 kadm5_err.h +${.OBJDIR}/kadm5/kadm5_err.h: ${.OBJDIR}/kadm5 ${.OBJDIR}/kadm5_err.h cd ${.OBJDIR}/kadm5 && ln -sf ../kadm5_err.h -kadm5: +${.OBJDIR}/kadm5: mkdir ${.TARGET} CLEANFILES+= kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h |