WITH_META_MODE: Don't expect meta files for side-effect generated files.

The first file in these lists will generate everything else so only
it should be getting a .meta file.  With bmake's missing=yes meta
feature these would otherwise cause a rebuild without the
.NOMETA hint.

Sponsored by:	EMC / Isilon Storage Division
This commit is contained in:
Bryan Drewery
2016-06-03 19:25:41 +00:00
parent 5852ae2d99
commit 92edc96667
10 changed files with 25 additions and 0 deletions
+1
View File
@@ -35,6 +35,7 @@ ETSRCS= \
.for _ET in ${ET:T:R}
.if ${SRCS:M${_ET}.[ch]} != ""
.ORDER: ${_ET}.h ${_ET}.c
${_ET}.c: .NOMETA
${_ET}.c ${_ET}.h: ${ET}
compile_et ${.ALLSRC}
CLEANFILES+= ${_ET}.h ${_ET}.c
+9
View File
@@ -56,11 +56,13 @@ INCS+= krb5_asn1.h \
kx509_asn1.h
.ORDER: ${GEN_CMS}
${GEN_CMS:[2..-1]}: .NOMETA
${GEN_CMS}: cms.asn1 cms.opt
${ASN1_COMPILE} --one-code-file \
--option-file=${.ALLSRC:M*.opt} ${.ALLSRC:M*.asn1} cms_asn1
.ORDER: ${GEN_RFC2459}
${GEN_RFC2459:[2..-1]}: .NOMETA
${GEN_RFC2459}: rfc2459.asn1
${ASN1_COMPILE} \
--one-code-file \
@@ -72,6 +74,7 @@ ${GEN_RFC2459}: rfc2459.asn1
--sequence=CRLDistributionPoints ${.ALLSRC:M*.asn1} rfc2459_asn1
.ORDER: ${GEN_K5}
${GEN_K5:[2..-1]}: .NOMETA
${GEN_K5}: krb5.asn1 krb5.opt
${ASN1_COMPILE} \
--one-code-file \
@@ -79,31 +82,37 @@ ${GEN_K5}: krb5.asn1 krb5.opt
${.ALLSRC:M*.asn1} krb5_asn1
.ORDER: ${GEN_PKINIT}
${GEN_PKINIT:[2..-1]}: .NOMETA
${GEN_PKINIT}: pkinit.asn1
${ASN1_COMPILE} --one-code-file \
${.ALLSRC:M*.asn1} pkinit_asn1
.ORDER: ${GEN_PKCS8}
${GEN_PKCS8:[2..-1]}: .NOMETA
${GEN_PKCS8}: pkcs8.asn1
${ASN1_COMPILE} --one-code-file \
${.ALLSRC:M*.asn1} pkcs8_asn1
.ORDER: ${GEN_PKCS9}
${GEN_PKCS9:[2..-1]}: .NOMETA
${GEN_PKCS9}: pkcs9.asn1
${ASN1_COMPILE} --one-code-file \
${.ALLSRC:M*.asn1} pkcs9_asn1
.ORDER: ${GEN_PKCS12}
${GEN_PKCS12:[2..-1]}: .NOMETA
${GEN_PKCS12}: pkcs12.asn1
${ASN1_COMPILE} --one-code-file \
${.ALLSRC:M*.asn1} pkcs12_asn1
.ORDER: ${GEN_DIGEST}
${GEN_DIGEST:[2..-1]}: .NOMETA
${GEN_DIGEST}: digest.asn1
${ASN1_COMPILE} --one-code-file \
${.ALLSRC:M*.asn1} digest_asn1
.ORDER: ${GEN_KX509}
${GEN_KX509:[2..-1]}: .NOMETA
${GEN_KX509}: kx509.asn1
${ASN1_COMPILE} --one-code-file \
${.ALLSRC:M*.asn1} kx509_asn1
+1
View File
@@ -38,6 +38,7 @@ CLEANFILES= ${GEN} ${GEN:S/.x$/.c/:S/.hx$/.h/} \
spnego_asn1_files spnego_asn1-template.c
.ORDER: ${GEN}
${GEN:[2..-1]}: .NOMETA
${GEN}: spnego.asn1 spnego.opt
${ASN1_COMPILE} --option-file=${.ALLSRC:M*.opt} \
${.ALLSRC:M*.asn1} spnego_asn1
+1
View File
@@ -86,6 +86,7 @@ CLEANFILES= ${GEN} ${GEN:S/.x$/.c/:S/.hx$/.h/} hdb_asn1_files \
hdb_asn1-template.[ch]*
.ORDER: ${GEN}
${GEN:[2..-1]}: .NOMETA
${GEN}: hdb.asn1
${ASN1_COMPILE} ${.ALLSRC:M*.asn1} hdb_asn1
+3
View File
@@ -269,16 +269,19 @@ CLEANFILES= ${GEN} ${GEN:S/.x$/.c/:S/.hx$/.h/} ocsp_asn1_files \
INCS+= ocsp_asn1.h pkcs10_asn1.h crmf_asn1.h
.ORDER: ${GEN_OCSP}
${GEN_OCSP:[2..-1]}: .NOMETA
${GEN_OCSP}: ocsp.asn1 ocsp.opt
${ASN1_COMPILE} --option-file=${.ALLSRC:M*.opt} \
${.ALLSRC:M*.asn1} ocsp_asn1
.ORDER: ${GEN_PKCS10}
${GEN_PKCS10:[2..-1]}: .NOMETA
${GEN_PKCS10}: pkcs10.asn1 pkcs10.opt
${ASN1_COMPILE} --option-file=${.ALLSRC:M*.opt} \
${.ALLSRC:M*.asn1} pkcs10_asn1
.ORDER: ${GEN_CRMF}
${GEN_CRMF:[2..-1]}: .NOMETA
${GEN_CRMF}: crmf.asn1
${ASN1_COMPILE} ${.ALLSRC:M*.asn1} crmf_asn1