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 (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,101 +1,102 @@ @@ -1,101 +1,102 @@
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
38${ASN1_FILES.${src}} ${src:.asn1=_asn1.h} ${src:.asn1=_asn1-priv.h}: \ 39${ASN1_FILES.${src}} ${src:.asn1=_asn1.h} ${src:.asn1=_asn1-priv.h}: \
39 ${src:.asn1=.ts} 40 ${src:.asn1=.ts}
40 41
41.if exists(${src:.asn1=.opt}) 42.if exists(${src:.asn1=.opt})
42${src:.asn1=.ts}: ${src} ${src:.asn1=.opt} ${TOOL_ASN1_COMPILE} 43${src:.asn1=.ts}: ${src} ${src:.asn1=.opt} ${TOOL_ASN1_COMPILE}
43 @touch $@ 44 @touch $@
44 ${TOOL_ASN1_COMPILE} \ 45 ${TOOL_ASN1_COMPILE} \
45 ${ASN1_OPTS.${src}} \ 46 ${ASN1_OPTS.${src}} \
46 --option-file=${.ALLSRC:[2]} \ 47 --option-file=${.ALLSRC:[2]} \
47 ${.ALLSRC:[1]} ${src:.asn1=_asn1} 48 ${.ALLSRC:[1]} ${src:.asn1=_asn1}
48 @${TOOL_SED} -E \ 49 @${TOOL_SED} -E \
49 -e 's,#include <(.*)_asn1\.h>,#include <krb5/\1_asn1.h>,' \ 50 -e 's,#include <(.*)_asn1\.h>,#include <krb5/\1_asn1.h>,' \
50 2> /dev/null < ${src:.asn1=_asn1.hx} > ${src:.asn1=_asn1.h} 51 2> /dev/null < ${src:.asn1=_asn1.hx} > ${src:.asn1=_asn1.h}
51 @cmp -s ${src:.asn1=_asn1-priv.hx} ${src:.asn1=_asn1-priv.h} \ 52 @cmp -s ${src:.asn1=_asn1-priv.hx} ${src:.asn1=_asn1-priv.h} \
52 2> /dev/null || \ 53 2> /dev/null || \
53 cp ${src:.asn1=_asn1-priv.hx} ${src:.asn1=_asn1-priv.h} 54 cp ${src:.asn1=_asn1-priv.hx} ${src:.asn1=_asn1-priv.h}
54.else 55.else
55${src:.asn1=.ts}: ${src} ${TOOL_ASN1_COMPILE} 56${src:.asn1=.ts}: ${src} ${TOOL_ASN1_COMPILE}
56 @touch $@ 57 @touch $@
57 ${TOOL_ASN1_COMPILE} \ 58 ${TOOL_ASN1_COMPILE} \
58 ${ASN1_OPTS.${src}} \ 59 ${ASN1_OPTS.${src}} \
59 ${.ALLSRC:[1]} ${src:.asn1=_asn1} 60 ${.ALLSRC:[1]} ${src:.asn1=_asn1}
60 @${TOOL_SED} -E \ 61 @${TOOL_SED} -E \
61 -e 's,#include <(.*)_asn1\.h>,#include <krb5/\1_asn1.h>,' \ 62 -e 's,#include <(.*)_asn1\.h>,#include <krb5/\1_asn1.h>,' \
62 2> /dev/null < ${src:.asn1=_asn1.hx} > ${src:.asn1=_asn1.h} 63 2> /dev/null < ${src:.asn1=_asn1.hx} > ${src:.asn1=_asn1.h}
63 @cmp -s ${src:.asn1=_asn1-priv.hx} ${src:.asn1=_asn1-priv.h} \ 64 @cmp -s ${src:.asn1=_asn1-priv.hx} ${src:.asn1=_asn1-priv.h} \
64 2> /dev/null || \ 65 2> /dev/null || \
65 cp ${src:.asn1=_asn1-priv.hx} ${src:.asn1=_asn1-priv.h} 66 cp ${src:.asn1=_asn1-priv.hx} ${src:.asn1=_asn1-priv.h}
66.endif 67.endif
67 68
68.for x2c in ${ASN1_FILES.${src}} 69.for x2c in ${ASN1_FILES.${src}}
69${x2c:.x=.c}: ${x2c} 70${x2c:.x=.c}: ${x2c}
70 @cmp -s ${x2c} ${x2c:.x=.c} 2> /dev/null || cp ${x2c} ${x2c:.x=.c} 71 @cmp -s ${x2c} ${x2c:.x=.c} 2> /dev/null || cp ${x2c} ${x2c:.x=.c}
71 72
72.endfor 73.endfor
73 74
74.endfor 75.endfor
75 76
76# 77#
77# and for slc: 78# and for slc:
78 79
79.for slc_src in ${HEIMSRCS:M*.in} 80.for slc_src in ${HEIMSRCS:M*.in}
80CLEANFILES+= ${slc_src:.in=.c} ${slc_src:.in=.h} 81CLEANFILES+= ${slc_src:.in=.c} ${slc_src:.in=.h}
81DPSRCS+= ${slc_src:.in=.c} ${slc_src:.in=.h} 82DPSRCS+= ${slc_src:.in=.c} ${slc_src:.in=.h}
82OBJS+= ${slc_src:.in=.o} 83OBJS+= ${slc_src:.in=.o}
83SLC_INCS+= ${slc_src:.in=.h} 84SLC_INCS+= ${slc_src:.in=.h}
84 85
85${slc_src:.in=.c} ${slc_src:.in=.h}: ${slc_src} 86${slc_src:.in=.c} ${slc_src:.in=.h}: ${slc_src}
86 ${TOOL_SLC} ${.ALLSRC} 87 ${TOOL_SLC} ${.ALLSRC}
87 88
88.endfor 89.endfor
89 90
90# 91#
91# And a tiny bit of logic for bsd.prog.mk: 92# And a tiny bit of logic for bsd.prog.mk:
92 93
93.if defined(PROG) && defined(OBJS) 94.if defined(PROG) && defined(OBJS)
94OBJS.${PROG} += ${OBJS} 95OBJS.${PROG} += ${OBJS}
95.endif 96.endif
96 97
97.if defined(LIB) && exists(version-script.map) && !defined(NO_VERSION_SCRIPT) 98.if defined(LIB) && exists(version-script.map) && !defined(NO_VERSION_SCRIPT)
98version-script.map: 99version-script.map:
99 100
100LDFLAGS.lib${LIB} += -Wl,--version-script=${version-script.map:P} 101LDFLAGS.lib${LIB} += -Wl,--version-script=${version-script.map:P}
101.endif 102.endif
cvs diff -r1.2 -r1.3 src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile (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,274 +1,272 @@ @@ -1,274 +1,272 @@
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
15 15
16LIBDPLIBS+= krb5 ${HEIMBASE}/lib/libkrb5 \ 16LIBDPLIBS+= krb5 ${HEIMBASE}/lib/libkrb5 \
17 asn1 ${HEIMBASE}/lib/libasn1 \ 17 asn1 ${HEIMBASE}/lib/libasn1 \
18 com_err ${HEIMBASE}/lib/libcom_err \ 18 com_err ${HEIMBASE}/lib/libcom_err \
19 roken ${HEIMBASE}/lib/libroken \ 19 roken ${HEIMBASE}/lib/libroken \
20 heimntlm ${HEIMBASE}/lib/libheimntlm \ 20 heimntlm ${HEIMBASE}/lib/libheimntlm \
21 crypto ${SSLBASE}/lib/libcrypto 21 crypto ${SSLBASE}/lib/libcrypto
22 22
23HEIMSRCS= gkrb5_err.et spnego.asn1 gssapi.asn1 23HEIMSRCS= gkrb5_err.et spnego.asn1 gssapi.asn1
24 24
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 \
53 krb5/compat.c \ 51 krb5/compat.c \
54 krb5/context_time.c \ 52 krb5/context_time.c \
55 krb5/copy_ccache.c \ 53 krb5/copy_ccache.c \
56 krb5/decapsulate.c \ 54 krb5/decapsulate.c \
57 krb5/delete_sec_context.c \ 55 krb5/delete_sec_context.c \
58 krb5/display_name.c \ 56 krb5/display_name.c \
59 krb5/display_status.c \ 57 krb5/display_status.c \
60 krb5/duplicate_name.c \ 58 krb5/duplicate_name.c \
61 krb5/encapsulate.c \ 59 krb5/encapsulate.c \
62 krb5/export_name.c \ 60 krb5/export_name.c \
63 krb5/export_sec_context.c \ 61 krb5/export_sec_context.c \
64 krb5/external.c \ 62 krb5/external.c \
65 krb5/get_mic.c \ 63 krb5/get_mic.c \
66 krb5/import_name.c \ 64 krb5/import_name.c \
67 krb5/import_sec_context.c \ 65 krb5/import_sec_context.c \
68 krb5/indicate_mechs.c \ 66 krb5/indicate_mechs.c \
69 krb5/init.c \ 67 krb5/init.c \
70 krb5/init_sec_context.c \ 68 krb5/init_sec_context.c \
71 krb5/inquire_context.c \ 69 krb5/inquire_context.c \
72 krb5/inquire_cred.c \ 70 krb5/inquire_cred.c \
73 krb5/inquire_cred_by_mech.c \ 71 krb5/inquire_cred_by_mech.c \
74 krb5/inquire_cred_by_oid.c \ 72 krb5/inquire_cred_by_oid.c \
75 krb5/inquire_mechs_for_name.c \ 73 krb5/inquire_mechs_for_name.c \
76 krb5/inquire_names_for_mech.c \ 74 krb5/inquire_names_for_mech.c \
77 krb5/inquire_sec_context_by_oid.c \ 75 krb5/inquire_sec_context_by_oid.c \
78 krb5/process_context_token.c \ 76 krb5/process_context_token.c \
79 krb5/prf.c \ 77 krb5/prf.c \
80 krb5/release_buffer.c \ 78 krb5/release_buffer.c \
81 krb5/release_cred.c \ 79 krb5/release_cred.c \
82 krb5/release_name.c \ 80 krb5/release_name.c \
83 krb5/sequence.c \ 81 krb5/sequence.c \
84 krb5/store_cred.c \ 82 krb5/store_cred.c \
85 krb5/set_cred_option.c \ 83 krb5/set_cred_option.c \
86 krb5/set_sec_context_option.c \ 84 krb5/set_sec_context_option.c \
87 krb5/ticket_flags.c \ 85 krb5/ticket_flags.c \
88 krb5/unwrap.c \ 86 krb5/unwrap.c \
89 krb5/verify_mic.c \ 87 krb5/verify_mic.c \
90 krb5/wrap.c 88 krb5/wrap.c
91 89
92mechsrc = \ 90mechsrc = \
93 mech/context.c \ 91 mech/context.c \
94 mech/doxygen.c \ 92 mech/doxygen.c \
95 mech/gss_accept_sec_context.c \ 93 mech/gss_accept_sec_context.c \
96 mech/gss_acquire_cred.c \ 94 mech/gss_acquire_cred.c \
97 mech/gss_add_cred.c \ 95 mech/gss_add_cred.c \
98 mech/gss_add_oid_set_member.c \ 96 mech/gss_add_oid_set_member.c \
99 mech/gss_aeap.c \ 97 mech/gss_aeap.c \
100 mech/gss_buffer_set.c \ 98 mech/gss_buffer_set.c \
101 mech/gss_canonicalize_name.c \ 99 mech/gss_canonicalize_name.c \
102 mech/gss_compare_name.c \ 100 mech/gss_compare_name.c \
103 mech/gss_context_time.c \ 101 mech/gss_context_time.c \
104 mech/gss_create_empty_oid_set.c \ 102 mech/gss_create_empty_oid_set.c \
105 mech/gss_cred.c \ 103 mech/gss_cred.c \
106 mech/gss_decapsulate_token.c \ 104 mech/gss_decapsulate_token.c \
107 mech/gss_delete_name_attribute.c \ 105 mech/gss_delete_name_attribute.c \
108 mech/gss_delete_sec_context.c \ 106 mech/gss_delete_sec_context.c \
109 mech/gss_display_name.c \ 107 mech/gss_display_name.c \
110 mech/gss_display_name_ext.c \ 108 mech/gss_display_name_ext.c \
111 mech/gss_display_status.c \ 109 mech/gss_display_status.c \
112 mech/gss_duplicate_name.c \ 110 mech/gss_duplicate_name.c \
113 mech/gss_duplicate_oid.c \ 111 mech/gss_duplicate_oid.c \
114 mech/gss_encapsulate_token.c \ 112 mech/gss_encapsulate_token.c \
115 mech/gss_export_name.c \ 113 mech/gss_export_name.c \
116 mech/gss_export_name_composite.c \ 114 mech/gss_export_name_composite.c \
117 mech/gss_export_sec_context.c \ 115 mech/gss_export_sec_context.c \
118 mech/gss_get_mic.c \ 116 mech/gss_get_mic.c \
119 mech/gss_get_name_attribute.c \ 117 mech/gss_get_name_attribute.c \
120 mech/gss_import_name.c \ 118 mech/gss_import_name.c \
121 mech/gss_import_sec_context.c \ 119 mech/gss_import_sec_context.c \
122 mech/gss_indicate_mechs.c \ 120 mech/gss_indicate_mechs.c \
123 mech/gss_init_sec_context.c \ 121 mech/gss_init_sec_context.c \
124 mech/gss_inquire_context.c \ 122 mech/gss_inquire_context.c \
125 mech/gss_inquire_cred.c \ 123 mech/gss_inquire_cred.c \
126 mech/gss_inquire_cred_by_mech.c \ 124 mech/gss_inquire_cred_by_mech.c \
127 mech/gss_inquire_cred_by_oid.c \ 125 mech/gss_inquire_cred_by_oid.c \
128 mech/gss_inquire_mechs_for_name.c \ 126 mech/gss_inquire_mechs_for_name.c \
129 mech/gss_inquire_name.c \ 127 mech/gss_inquire_name.c \
130 mech/gss_inquire_names_for_mech.c \ 128 mech/gss_inquire_names_for_mech.c \
131 mech/gss_krb5.c \ 129 mech/gss_krb5.c \
132 mech/gss_mech_switch.c \ 130 mech/gss_mech_switch.c \
133 mech/gss_mo.c \ 131 mech/gss_mo.c \
134 mech/gss_names.c \ 132 mech/gss_names.c \
135 mech/gss_oid.c \ 133 mech/gss_oid.c \
136 mech/gss_oid_equal.c \ 134 mech/gss_oid_equal.c \
137 mech/gss_oid_to_str.c \ 135 mech/gss_oid_to_str.c \
138 mech/gss_process_context_token.c \ 136 mech/gss_process_context_token.c \
139 mech/gss_pseudo_random.c \ 137 mech/gss_pseudo_random.c \
140 mech/gss_release_buffer.c \ 138 mech/gss_release_buffer.c \
141 mech/gss_release_cred.c \ 139 mech/gss_release_cred.c \
142 mech/gss_release_name.c \ 140 mech/gss_release_name.c \
143 mech/gss_release_oid.c \ 141 mech/gss_release_oid.c \
144 mech/gss_release_oid_set.c \ 142 mech/gss_release_oid_set.c \
145 mech/gss_seal.c \ 143 mech/gss_seal.c \
146 mech/gss_set_cred_option.c \ 144 mech/gss_set_cred_option.c \
147 mech/gss_set_name_attribute.c \ 145 mech/gss_set_name_attribute.c \
148 mech/gss_set_sec_context_option.c \ 146 mech/gss_set_sec_context_option.c \
149 mech/gss_sign.c \ 147 mech/gss_sign.c \
150 mech/gss_store_cred.c \ 148 mech/gss_store_cred.c \
151 mech/gss_test_oid_set_member.c \ 149 mech/gss_test_oid_set_member.c \
152 mech/gss_unseal.c \ 150 mech/gss_unseal.c \
153 mech/gss_unwrap.c \ 151 mech/gss_unwrap.c \
154 mech/gss_utils.c \ 152 mech/gss_utils.c \
155 mech/gss_verify.c \ 153 mech/gss_verify.c \
156 mech/gss_verify_mic.c \ 154 mech/gss_verify_mic.c \
157 mech/gss_wrap.c \ 155 mech/gss_wrap.c \
158 mech/gss_wrap_size_limit.c \ 156 mech/gss_wrap_size_limit.c \
159 mech/gss_inquire_sec_context_by_oid.c 157 mech/gss_inquire_sec_context_by_oid.c
160 158
161spnegosrc = \ 159spnegosrc = \
162 spnego/accept_sec_context.c \ 160 spnego/accept_sec_context.c \
163 spnego/compat.c \ 161 spnego/compat.c \
164 spnego/context_stubs.c \ 162 spnego/context_stubs.c \
165 spnego/cred_stubs.c \ 163 spnego/cred_stubs.c \
166 spnego/external.c \ 164 spnego/external.c \
167 spnego/init_sec_context.c 165 spnego/init_sec_context.c
168 166
169ntlmsrc = \ 167ntlmsrc = \
170 ntlm/accept_sec_context.c \ 168 ntlm/accept_sec_context.c \
171 ntlm/acquire_cred.c \ 169 ntlm/acquire_cred.c \
172 ntlm/add_cred.c \ 170 ntlm/add_cred.c \
173 ntlm/canonicalize_name.c \ 171 ntlm/canonicalize_name.c \
174 ntlm/compare_name.c \ 172 ntlm/compare_name.c \
175 ntlm/context_time.c \ 173 ntlm/context_time.c \
176 ntlm/creds.c \ 174 ntlm/creds.c \
177 ntlm/crypto.c \ 175 ntlm/crypto.c \
178 ntlm/delete_sec_context.c \ 176 ntlm/delete_sec_context.c \
179 ntlm/display_name.c \ 177 ntlm/display_name.c \
180 ntlm/display_status.c \ 178 ntlm/display_status.c \
181 ntlm/duplicate_name.c \ 179 ntlm/duplicate_name.c \
182 ntlm/export_name.c \ 180 ntlm/export_name.c \
183 ntlm/export_sec_context.c \ 181 ntlm/export_sec_context.c \
184 ntlm/external.c \ 182 ntlm/external.c \
185 ntlm/import_name.c \ 183 ntlm/import_name.c \
186 ntlm/import_sec_context.c \ 184 ntlm/import_sec_context.c \
187 ntlm/indicate_mechs.c \ 185 ntlm/indicate_mechs.c \
188 ntlm/init_sec_context.c \ 186 ntlm/init_sec_context.c \
189 ntlm/inquire_context.c \ 187 ntlm/inquire_context.c \
190 ntlm/inquire_cred_by_mech.c \ 188 ntlm/inquire_cred_by_mech.c \
191 ntlm/inquire_mechs_for_name.c \ 189 ntlm/inquire_mechs_for_name.c \
192 ntlm/inquire_names_for_mech.c \ 190 ntlm/inquire_names_for_mech.c \
193 ntlm/inquire_sec_context_by_oid.c \ 191 ntlm/inquire_sec_context_by_oid.c \
194 ntlm/iter_cred.c \ 192 ntlm/iter_cred.c \
195 ntlm/process_context_token.c \ 193 ntlm/process_context_token.c \
196 ntlm/release_cred.c \ 194 ntlm/release_cred.c \
197 ntlm/release_name.c \ 195 ntlm/release_name.c \
198 ntlm/kdc.c 196 ntlm/kdc.c
199 197
200NTLMSRC= ${ntlmsrc:S@/@__@} 198NTLMSRC= ${ntlmsrc:S@/@__@}
201KRB5SRC= ${krb5src:S@/@__@} 199KRB5SRC= ${krb5src:S@/@__@}
202MECHSRC= ${mechsrc:S@/@__@} 200MECHSRC= ${mechsrc:S@/@__@}
203SPNEGOSRC= ${spnegosrc:S@/@__@} 201SPNEGOSRC= ${spnegosrc:S@/@__@}
204 202
205SRCS= ${KRB5SRC} ${MECHSRC} ${SPNEGOSRC} ${NTLMSRC} 203SRCS= ${KRB5SRC} ${MECHSRC} ${SPNEGOSRC} ${NTLMSRC}
206 204
207.for i in ${KRB5SRC} ${MECHSRC} ${SPNEGOSRC} ${NTLMSRC} 205.for i in ${KRB5SRC} ${MECHSRC} ${SPNEGOSRC} ${NTLMSRC}
208BUILDSYMLINKS+= ${i:S@__@/@} ${i} 206BUILDSYMLINKS+= ${i:S@__@/@} ${i}
209CLEANFILES+= ${i} 207CLEANFILES+= ${i}
210.endfor 208.endfor
211 209
212MAN= \ 210MAN= \
213 gssapi.3 \ 211 gssapi.3 \
214 gss_acquire_cred.3 \ 212 gss_acquire_cred.3 \
215 mech.5 213 mech.5
216 214
217MLINKS= \ 215MLINKS= \
218 gss_acquire_cred.3 gss_accept_sec_context.3 \ 216 gss_acquire_cred.3 gss_accept_sec_context.3 \
219 gss_acquire_cred.3 gss_add_cred.3 \ 217 gss_acquire_cred.3 gss_add_cred.3 \
220 gss_acquire_cred.3 gss_add_oid_set_member.3 \ 218 gss_acquire_cred.3 gss_add_oid_set_member.3 \
221 gss_acquire_cred.3 gss_canonicalize_name.3 \ 219 gss_acquire_cred.3 gss_canonicalize_name.3 \
222 gss_acquire_cred.3 gss_compare_name.3 \ 220 gss_acquire_cred.3 gss_compare_name.3 \
223 gss_acquire_cred.3 gss_context_time.3 \ 221 gss_acquire_cred.3 gss_context_time.3 \
224 gss_acquire_cred.3 gss_create_empty_oid_set.3 \ 222 gss_acquire_cred.3 gss_create_empty_oid_set.3 \
225 gss_acquire_cred.3 gss_delete_sec_context.3 \ 223 gss_acquire_cred.3 gss_delete_sec_context.3 \
226 gss_acquire_cred.3 gss_display_name.3 \ 224 gss_acquire_cred.3 gss_display_name.3 \
227 gss_acquire_cred.3 gss_display_status.3 \ 225 gss_acquire_cred.3 gss_display_status.3 \
228 gss_acquire_cred.3 gss_duplicate_name.3 \ 226 gss_acquire_cred.3 gss_duplicate_name.3 \
229 gss_acquire_cred.3 gss_export_name.3 \ 227 gss_acquire_cred.3 gss_export_name.3 \
230 gss_acquire_cred.3 gss_export_sec_context.3 \ 228 gss_acquire_cred.3 gss_export_sec_context.3 \
231 gss_acquire_cred.3 gss_get_mic.3 \ 229 gss_acquire_cred.3 gss_get_mic.3 \
232 gss_acquire_cred.3 gss_import_name.3 \ 230 gss_acquire_cred.3 gss_import_name.3 \
233 gss_acquire_cred.3 gss_import_sec_context.3 \ 231 gss_acquire_cred.3 gss_import_sec_context.3 \
234 gss_acquire_cred.3 gss_indicate_mechs.3 \ 232 gss_acquire_cred.3 gss_indicate_mechs.3 \
235 gss_acquire_cred.3 gss_init_sec_context.3 \ 233 gss_acquire_cred.3 gss_init_sec_context.3 \
236 gss_acquire_cred.3 gss_inquire_context.3 \ 234 gss_acquire_cred.3 gss_inquire_context.3 \
237 gss_acquire_cred.3 gss_inquire_cred.3 \ 235 gss_acquire_cred.3 gss_inquire_cred.3 \
238 gss_acquire_cred.3 gss_inquire_cred_by_mech.3 \ 236 gss_acquire_cred.3 gss_inquire_cred_by_mech.3 \
239 gss_acquire_cred.3 gss_inquire_mechs_for_name.3 \ 237 gss_acquire_cred.3 gss_inquire_mechs_for_name.3 \
240 gss_acquire_cred.3 gss_inquire_names_for_mech.3 \ 238 gss_acquire_cred.3 gss_inquire_names_for_mech.3 \
241 gss_acquire_cred.3 gss_krb5_ccache_name.3 \ 239 gss_acquire_cred.3 gss_krb5_ccache_name.3 \
242 gss_acquire_cred.3 gss_krb5_compat_des3_mic.3 \ 240 gss_acquire_cred.3 gss_krb5_compat_des3_mic.3 \
243 gss_acquire_cred.3 gss_krb5_copy_ccache.3 \ 241 gss_acquire_cred.3 gss_krb5_copy_ccache.3 \
244 gss_acquire_cred.3 gss_krb5_get_tkt_flags.3 \ 242 gss_acquire_cred.3 gss_krb5_get_tkt_flags.3 \
245 gss_acquire_cred.3 gss_krb5_import_ccache.3 \ 243 gss_acquire_cred.3 gss_krb5_import_ccache.3 \
246 gss_acquire_cred.3 gss_krb5_import_cred.3 \ 244 gss_acquire_cred.3 gss_krb5_import_cred.3 \
247 gss_acquire_cred.3 gss_process_context_token.3 \ 245 gss_acquire_cred.3 gss_process_context_token.3 \
248 gss_acquire_cred.3 gss_release_buffer.3 \ 246 gss_acquire_cred.3 gss_release_buffer.3 \
249 gss_acquire_cred.3 gss_release_cred.3 \ 247 gss_acquire_cred.3 gss_release_cred.3 \
250 gss_acquire_cred.3 gss_release_name.3 \ 248 gss_acquire_cred.3 gss_release_name.3 \
251 gss_acquire_cred.3 gss_release_oid_set.3 \ 249 gss_acquire_cred.3 gss_release_oid_set.3 \
252 gss_acquire_cred.3 gss_seal.3 \ 250 gss_acquire_cred.3 gss_seal.3 \
253 gss_acquire_cred.3 gss_sign.3 \ 251 gss_acquire_cred.3 gss_sign.3 \
254 gss_acquire_cred.3 gss_test_oid_set_member.3 \ 252 gss_acquire_cred.3 gss_test_oid_set_member.3 \
255 gss_acquire_cred.3 gss_unseal.3 \ 253 gss_acquire_cred.3 gss_unseal.3 \
256 gss_acquire_cred.3 gss_unwrap.3 \ 254 gss_acquire_cred.3 gss_unwrap.3 \
257 gss_acquire_cred.3 gss_verify.3 \ 255 gss_acquire_cred.3 gss_verify.3 \
258 gss_acquire_cred.3 gss_verify_mic.3 \ 256 gss_acquire_cred.3 gss_verify_mic.3 \
259 gss_acquire_cred.3 gss_wrap.3 \ 257 gss_acquire_cred.3 gss_wrap.3 \
260 gss_acquire_cred.3 gss_wrap_size_limit.3 \ 258 gss_acquire_cred.3 gss_wrap_size_limit.3 \
261 gss_acquire_cred.3 gsskrb5_extract_authz_data_from_sec_context.3 \ 259 gss_acquire_cred.3 gsskrb5_extract_authz_data_from_sec_context.3 \
262 gss_acquire_cred.3 gsskrb5_register_acceptor_identity.3 260 gss_acquire_cred.3 gsskrb5_register_acceptor_identity.3
263 261
264INCS= gssapi.h 262INCS= gssapi.h
265INCS+= gssapi/gssapi.h gssapi/gssapi_krb5.h gssapi/gssapi_spnego.h 263INCS+= gssapi/gssapi.h gssapi/gssapi_krb5.h gssapi/gssapi_spnego.h
266INCS+= gssapi/gssapi_oid.h gssapi/gssapi_ntlm.h 264INCS+= gssapi/gssapi_oid.h gssapi/gssapi_ntlm.h
267INCSDIR= /usr/include 265INCSDIR= /usr/include
268 266
269CPPFLAGS+= \ 267CPPFLAGS+= \
270 -I${HEIMDIST}/lib/krb5 \ 268 -I${HEIMDIST}/lib/krb5 \
271 -I${HEIMDIST}/lib/asn1 \ 269 -I${HEIMDIST}/lib/asn1 \
272 270
273.include <${HEIMBASE}/Makefile.rules.inc> 271.include <${HEIMBASE}/Makefile.rules.inc>
274.include <bsd.lib.mk> 272.include <bsd.lib.mk>
cvs diff -r1.3 -r1.4 src/crypto/external/bsd/heimdal/lib/libhx509/Makefile (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,89 +1,87 @@ @@ -1,89 +1,87 @@
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 \
15 com_err ${HEIMBASE}/lib/libcom_err \ 15 com_err ${HEIMBASE}/lib/libcom_err \
16 crypt ${NETBSDSRCDIR}/lib/libcrypt \ 16 crypt ${NETBSDSRCDIR}/lib/libcrypt \
17 crypto ${SSLBASE}/lib/libcrypto \ 17 crypto ${SSLBASE}/lib/libcrypto \
18 roken ${HEIMBASE}/lib/libroken \ 18 roken ${HEIMBASE}/lib/libroken \
19 wind ${HEIMBASE}/lib/libwind 19 wind ${HEIMBASE}/lib/libwind
20 20
21YHEADER=1 21YHEADER=1
22 22
23INCSDIR= /usr/include/krb5  23INCSDIR= /usr/include/krb5
24INCS+= hx509.h hx509-protos.h ${ASN1_INCS} ${COMPILE_ET_INCS} 24INCS+= hx509.h hx509-protos.h ${ASN1_INCS} ${COMPILE_ET_INCS}
25 25
26HEIMSRCS = hx509_err.et ocsp.asn1 pkcs10.asn1 26HEIMSRCS = hx509_err.et ocsp.asn1 pkcs10.asn1
27 27
28SRCS= \ 28SRCS= \
29 ca.c \ 29 ca.c \
30 cert.c \ 30 cert.c \
31 cms.c \ 31 cms.c \
32 collector.c \ 32 collector.c \
33 crypto.c \ 33 crypto.c \
34 doxygen.c \ 34 doxygen.c \
35 env.c \ 35 env.c \
36 error.c \ 36 error.c \
37 file.c \ 37 file.c \
38 keyset.c \ 38 keyset.c \
39 ks_dir.c \ 39 ks_dir.c \
40 ks_file.c \ 40 ks_file.c \
41 ks_keychain.c \ 41 ks_keychain.c \
42 ks_mem.c \ 42 ks_mem.c \
43 ks_null.c \ 43 ks_null.c \
44 ks_p11.c \ 44 ks_p11.c \
45 ks_p12.c \ 45 ks_p12.c \
46 lock.c \ 46 lock.c \
47 name.c \ 47 name.c \
48 peer.c \ 48 peer.c \
49 print.c \ 49 print.c \
50 req.c \ 50 req.c \
51 revoke.c \ 51 revoke.c \
52 sel.c \ 52 sel.c \
53 sel-gram.y \ 53 sel-gram.y \
54 sel-lex.l \ 54 sel-lex.l \
55 softp11.c \ 55 softp11.c \
56 ${BUILT_SOURCES} 56 ${BUILT_SOURCES}
57 57
58LPREFIX= _hx509_sel_yy 58LPREFIX= _hx509_sel_yy
59 59
60CPPFLAGS+= \ 60CPPFLAGS+= \
61 -I${HEIMDIST}/lib/hx509/ref \ 61 -I${HEIMDIST}/lib/hx509/ref \
62 -I${HEIMDIST}/lib/asn1 62 -I${HEIMDIST}/lib/asn1
63 63
64sel-gram.c: ${ASN1_INCS} ${COMPILE_ET_INCS} 64sel-gram.c: ${ASN1_INCS} ${COMPILE_ET_INCS}
65 65
66ASN1_FILES.ocsp.asn1 = \ 66ASN1_FILES.ocsp.asn1 = \
67 asn1_OCSPBasicOCSPResponse.x \ 67 asn1_OCSPBasicOCSPResponse.x \
68 asn1_OCSPCertID.x \ 68 asn1_OCSPCertID.x \
69 asn1_OCSPCertStatus.x \ 69 asn1_OCSPCertStatus.x \
70 asn1_OCSPInnerRequest.x \ 70 asn1_OCSPInnerRequest.x \
71 asn1_OCSPKeyHash.x \ 71 asn1_OCSPKeyHash.x \
72 asn1_OCSPRequest.x \ 72 asn1_OCSPRequest.x \
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>