Date: Wed, 30 May 2012 22:21:25 +0000 (UTC) From: "David E. O'Brien" <obrien@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r236337 - in head/kerberos5: lib/libgssapi_krb5 lib/libgssapi_ntlm lib/libgssapi_spnego lib/libhdb lib/libheimbase lib/libheimipcc lib/libheimipcs lib/libhx509 lib/libkadm5clnt lib/libk... Message-ID: <201205302221.q4UMLPlw083444@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: obrien Date: Wed May 30 22:21:25 2012 New Revision: 236337 URL: http://svn.freebsd.org/changeset/base/236337 Log: * Remove headers from SRCS that are not generated (and are in /usr/src/crypto/heimdal/). * Avoid race conditions with 'make -j<N>'. Modified: head/kerberos5/lib/libgssapi_krb5/Makefile head/kerberos5/lib/libgssapi_ntlm/Makefile head/kerberos5/lib/libgssapi_spnego/Makefile head/kerberos5/lib/libhdb/Makefile head/kerberos5/lib/libheimbase/Makefile head/kerberos5/lib/libheimipcc/Makefile head/kerberos5/lib/libheimipcs/Makefile head/kerberos5/lib/libhx509/Makefile head/kerberos5/lib/libkadm5clnt/Makefile head/kerberos5/lib/libkadm5srv/Makefile head/kerberos5/lib/libkafs5/Makefile head/kerberos5/lib/libkdc/Makefile head/kerberos5/lib/libkrb5/Makefile head/kerberos5/lib/libvers/Makefile head/kerberos5/libexec/hprop/Makefile head/kerberos5/libexec/kadmind/Makefile head/kerberos5/libexec/kcm/Makefile head/kerberos5/libexec/kdigest/Makefile head/kerberos5/libexec/kfd/Makefile head/kerberos5/tools/asn1_compile/Makefile head/kerberos5/usr.bin/hxtool/Makefile head/kerberos5/usr.bin/kadmin/Makefile head/kerberos5/usr.bin/kcc/Makefile head/kerberos5/usr.bin/kf/Makefile head/kerberos5/usr.bin/string2key/Makefile head/kerberos5/usr.sbin/iprop-log/Makefile head/kerberos5/usr.sbin/ktutil/Makefile Modified: head/kerberos5/lib/libgssapi_krb5/Makefile ============================================================================== --- head/kerberos5/lib/libgssapi_krb5/Makefile Wed May 30 21:28:37 2012 (r236336) +++ head/kerberos5/lib/libgssapi_krb5/Makefile Wed May 30 22:21:25 2012 (r236337) @@ -38,8 +38,6 @@ SRCS= 8003.c \ get_mic.c \ gkrb5_err.c \ gkrb5_err.h \ - gsskrb5-private.h \ - gsskrb5_locl.h \ import_name.c \ import_sec_context.c \ indicate_mechs.c \ Modified: head/kerberos5/lib/libgssapi_ntlm/Makefile ============================================================================== --- head/kerberos5/lib/libgssapi_ntlm/Makefile Wed May 30 21:28:37 2012 (r236336) +++ head/kerberos5/lib/libgssapi_ntlm/Makefile Wed May 30 22:21:25 2012 (r236337) @@ -21,8 +21,6 @@ SRCS= accept_sec_context.c \ export_name.c \ export_sec_context.c \ external.c \ - ntlm.h \ - ntlm-private.h \ import_name.c \ import_sec_context.c \ indicate_mechs.c \ Modified: head/kerberos5/lib/libgssapi_spnego/Makefile ============================================================================== --- head/kerberos5/lib/libgssapi_spnego/Makefile Wed May 30 21:28:37 2012 (r236336) +++ head/kerberos5/lib/libgssapi_spnego/Makefile Wed May 30 22:21:25 2012 (r236337) @@ -13,9 +13,6 @@ SRCS= accept_sec_context.c \ external.c \ init_sec_context.c \ freebsd_compat.c \ - spnego-private.h \ - spnego_locl.h \ - spnego_asn1.h \ ${GEN:S/.x$/.c/:S/.hx$/.h/} \ gss_oid.c Modified: head/kerberos5/lib/libhdb/Makefile ============================================================================== --- head/kerberos5/lib/libhdb/Makefile Wed May 30 21:28:37 2012 (r236336) +++ head/kerberos5/lib/libhdb/Makefile Wed May 30 22:21:25 2012 (r236337) @@ -48,8 +48,6 @@ SRCS= common.c \ hdb-sqlite.c \ hdb-keytab.c \ hdb-mitdb.c \ - hdb_locl.h \ - hdb-private.h \ keys.c \ keytab.c \ mkey.c \ Modified: head/kerberos5/lib/libheimbase/Makefile ============================================================================== --- head/kerberos5/lib/libheimbase/Makefile Wed May 30 21:28:37 2012 (r236336) +++ head/kerberos5/lib/libheimbase/Makefile Wed May 30 22:21:25 2012 (r236337) @@ -9,12 +9,9 @@ INCS= heimbase.h SRCS= \ array.c \ - baselocl.h \ bool.c \ dict.c \ heimbase.c \ - heimbasepriv.h \ - heimqueue.h \ null.c \ number.c \ string.c Modified: head/kerberos5/lib/libheimipcc/Makefile ============================================================================== --- head/kerberos5/lib/libheimipcc/Makefile Wed May 30 21:28:37 2012 (r236336) +++ head/kerberos5/lib/libheimipcc/Makefile Wed May 30 22:21:25 2012 (r236337) @@ -5,8 +5,7 @@ INTERNALLIB= LDADD= -lheimbase -lroken -lpthread DPADD= ${LIBHEIMBASE} ${LIBROKEN} ${LIBPTHREAD} -SRCS= hi_locl.h \ - heim_ipc_types.h \ +SRCS= \ client.c \ common.c Modified: head/kerberos5/lib/libheimipcs/Makefile ============================================================================== --- head/kerberos5/lib/libheimipcs/Makefile Wed May 30 21:28:37 2012 (r236336) +++ head/kerberos5/lib/libheimipcs/Makefile Wed May 30 22:21:25 2012 (r236337) @@ -6,8 +6,7 @@ LDADD= -lheimbase -lroken LDFLAGS= -pthread DPADD= ${LIBHEIMBASE} ${LIBROKEN} -SRCS= hi_locl.h \ - heim_ipc_types.h \ +SRCS= \ server.c \ common.c Modified: head/kerberos5/lib/libhx509/Makefile ============================================================================== --- head/kerberos5/lib/libhx509/Makefile Wed May 30 21:28:37 2012 (r236336) +++ head/kerberos5/lib/libhx509/Makefile Wed May 30 22:21:25 2012 (r236337) @@ -176,7 +176,6 @@ INCS= hx509-private.h \ SRCS= ca.c \ cert.c \ - char_map.h \ cms.c \ collector.c \ crypto.c \ @@ -184,12 +183,7 @@ SRCS= ca.c \ error.c \ env.c \ file.c \ - hx509-private.h \ - hx509-protos.h \ - hx509.h \ - hx_locl.h \ sel.c \ - sel.h \ sel-gram.y \ sel-lex.l \ keyset.c \ @@ -205,7 +199,6 @@ SRCS= ca.c \ peer.c \ print.c \ softp11.c \ - ref/pkcs11.h \ req.c \ revoke.c Modified: head/kerberos5/lib/libkadm5clnt/Makefile ============================================================================== --- head/kerberos5/lib/libkadm5clnt/Makefile Wed May 30 21:28:37 2012 (r236336) +++ head/kerberos5/lib/libkadm5clnt/Makefile Wed May 30 22:21:25 2012 (r236337) @@ -26,17 +26,14 @@ SRCS= ad.c \ get_c.c \ get_princs_c.c \ init_c.c \ - kadm5_locl.h \ kadm5_err.c \ kadm5_err.h \ marshall.c \ modify_c.c \ - private.h \ privs_c.c \ randkey_c.c \ rename_c.c \ - send_recv.c \ - admin.h + send_recv.c CFLAGS+=-I${KRB5DIR}/lib/kadm5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken -I. Modified: head/kerberos5/lib/libkadm5srv/Makefile ============================================================================== --- head/kerberos5/lib/libkadm5srv/Makefile Wed May 30 21:28:37 2012 (r236336) +++ head/kerberos5/lib/libkadm5srv/Makefile Wed May 30 22:21:25 2012 (r236337) @@ -8,8 +8,6 @@ VERSION_MAP= ${KRB5DIR}/lib/kadm5/versio MAN= kadm5_pwcheck.3 SRCS= acl.c \ - admin.h \ - admin.h \ bump_pw_expire.c \ chpass_s.c \ common_glue.c \ @@ -26,13 +24,11 @@ SRCS= acl.c \ init_s.c \ kadm5_err.c \ kadm5_err.h \ - kadm5_locl.h \ keys.c \ log.c \ marshall.c \ modify_s.c \ password_quality.c \ - private.h \ privs_s.c \ randkey_s.c \ rename_s.c \ Modified: head/kerberos5/lib/libkafs5/Makefile ============================================================================== --- head/kerberos5/lib/libkafs5/Makefile Wed May 30 21:28:37 2012 (r236336) +++ head/kerberos5/lib/libkafs5/Makefile Wed May 30 22:21:25 2012 (r236337) @@ -26,10 +26,8 @@ MLINKS= kafs5.3 k_afs_cell_of_file.3 \ SRCS= afssys.c afskrb5.c common.c krb5_err.h SRCS= afssys.c \ afskrb5.c \ - common.c \ - kafs_locl.h \ - afssysdefs.h \ - roken_rename.h + common.c + CFLAGS+= -I${KRB5DIR}/lib/kafs \ -I${KRB5DIR}/lib/krb5 \ -I${.OBJDIR}/../libkrb5/ \ Modified: head/kerberos5/lib/libkdc/Makefile ============================================================================== --- head/kerberos5/lib/libkdc/Makefile Wed May 30 21:28:37 2012 (r236336) +++ head/kerberos5/lib/libkdc/Makefile Wed May 30 22:21:25 2012 (r236337) @@ -14,12 +14,10 @@ KRB5INCS= windc_plugin.h KRB5INCSDIR= ${INCLUDEDIR}/krb5 INCSGROUPS= INCS KRB5INCS -SRCS= kdc-private.h \ - kdc-protos.h \ +SRCS= \ default_config.c \ set_dbinfo.c \ digest.c \ - kdc_locl.h\ kerberos5.c \ krb5tgs.c \ pkinit.c \ @@ -27,8 +25,7 @@ SRCS= kdc-private.h \ misc.c \ kx509.c \ process.c \ - windc.c \ - rx.h + windc.c CFLAGS+= -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/lib/krb5 \ Modified: head/kerberos5/lib/libkrb5/Makefile ============================================================================== --- head/kerberos5/lib/libkrb5/Makefile Wed May 30 21:28:37 2012 (r236336) +++ head/kerberos5/lib/libkrb5/Makefile Wed May 30 22:21:25 2012 (r236337) @@ -531,7 +531,6 @@ SRCS= acache.c \ crypto-pk.c \ crypto-rand.c \ crypto.c \ - crypto.h \ data.c \ deprecated.c \ digest.c \ @@ -562,8 +561,6 @@ SRCS= acache.c \ keytab_file.c \ keytab_keyfile.c \ keytab_memory.c \ - krb5-v4compat.h \ - krb5_locl.h \ krbhst.c \ kuserok.c \ log.c \ Modified: head/kerberos5/lib/libvers/Makefile ============================================================================== --- head/kerberos5/lib/libvers/Makefile Wed May 30 21:28:37 2012 (r236336) +++ head/kerberos5/lib/libvers/Makefile Wed May 30 22:21:25 2012 (r236337) @@ -5,7 +5,7 @@ INTERNALLIB= SRCS= print_version.c roken.h CFLAGS+=-I. -I${KRB5DIR}/lib/roken -CLEANFILES= roken.h print_version.h +CLEANFILES= roken.h MAKE_ROKEN= make-roken Modified: head/kerberos5/libexec/hprop/Makefile ============================================================================== --- head/kerberos5/libexec/hprop/Makefile Wed May 30 21:28:37 2012 (r236336) +++ head/kerberos5/libexec/hprop/Makefile Wed May 30 22:21:25 2012 (r236337) @@ -2,7 +2,7 @@ PROG= hprop MAN= hprop.8 -SRCS= hprop.c mit_dump.c hprop.h +SRCS= hprop.c mit_dump.c CFLAGS+=-I${KRB5DIR}/lib/roken CFLAGS+=-I${KRB5DIR}/lib/krb5 CFLAGS+=-I${KRB5DIR}/lib/asn1 Modified: head/kerberos5/libexec/kadmind/Makefile ============================================================================== --- head/kerberos5/libexec/kadmind/Makefile Wed May 30 21:28:37 2012 (r236336) +++ head/kerberos5/libexec/kadmind/Makefile Wed May 30 22:21:25 2012 (r236337) @@ -5,7 +5,6 @@ MAN= kadmind.8 SRCS= rpc.c \ server.c \ kadmind.c \ - kadmin_locl.h \ kadm_conn.c CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \ Modified: head/kerberos5/libexec/kcm/Makefile ============================================================================== --- head/kerberos5/libexec/kcm/Makefile Wed May 30 21:28:37 2012 (r236336) +++ head/kerberos5/libexec/kcm/Makefile Wed May 30 22:21:25 2012 (r236337) @@ -11,9 +11,6 @@ SRCS= acl.c \ connect.c \ events.c \ glue.c \ - headers.h \ - kcm_locl.h \ - kcm-protos.h \ log.c \ main.c \ protocol.c \ Modified: head/kerberos5/libexec/kdigest/Makefile ============================================================================== --- head/kerberos5/libexec/kdigest/Makefile Wed May 30 21:28:37 2012 (r236336) +++ head/kerberos5/libexec/kdigest/Makefile Wed May 30 22:21:25 2012 (r236337) @@ -13,9 +13,13 @@ SRCS= kdigest.c \ kdigest-commands.c \ kdigest-commands.h -kdigest-commands.c kdigest-commands.h: kdigest-commands.in +kdigest-commands.h: kdigest-commands.in slc ${.ALLSRC:M*.in} +.for ext in c o +kdigest-commands.${ext}: kdigest-commands.h +.endfor + .include <bsd.prog.mk> .PATH: ${KRB5DIR}/kuser Modified: head/kerberos5/libexec/kfd/Makefile ============================================================================== --- head/kerberos5/libexec/kfd/Makefile Wed May 30 21:28:37 2012 (r236336) +++ head/kerberos5/libexec/kfd/Makefile Wed May 30 22:21:25 2012 (r236337) @@ -2,7 +2,6 @@ PROG= kfd MAN= kfd.8 -SRCS= kfd.c kf_locl.h CFLAGS+= -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/roken DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \ Modified: head/kerberos5/tools/asn1_compile/Makefile ============================================================================== --- head/kerberos5/tools/asn1_compile/Makefile Wed May 30 21:28:37 2012 (r236336) +++ head/kerberos5/tools/asn1_compile/Makefile Wed May 30 22:21:25 2012 (r236337) @@ -6,9 +6,8 @@ LIBROKEN_A= ${.OBJDIR}/../../lib/libroke LDADD= ${LIBROKEN_A} ${LIBVERS} DPADD= ${LIBROKEN_A} ${LIBVERS} -SRCS= asn1_queue.h \ +SRCS= \ asn1parse.y \ - der.h \ gen.c \ gen_copy.c \ gen_decode.c \ @@ -16,18 +15,13 @@ SRCS= asn1_queue.h \ gen_free.c \ gen_glue.c \ gen_length.c \ - gen_locl.h \ gen_seq.c \ gen_template.c \ hash.c \ - hash.h \ lex.l \ - lex.h \ main.c \ - asn1-template.h \ roken.h \ - symbol.c \ - symbol.h + symbol.c CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/asn1 -I. Modified: head/kerberos5/usr.bin/hxtool/Makefile ============================================================================== --- head/kerberos5/usr.bin/hxtool/Makefile Wed May 30 21:28:37 2012 (r236336) +++ head/kerberos5/usr.bin/hxtool/Makefile Wed May 30 22:21:25 2012 (r236337) @@ -10,9 +10,13 @@ DPADD= ${LIBHX509} ${LIBROKEN} ${LIBASN1 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 Modified: head/kerberos5/usr.bin/kadmin/Makefile ============================================================================== --- head/kerberos5/usr.bin/kadmin/Makefile Wed May 30 21:28:37 2012 (r236336) +++ head/kerberos5/usr.bin/kadmin/Makefile Wed May 30 22:21:25 2012 (r236337) @@ -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 Modified: head/kerberos5/usr.bin/kcc/Makefile ============================================================================== --- head/kerberos5/usr.bin/kcc/Makefile Wed May 30 21:28:37 2012 (r236336) +++ head/kerberos5/usr.bin/kcc/Makefile Wed May 30 22:21:25 2012 (r236337) @@ -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 Modified: head/kerberos5/usr.bin/kf/Makefile ============================================================================== --- head/kerberos5/usr.bin/kf/Makefile Wed May 30 21:28:37 2012 (r236336) +++ head/kerberos5/usr.bin/kf/Makefile Wed May 30 22:21:25 2012 (r236337) @@ -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} \ Modified: head/kerberos5/usr.bin/string2key/Makefile ============================================================================== --- head/kerberos5/usr.bin/string2key/Makefile Wed May 30 21:28:37 2012 (r236336) +++ head/kerberos5/usr.bin/string2key/Makefile Wed May 30 22:21:25 2012 (r236337) @@ -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> Modified: head/kerberos5/usr.sbin/iprop-log/Makefile ============================================================================== --- head/kerberos5/usr.sbin/iprop-log/Makefile Wed May 30 21:28:37 2012 (r236336) +++ head/kerberos5/usr.sbin/iprop-log/Makefile Wed May 30 22:21:25 2012 (r236337) @@ -13,9 +13,13 @@ DPADD= ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB LDADD= -lkadm5srv -lhdb -lkrb5 -lasn1 -lcrypto -lcrypt ${LIBSL} -lroken \ ${LIBVERS} -ledit -iprop-commands.c iprop-commands.h: iprop-commands.in +iprop-commands.h: iprop-commands.in slc ${.ALLSRC:M*.in} +.for ext in c o +iprop-commands.${ext}: iprop-commands.h +.endfor + .include <bsd.prog.mk> .PATH: ${KRB5DIR}/lib/kadm5 Modified: head/kerberos5/usr.sbin/ktutil/Makefile ============================================================================== --- head/kerberos5/usr.sbin/ktutil/Makefile Wed May 30 21:28:37 2012 (r236336) +++ head/kerberos5/usr.sbin/ktutil/Makefile Wed May 30 22:21:25 2012 (r236337) @@ -9,7 +9,6 @@ SRCS= add.c \ destroy.c \ get.c \ ktutil.c \ - ktutil_locl.h \ ktutil-commands.c \ ktutil-commands.h \ list.c \ @@ -25,7 +24,11 @@ LDADD= -lkadm5clnt -lkrb5 ${LIBSL} -lrok .include <bsd.prog.mk> -ktutil-commands.c ktutil-commands.h: ${KRB5DIR}/admin/ktutil-commands.in +ktutil-commands.h: ${KRB5DIR}/admin/ktutil-commands.in slc ${.ALLSRC:M*.in} +.for ext in c o +ktutil-commands.${ext}: ktutil-commands.h +.endfor + .PATH: ${KRB5DIR}/admin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201205302221.q4UMLPlw083444>