Sun Jul 31 09:58:19 2011 UTC ()
revert previous, actually cleanup the *_asn1-template.c files
in Makefile.rules.inc. They are generated when -one-code-file
is passed.


(plunky)
diff -r1.5 -r1.6 src/crypto/external/bsd/heimdal/Makefile.rules.inc
diff -r1.2 -r1.3 src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile
diff -r1.3 -r1.4 src/crypto/external/bsd/heimdal/lib/libhx509/Makefile
cvs diff -r1.5 -r1.6 src/crypto/external/bsd/heimdal/Makefile.rules.inc (expand / switch to unified diff)

--- src/crypto/external/bsd/heimdal/Makefile.rules.inc 2011/07/27 03:18:52 1.5
+++ src/crypto/external/bsd/heimdal/Makefile.rules.inc 2011/07/31 09:58:19 1.6
@@ -1,37 +1,38 @@ @@ -1,37 +1,38 @@
1# $NetBSD: Makefile.rules.inc,v 1.5 2011/07/27 03:18:52 matt Exp $ 1# $NetBSD: Makefile.rules.inc,v 1.6 2011/07/31 09:58:19 plunky Exp $
2 2
3SRCS+= ${HEIMSRCS:N*.et:N*.in:N*.asn1} 3SRCS+= ${HEIMSRCS:N*.et:N*.in:N*.asn1}
4 4
5.for et_src in ${HEIMSRCS:M*.et} 5.for et_src in ${HEIMSRCS:M*.et}
6CLEANFILES+= ${et_src:.et=.c} ${et_src:.et=.h} 6CLEANFILES+= ${et_src:.et=.c} ${et_src:.et=.h}
7DPSRCS+= ${et_src:.et=.c} ${et_src:.et=.h} 7DPSRCS+= ${et_src:.et=.c} ${et_src:.et=.h}
8COMPILE_ET_INCS+= ${et_src:.et=.h} 8COMPILE_ET_INCS+= ${et_src:.et=.h}
9OBJS+= ${et_src:.et=.o} 9OBJS+= ${et_src:.et=.o}
10 10
11${et_src:.et=.c} ${et_src:.et=.h}: ${et_src} ${TOOL_COMPILE_ET} 11${et_src:.et=.c} ${et_src:.et=.h}: ${et_src} ${TOOL_COMPILE_ET}
12 ${TOOL_COMPILE_ET} ${.ALLSRC:[1]} 12 ${TOOL_COMPILE_ET} ${.ALLSRC:[1]}
13 13
14.endfor 14.endfor
15 15
16.for src in ${HEIMSRCS:M*.asn1} 16.for src in ${HEIMSRCS:M*.asn1}
17ASN1_FILES.${src} ?= asn1_${src:.asn1=_asn1.x} 17ASN1_FILES.${src} ?= asn1_${src:.asn1=_asn1.x}
18 18
19.if ${ASN1_FILES.${src}:[\#]} == 1 19.if ${ASN1_FILES.${src}:[\#]} == 1
20ASN1_OPTS.${src} ?= --one-code-file 20ASN1_OPTS.${src} ?= --one-code-file
21.endif 21.endif
22 22
23CLEANFILES+= \ 23CLEANFILES+= \
24 ${src:.asn1=_asn1_files} \ 24 ${src:.asn1=_asn1_files} \
 25 ${src:.asn1=_asn1-template.c} \
25 ${ASN1_FILES.${src}} \ 26 ${ASN1_FILES.${src}} \
26 ${ASN1_FILES.${src}:.x=.c} \ 27 ${ASN1_FILES.${src}:.x=.c} \
27 ${src:.asn1=_asn1.h} \ 28 ${src:.asn1=_asn1.h} \
28 ${src:.asn1=_asn1.hx} \ 29 ${src:.asn1=_asn1.hx} \
29 ${src:.asn1=_asn1-priv.h} \ 30 ${src:.asn1=_asn1-priv.h} \
30 ${src:.asn1=_asn1-priv.hx} \ 31 ${src:.asn1=_asn1-priv.hx} \
31 ${src:.asn1=.ts} 32 ${src:.asn1=.ts}
32 33
33ASN1_INCS += ${src:.asn1=_asn1.h} 34ASN1_INCS += ${src:.asn1=_asn1.h}
34 35
35DPSRCS += ${src:.asn1=_asn1.h} ${src:.asn1=_asn1-priv.h} 36DPSRCS += ${src:.asn1=_asn1.h} ${src:.asn1=_asn1-priv.h}
36OBJS += ${ASN1_FILES.${src}:.x=.o} 37OBJS += ${ASN1_FILES.${src}:.x=.o}
37 38
cvs diff -r1.2 -r1.3 src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile (expand / switch to unified diff)

--- src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile 2011/07/31 06:49:03 1.2
+++ src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile 2011/07/31 09:58:19 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.2 2011/07/31 06:49:03 plunky Exp $ 1# $NetBSD: Makefile,v 1.3 2011/07/31 09:58:19 plunky Exp $
2 2
3USE_FORT?= yes # network protocol library 3USE_FORT?= yes # network protocol library
4 4
5.include <bsd.own.mk> 5.include <bsd.own.mk>
6.include <${.CURDIR}/../../Makefile.inc> 6.include <${.CURDIR}/../../Makefile.inc>
7 7
8.PATH: ${HEIMDIST}/lib/gssapi \ 8.PATH: ${HEIMDIST}/lib/gssapi \
9 ${HEIMDIST}/lib/gssapi/krb5 \ 9 ${HEIMDIST}/lib/gssapi/krb5 \
10 ${HEIMDIST}/lib/gssapi/mech \ 10 ${HEIMDIST}/lib/gssapi/mech \
11 ${HEIMDIST}/lib/gssapi/spnego \ 11 ${HEIMDIST}/lib/gssapi/spnego \
12 ${HEIMDIST}/lib/gssapi/ntlm 12 ${HEIMDIST}/lib/gssapi/ntlm
13 13
14LIB= gssapi 14LIB= gssapi
@@ -25,28 +25,26 @@ HEIMSRCS= gkrb5_err.et spnego.asn1 gssap @@ -25,28 +25,26 @@ HEIMSRCS= gkrb5_err.et spnego.asn1 gssap
25ASN1_OPTS.spnego.asn1 = --sequence=MechTypeList 25ASN1_OPTS.spnego.asn1 = --sequence=MechTypeList
26 26
27ASN1_FILES.spnego.asn1 = \ 27ASN1_FILES.spnego.asn1 = \
28 asn1_ContextFlags.x \ 28 asn1_ContextFlags.x \
29 asn1_MechType.x \ 29 asn1_MechType.x \
30 asn1_MechTypeList.x \ 30 asn1_MechTypeList.x \
31 asn1_NegotiationToken.x \ 31 asn1_NegotiationToken.x \
32 asn1_NegotiationTokenWin.x \ 32 asn1_NegotiationTokenWin.x \
33 asn1_NegHints.x \ 33 asn1_NegHints.x \
34 asn1_NegTokenInit.x \ 34 asn1_NegTokenInit.x \
35 asn1_NegTokenInitWin.x \ 35 asn1_NegTokenInitWin.x \
36 asn1_NegTokenResp.x 36 asn1_NegTokenResp.x
37 37
38CLEANFILES+= spnego_asn1-template.c 
39 
40krb5src = \ 38krb5src = \
41 krb5/8003.c \ 39 krb5/8003.c \
42 krb5/accept_sec_context.c \ 40 krb5/accept_sec_context.c \
43 krb5/acquire_cred.c \ 41 krb5/acquire_cred.c \
44 krb5/add_cred.c \ 42 krb5/add_cred.c \
45 krb5/address_to_krb5addr.c \ 43 krb5/address_to_krb5addr.c \
46 krb5/aeap.c \ 44 krb5/aeap.c \
47 krb5/arcfour.c \ 45 krb5/arcfour.c \
48 krb5/canonicalize_name.c \ 46 krb5/canonicalize_name.c \
49 krb5/creds.c \ 47 krb5/creds.c \
50 krb5/ccache_name.c \ 48 krb5/ccache_name.c \
51 krb5/cfx.c \ 49 krb5/cfx.c \
52 krb5/compare_name.c \ 50 krb5/compare_name.c \
cvs diff -r1.3 -r1.4 src/crypto/external/bsd/heimdal/lib/libhx509/Makefile (expand / switch to unified diff)

--- src/crypto/external/bsd/heimdal/lib/libhx509/Makefile 2011/07/31 06:49:03 1.3
+++ src/crypto/external/bsd/heimdal/lib/libhx509/Makefile 2011/07/31 09:58:19 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.3 2011/07/31 06:49:03 plunky Exp $ 1# $NetBSD: Makefile,v 1.4 2011/07/31 09:58:19 plunky Exp $
2 2
3NOLINT= # defined 3NOLINT= # defined
4 4
5.include <bsd.own.mk> 5.include <bsd.own.mk>
6.include <${.CURDIR}/../../Makefile.inc> 6.include <${.CURDIR}/../../Makefile.inc>
7 7
8.PATH: ${HEIMDIST}/lib/hx509 ${HEIMBASE}/include 8.PATH: ${HEIMDIST}/lib/hx509 ${HEIMBASE}/include
9 9
10LIB= hx509 10LIB= hx509
11 11
12SSLBASE= ${NETBSDSRCDIR}/crypto/external/bsd/openssl 12SSLBASE= ${NETBSDSRCDIR}/crypto/external/bsd/openssl
13 13
14LIBDPLIBS+= asn1 ${HEIMBASE}/lib/libasn1 \ 14LIBDPLIBS+= asn1 ${HEIMBASE}/lib/libasn1 \
@@ -73,17 +73,15 @@ ASN1_FILES.ocsp.asn1 = \ @@ -73,17 +73,15 @@ ASN1_FILES.ocsp.asn1 = \
73 asn1_OCSPResponderID.x \ 73 asn1_OCSPResponderID.x \
74 asn1_OCSPResponse.x \ 74 asn1_OCSPResponse.x \
75 asn1_OCSPResponseBytes.x \ 75 asn1_OCSPResponseBytes.x \
76 asn1_OCSPResponseData.x \ 76 asn1_OCSPResponseData.x \
77 asn1_OCSPResponseStatus.x \ 77 asn1_OCSPResponseStatus.x \
78 asn1_OCSPSignature.x \ 78 asn1_OCSPSignature.x \
79 asn1_OCSPSingleResponse.x \ 79 asn1_OCSPSingleResponse.x \
80 asn1_OCSPTBSRequest.x \ 80 asn1_OCSPTBSRequest.x \
81 asn1_OCSPVersion.x \ 81 asn1_OCSPVersion.x \
82 asn1_id_pkix_ocsp.x \ 82 asn1_id_pkix_ocsp.x \
83 asn1_id_pkix_ocsp_basic.x \ 83 asn1_id_pkix_ocsp_basic.x \
84 asn1_id_pkix_ocsp_nonce.x 84 asn1_id_pkix_ocsp_nonce.x
85 85
86CLEANFILES+= ocsp_asn1-template.c 
87 
88.include <${HEIMBASE}/Makefile.rules.inc> 86.include <${HEIMBASE}/Makefile.rules.inc>
89.include <bsd.lib.mk> 87.include <bsd.lib.mk>