diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 2012-05-30 22:21:25 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 2012-05-30 22:21:25 +0000 |
| commit | 614304eccc6c03f52b57e8b3a4814b3930f7519b (patch) | |
| tree | df0f27f031cb10f54a5cc334b0cb952fdfae0a0c /kerberos5/usr.bin | |
| parent | 47f1d92787e6c10ffafc80d427a4ae644f9be5c9 (diff) | |
| download | src-614304eccc6c03f52b57e8b3a4814b3930f7519b.tar.gz src-614304eccc6c03f52b57e8b3a4814b3930f7519b.zip | |
* Remove headers from SRCS that are not generated
(and are in /usr/src/crypto/heimdal/).
* Avoid race conditions with 'make -j<N>'.
Notes
Notes:
svn path=/head/; revision=236337
Diffstat (limited to 'kerberos5/usr.bin')
| -rw-r--r-- | kerberos5/usr.bin/hxtool/Makefile | 6 | ||||
| -rw-r--r-- | kerberos5/usr.bin/kadmin/Makefile | 6 | ||||
| -rw-r--r-- | kerberos5/usr.bin/kcc/Makefile | 6 | ||||
| -rw-r--r-- | kerberos5/usr.bin/kf/Makefile | 1 | ||||
| -rw-r--r-- | kerberos5/usr.bin/string2key/Makefile | 1 |
5 files changed, 15 insertions, 5 deletions
diff --git a/kerberos5/usr.bin/hxtool/Makefile b/kerberos5/usr.bin/hxtool/Makefile index c40f009380f1..92268c01a0c4 100644 --- a/kerberos5/usr.bin/hxtool/Makefile +++ b/kerberos5/usr.bin/hxtool/Makefile @@ -10,9 +10,13 @@ DPADD= ${LIBHX509} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBSL} ${LI LDADD= -lhx509 -lroken -lasn1 -lcrypto -lcrypt ${LIBSL} ${LIBVERS} -ledit SRCS= hxtool.c hxtool-commands.c hxtool-commands.h -hxtool-commands.c hxtool-commands.h: hxtool-commands.in +hxtool-commands.h: hxtool-commands.in slc ${.ALLSRC:M*.in} +.for ext in c o +hxtool-commands.${ext}: hxtool-commands.h +.endfor + .include <bsd.prog.mk> .PATH: ${KRB5DIR}/lib/hx509 diff --git a/kerberos5/usr.bin/kadmin/Makefile b/kerberos5/usr.bin/kadmin/Makefile index d0f8ed19000f..637ce7f8b201 100644 --- a/kerberos5/usr.bin/kadmin/Makefile +++ b/kerberos5/usr.bin/kadmin/Makefile @@ -38,8 +38,12 @@ LDFLAGS=${LDAPLDFLAGS} .include <bsd.prog.mk> -kadmin-commands.c kadmin-commands.h: ${KRB5DIR}/kadmin/kadmin-commands.in +kadmin-commands.h: ${KRB5DIR}/kadmin/kadmin-commands.in slc ${.ALLSRC:M*.in} +.for ext in o c +kadmin-commands.${ext}: kadmin-commands.h +.endfor + .PATH: ${KRB5DIR}/kadmin diff --git a/kerberos5/usr.bin/kcc/Makefile b/kerberos5/usr.bin/kcc/Makefile index d690b32fe4cb..f1d053c69e28 100644 --- a/kerberos5/usr.bin/kcc/Makefile +++ b/kerberos5/usr.bin/kcc/Makefile @@ -19,9 +19,13 @@ SRCS= kcc.c \ kswitch.c \ copy_cred_cache.c -kcc-commands.c kcc-commands.h: kcc-commands.in +kcc-commands.h: kcc-commands.in slc ${.ALLSRC:M*.in} +.for ext in c o +kcc-commands.${ext}: kcc-commands.h +.endfor + .include <bsd.prog.mk> .PATH: ${KRB5DIR}/kuser diff --git a/kerberos5/usr.bin/kf/Makefile b/kerberos5/usr.bin/kf/Makefile index 0a1ccec20fe2..c9d3fceb14f8 100644 --- a/kerberos5/usr.bin/kf/Makefile +++ b/kerberos5/usr.bin/kf/Makefile @@ -2,7 +2,6 @@ PROG= kf MAN= kf.1 -SRCS= kf.c kf_locl.h CFLAGS+= -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/roken DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \ diff --git a/kerberos5/usr.bin/string2key/Makefile b/kerberos5/usr.bin/string2key/Makefile index 25204fd3a121..fc790e24dd88 100644 --- a/kerberos5/usr.bin/string2key/Makefile +++ b/kerberos5/usr.bin/string2key/Makefile @@ -10,7 +10,6 @@ CFLAGS+= -I${KRB5DIR}/kdc \ DPADD= ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \ ${LIBCRYPT} ${LIBVERS} LDADD= -lhdb -lkrb5 -lroken -lasn1 -lcrypto -lcrypt ${LIBVERS} -SRCS= string2key.c headers.h .include <bsd.prog.mk> |