r10366: More scons fixes. Building et, asn1, lex and yacc files sort-of works now

(This used to be commit 22f18a84242e5e68a2d57b6d7ff77c089ee7434a)

1 files changed, 16 insertions, 56 deletions

diff --git a/source4/heimdal_build/SConscript b/source4/heimdal_build/SConscript
index 86b571f8c2..9724ae7425 100644
--- a/source4/heimdal_build/SConscript
+++ b/source4/heimdal_build/SConscript
@@ -5,22 +5,14 @@ hostenv.StaticLibrary('heimdal_kdc',
 	 '../kdc/log.c','../kdc/misc.c','../kdc/524.c','../kdc/kerberos4.c',
 	 '../kdc/kaserver.c','../kdc/process.c'])
 
+hdb_asn1 = hostenv.ASN1('../heimdal/lib/hdb/hdb.asn1')
+gssapi_asn1 = hostenv.ASN1('../heimdal/lib/gssapi/spnego.asn1')
+k5_asn1 = hostenv.ASN1('../heimdal/lib/asn1/k5.asn1')
+
 hostenv.StaticLibrary('heimdal_hdb',
 	['../heimdal/lib/hdb/db.c','../heimdal/lib/hdb/hdb.c','../heimdal/lib/hdb/ext.c','../heimdal/lib/hdb/keys.c',
-	'../heimdal/lib/hdb/mkey.c','../heimdal/lib/hdb/ndbm.c','../heimdal/lib/hdb/asn1_Event.c',
-	'../heimdal/lib/hdb/asn1_GENERATION.c','../heimdal/lib/hdb/asn1_HDBFlags.c',
-	'../heimdal/lib/hdb/asn1_HDB_Ext_Aliases.c',
-	'../heimdal/lib/hdb/asn1_HDB_Ext_Constrained_delegation_acl.c',
-	'../heimdal/lib/hdb/asn1_HDB_Ext_Lan_Manager_OWF.c',
-	'../heimdal/lib/hdb/asn1_HDB_Ext_PKINIT_acl.c',
-	'../heimdal/lib/hdb/asn1_HDB_Ext_PKINIT_certificate.c',
-	'../heimdal/lib/hdb/asn1_HDB_Ext_Password.c',
-	'../heimdal/lib/hdb/asn1_HDB_extension.c',
-	'../heimdal/lib/hdb/asn1_HDB_extensions.c',
-	'../heimdal/lib/hdb/asn1_Key.c',
-	'../heimdal/lib/hdb/asn1_Salt.c',
-	'../heimdal/lib/hdb/asn1_hdb_entry.c',
-	'../heimdal/lib/hdb/hdb_err.c'])
+	'../heimdal/lib/hdb/mkey.c','../heimdal/lib/hdb/ndbm.c',hdb_asn1,
+	hostenv.ErrorTable('../heimdal/lib/hdb/hdb_err.et')])
 
 hostenv.StaticLibrary('heimdal_gssapi',
 	['../heimdal/lib/gssapi/init_sec_context.c','../heimdal/lib/gssapi/inquire_cred.c',
@@ -28,10 +20,8 @@ hostenv.StaticLibrary('heimdal_gssapi',
 	'../heimdal/lib/gssapi/release_name.c','../heimdal/lib/gssapi/release_oid_set.c',
 	'../heimdal/lib/gssapi/sequence.c','../heimdal/lib/gssapi/test_oid_set_member.c',
 	'../heimdal/lib/gssapi/unwrap.c','../heimdal/lib/gssapi/verify_mic.c','../heimdal/lib/gssapi/wrap.c',
-	'../heimdal/lib/gssapi/address_to_krb5addr.c','../heimdal/lib/gssapi/asn1_ContextFlags.c',
-	'../heimdal/lib/gssapi/asn1_MechType.c','../heimdal/lib/gssapi/asn1_MechTypeList.c',
-	'../heimdal/lib/gssapi/asn1_NegotiationToken.c','../heimdal/lib/gssapi/asn1_NegTokenInit.c',
-	'../heimdal/lib/gssapi/asn1_NegTokenTarg.c','../heimdal/lib/gssapi/8003.c',
+	'../heimdal/lib/gssapi/address_to_krb5addr.c',
+	gssapi_asn1,'../heimdal/lib/gssapi/8003.c',
 	'../heimdal/lib/gssapi/accept_sec_context.c','../heimdal/lib/gssapi/acquire_cred.c',
 	'../heimdal/lib/gssapi/add_oid_set_member.c','../heimdal/lib/gssapi/arcfour.c',
 	'../heimdal/lib/gssapi/ccache_name.c','../heimdal/lib/gssapi/copy_ccache.c','../heimdal/lib/gssapi/cfx.c',
@@ -72,42 +62,12 @@ hostenv.StaticLibrary('heimdal_krb5',
 	'../heimdal/lib/krb5/set_default_realm.c','../heimdal/lib/krb5/store.c','../heimdal/lib/krb5/store_emem.c',
 	'../heimdal/lib/krb5/store_fd.c','../heimdal/lib/krb5/store_mem.c','../heimdal/lib/krb5/ticket.c',
 	'../heimdal/lib/krb5/time.c','../heimdal/lib/krb5/transited.c','../heimdal/lib/krb5/v4_glue.c',
-	'../heimdal/lib/krb5/version.c','../heimdal/lib/krb5/warn.c','../heimdal/lib/krb5/krb5_err.c',
-	'../heimdal/lib/krb5/heim_err.c','../heimdal/lib/krb5/k524_err.c'])
+	'../heimdal/lib/krb5/version.c','../heimdal/lib/krb5/warn.c',
+	hostenv.ErrorTable('../heimdal/lib/krb5/krb5_err.et'),
+	hostenv.ErrorTable('../heimdal/lib/krb5/heim_err.et'),
+	hostenv.ErrorTable('../heimdal/lib/krb5/k524_err.et')])
 
-hostenv.StaticLibrary('heimdal_asn1',
-	['../heimdal/lib/asn1/der_get.c','../heimdal/lib/asn1/der_put.c','../heimdal/lib/asn1/der_free.c',
-	'../heimdal/lib/asn1/der_length.c','../heimdal/lib/asn1/der_copy.c','../heimdal/lib/asn1/der_cmp.c',
-	'../heimdal/lib/asn1/asn1_AD_IF_RELEVANT.c','../heimdal/lib/asn1/asn1_APOptions.c',
-	'../heimdal/lib/asn1/asn1_AP_REP.c','../heimdal/lib/asn1/asn1_AP_REQ.c','../heimdal/lib/asn1/asn1_AS_REP.c',
-	'../heimdal/lib/asn1/asn1_AS_REQ.c','../heimdal/lib/asn1/asn1_Authenticator.c',
-	'../heimdal/lib/asn1/asn1_AuthorizationData.c','../heimdal/lib/asn1/asn1_CBCParameter.c',
-	'../heimdal/lib/asn1/asn1_CKSUMTYPE.c','../heimdal/lib/asn1/asn1_ChangePasswdDataMS.c',
-	'../heimdal/lib/asn1/asn1_Checksum.c','../heimdal/lib/asn1/asn1_ENCTYPE.c',
-	'../heimdal/lib/asn1/asn1_ETYPE_INFO.c','../heimdal/lib/asn1/asn1_ETYPE_INFO2.c',
-	'../heimdal/lib/asn1/asn1_ETYPE_INFO2_ENTRY.c','../heimdal/lib/asn1/asn1_ETYPE_INFO_ENTRY.c',
-	'../heimdal/lib/asn1/asn1_EncAPRepPart.c','../heimdal/lib/asn1/asn1_EncASRepPart.c',
-	'../heimdal/lib/asn1/asn1_EncKDCRepPart.c','../heimdal/lib/asn1/asn1_EncKrbCredPart.c',
-	'../heimdal/lib/asn1/asn1_EncKrbPrivPart.c','../heimdal/lib/asn1/asn1_EncTGSRepPart.c',
-	'../heimdal/lib/asn1/asn1_EncTicketPart.c','../heimdal/lib/asn1/asn1_EncryptedData.c',
-	'../heimdal/lib/asn1/asn1_EncryptionKey.c','../heimdal/lib/asn1/asn1_EtypeList.c',
-	'../heimdal/lib/asn1/asn1_HostAddress.c','../heimdal/lib/asn1/asn1_HostAddresses.c',
-	'../heimdal/lib/asn1/asn1_KDCOptions.c','../heimdal/lib/asn1/asn1_KDC_REP.c',
-	'../heimdal/lib/asn1/asn1_KDC_REQ.c','../heimdal/lib/asn1/asn1_KDC_REQ_BODY.c',
-	'../heimdal/lib/asn1/asn1_KRB_CRED.c','../heimdal/lib/asn1/asn1_KRB_ERROR.c',
-	'../heimdal/lib/asn1/asn1_KRB_PRIV.c','../heimdal/lib/asn1/asn1_KerberosString.c',
-	'../heimdal/lib/asn1/asn1_KerberosTime.c','../heimdal/lib/asn1/asn1_KrbCredInfo.c',
-	'../heimdal/lib/asn1/asn1_LR_TYPE.c','../heimdal/lib/asn1/asn1_LastReq.c',
-	'../heimdal/lib/asn1/asn1_MESSAGE_TYPE.c','../heimdal/lib/asn1/asn1_METHOD_DATA.c',
-	'../heimdal/lib/asn1/asn1_NAME_TYPE.c','../heimdal/lib/asn1/asn1_PADATA_TYPE.c',
-	'../heimdal/lib/asn1/asn1_PA_DATA.c','../heimdal/lib/asn1/asn1_PA_ENC_TS_ENC.c',
-	'../heimdal/lib/asn1/asn1_PA_PAC_REQUEST.c','../heimdal/lib/asn1/asn1_Principal.c',
-	'../heimdal/lib/asn1/asn1_PrincipalName.c','../heimdal/lib/asn1/asn1_RC2CBCParameter.c',
-	'../heimdal/lib/asn1/asn1_Realm.c','../heimdal/lib/asn1/asn1_TGS_REP.c',
-	'../heimdal/lib/asn1/asn1_TGS_REQ.c','../heimdal/lib/asn1/asn1_Ticket.c',
-	'../heimdal/lib/asn1/asn1_TicketFlags.c','../heimdal/lib/asn1/asn1_TransitedEncoding.c',
-	'../heimdal/lib/asn1/asn1_err.c','../heimdal/lib/asn1/asn1_krb5int32.c',
-	'../heimdal/lib/asn1/asn1_krb5uint32.c'])
+hostenv.StaticLibrary('heimdal_asn1', k5_asn1)
 
 hostenv.StaticLibrary('heimdal_des',
 	['../heimdal/lib/des/aes.c','../heimdal/lib/des/des.c','../heimdal/lib/des/md4.c','../heimdal/lib/des/md5.c',
@@ -141,8 +101,8 @@ buildenv.Program('asn1_compile',
 	'../heimdal/lib/asn1/gen_copy.c','../heimdal/lib/asn1/gen_decode.c',
 	'../heimdal/lib/asn1/gen_encode.c','../heimdal/lib/asn1/gen_free.c',
 	'../heimdal/lib/asn1/gen_glue.c','../heimdal/lib/asn1/gen_length.c',
-	'../heimdal/lib/asn1/hash.c','../heimdal/lib/asn1/lex.c',
-	'../heimdal/lib/asn1/parse.c','../heimdal/lib/roken/emalloc.c',
+	'../heimdal/lib/asn1/hash.c','../heimdal/lib/asn1/lex.l',
+	'../heimdal/lib/asn1/parse.y','../heimdal/lib/roken/emalloc.c',
 	'../heimdal/lib/roken/getarg.c','../heimdal/lib/roken/setprogname.c',
 	'../heimdal/lib/roken/strupr.c','../heimdal/lib/roken/getprogname.c',
 	'../heimdal/lib/roken/get_window_size.c','../heimdal/lib/roken/estrdup.c',
@@ -151,7 +111,7 @@ buildenv.Program('asn1_compile',
 	'lib/replace/snprintf.c','lib/replace/replace.c'])
 
 buildenv.Program('compile_et',
-	['../heimdal/lib/vers/print_version.c','../heimdal/lib/com_err/lex.c','../heimdal/lib/com_err/parse.c',
+	['../heimdal/lib/vers/print_version.c','../heimdal/lib/com_err/lex.l','../heimdal/lib/com_err/parse.y',
 	'../heimdal/lib/com_err/compile_et.c','../heimdal/lib/roken/getarg.c',
 	'../heimdal/lib/roken/get_window_size.c','../heimdal/lib/roken/getprogname.c',
 	'../heimdal/lib/roken/strupr.c','../heimdal/lib/roken/setprogname.c','heimdal_build/replace.c',