heimdal: Fix name of hx509 library.
[mat/samba.git] / source4 / heimdal_build / wscript_build
index 46b2c35deaac67e17f5cdc3f85bf4e077f360f19..c451f85f16fac89cfb93aba1b103c6b7caa2e36f 100644 (file)
@@ -1,3 +1,185 @@
+#!/usr/bin/env python
+
+import Build
+import os
+from samba_utils import SET_TARGET_TYPE, TO_LIST
+from samba_autoconf import CURRENT_CFLAGS
+
+# waf build tool for building .et files with compile_et
+
+def HEIMDAL_ASN1(bld, name, source,
+               options='',
+               directory='',
+               option_file=None,
+               includes=''):
+    '''Build a ASN1 file using the asn1 compiler.
+       This will produce 2 output files'''
+    bname = os.path.basename(source)[0:-5];
+    dname = os.path.dirname(source)
+    asn1name = "%s_asn1" % bname
+
+    if not SET_TARGET_TYPE(bld, name, 'ASN1'):
+        return
+
+    # for ASN1 compilation, I always put it in build_source, as it doesn't make
+    # sense elsewhere
+    bld.SET_BUILD_GROUP('build_source')
+
+    out_files = []
+    out_files.append("../heimdal/%s/asn1_%s_asn1.x" % (directory, bname))
+    out_files.append("../heimdal/%s/%s_asn1.hx" % (directory, bname))
+    out_files.append("../heimdal/%s/%s_asn1-priv.hx" % (directory, bname))
+
+    # the ${TGT[0].parent.abspath(env)} expression gives us the parent directory of
+    # the first target in the build directory
+    # SRC[0].abspath(env) gives the absolute path to the source directory for the first
+    # source file. Note that in the case of a option_file, we have more than
+    # one source file
+    cd_rule = 'cd ${TGT[0].parent.abspath(env)}'
+    asn1_rule = cd_rule + ' && ${BLDBIN}/asn1_compile ${OPTION_FILE} ${ASN1OPTIONS} --one-code-file ${SRC[0].abspath(env)} ${ASN1NAME}'
+
+    source = TO_LIST(source)
+    source.append('asn1_compile')
+
+    if option_file is not None:
+        source.append(option_file)
+
+    t = bld(rule=asn1_rule,
+            ext_out = '.x',
+            before = 'cc',
+            on_results = True,
+            shell = True,
+            source = source,
+            target = out_files,
+            name=name + '_ASN1')
+
+    t.env.ASN1NAME     = asn1name
+    t.env.ASN1OPTIONS  = options
+    t.env.BLDBIN       = os.path.normpath(os.path.join(bld.srcnode.abspath(bld.env), '..'))
+    if option_file is not None:
+        t.env.OPTION_FILE = "--option-file=%s" % os.path.normpath(os.path.join(bld.curdir, option_file))
+
+    cfile = out_files[0][0:-2] + '.c'
+    hfile = out_files[1][0:-3] + '.h',
+    hpriv = out_files[2][0:-3] + '.h',
+
+    # now generate a .c file from the .x file
+    t = bld(rule='''( echo '#include "config.h"' && cat ${SRC} ) > ${TGT}''',
+            source = out_files[0],
+            target = cfile,
+            shell = True,
+            on_results=True,
+        ext_out = '.c',
+            ext_in = '.x',
+            depends_on = name + '_ASN1',
+            name = name + '_C')
+
+    # and generate a .h file from the .hx file
+    t = bld(rule='cp ${SRC} ${TGT}',
+            source = out_files[1],
+            ext_out = '.c',
+            ext_in = '.x',
+            on_results=True,
+            target = hfile,
+            depends_on = name + '_ASN1',
+            name = name + '_H')
+
+    # and generate a .h file from the .hx file
+    t = bld(rule='cp ${SRC} ${TGT}',
+            source = out_files[2],
+            ext_out = '.c',
+            ext_in = '.x',
+            on_results=True,
+            target = hpriv,
+            depends_on = name + '_ASN1',
+            name = name + '_PRIV_H')
+
+    bld.SET_BUILD_GROUP('main')
+
+    includes = TO_LIST(includes)
+    includes.append(os.path.dirname(out_files[0]))
+
+    t = bld(features       = 'cc',
+            source         = cfile,
+            target         = name,
+            samba_cflags   = CURRENT_CFLAGS(bld, name, ''),
+            depends_on     = '',
+            samba_deps     = TO_LIST('roken'),
+            samba_includes = includes,
+            local_include  = True)
+
+Build.BuildContext.HEIMDAL_ASN1 = HEIMDAL_ASN1
+
+def HEIMDAL_ERRTABLE(bld, name, source):
+    '''Build a heimdal errtable from a .et file'''
+
+    bname = source[0:-3]; # strip off the .et suffix
+
+    if not SET_TARGET_TYPE(bld, name, 'ET'):
+        return
+
+    bld.SET_BUILD_GROUP('build_source')
+
+    out_files = []
+    out_files.append('%s.c' % bname)
+    out_files.append('%s.h' % bname)
+
+    sources = [source, 'et_compile_wrapper.sh']
+
+    if not bld.CONFIG_SET('USING_SYSTEM_COMPILE_ET'):
+        sources.append('compile_et')
+
+    t = bld(rule='${SRC[1].abspath(env)} ${TGT[0].parent.abspath(env)} ${COMPILE_ET} ${SRC[0].abspath(env)} ${TGT[0].bldpath(env)}',
+            ext_out = '.c',
+            before  = 'cc',
+            on_results = True,
+            shell   = True,
+            source  = sources,
+            target  = out_files,
+            name    = name)
+Build.BuildContext.HEIMDAL_ERRTABLE = HEIMDAL_ERRTABLE
+
+def HEIMDAL_AUTOPROTO(bld, header, source, options=None, group='prototypes'):
+    '''rule for heimdal prototype generation'''
+    bld.SET_BUILD_GROUP(group)
+    if options is None:
+        options='-q -P comment -o'
+    SET_TARGET_TYPE(bld, header, 'PROTOTYPE')
+    t = bld(rule='${PERL} ${HEIMDAL}/cf/make-proto.pl ${OPTIONS} ${TGT[0].abspath(env)} ${SRC}',
+            source=source,
+            target=header,
+            on_results=True,
+            ext_out='.c',
+            before='cc')
+    t.env.HEIMDAL = os.path.join(bld.srcnode.abspath(), 'source4/heimdal')
+    t.env.OPTIONS = options
+Build.BuildContext.HEIMDAL_AUTOPROTO = HEIMDAL_AUTOPROTO
+
+
+def HEIMDAL_AUTOPROTO_PRIVATE(bld, header, source):
+    '''rule for private heimdal prototype generation'''
+    bld.HEIMDAL_AUTOPROTO(header, source, options='-q -P comment -p')
+Build.BuildContext.HEIMDAL_AUTOPROTO_PRIVATE = HEIMDAL_AUTOPROTO_PRIVATE
+
+
+def HEIMDAL_LIBRARY(bld, libname, source, deps,
+                  includes='',
+                  public_deps='',
+                  cflags='',
+                  heimdal_autoproto=None,
+                  heimdal_autoproto_options=None,
+                  heimdal_autoproto_private=None):
+    bld.SAMBA_LIBRARY(libname=libname, source=source, deps=deps,
+        public_deps=public_deps, cflags=cflags, includes=includes,
+        is_bundled=True)
+    if heimdal_autoproto is not None:
+        bld.HEIMDAL_AUTOPROTO(heimdal_autoproto, source,
+            options=heimdal_autoproto_options)
+    if heimdal_autoproto_private is not None:
+        bld.HEIMDAL_AUTOPROTO_PRIVATE(heimdal_autoproto_private, source)
+
+Build.BuildContext.HEIMDAL_LIBRARY = HEIMDAL_LIBRARY
+
 bld.SAMBA_GENERATOR(
     name="HEIMDAL_ERRORLIST",
     rule="${PYTHON} ${SRC[0].abspath()} ${SRC[1].abspath()} ${SRC[1].parent.abspath(env)}",
@@ -36,176 +218,228 @@ bld.SAMBA_GENERATOR(
 )
 
 
-bld.SAMBA_ASN1('HEIMDAL_SPNEGO_ASN1',
+bld.HEIMDAL_ASN1('HEIMDAL_SPNEGO_ASN1',
         source='../heimdal/lib/gssapi/spnego/spnego.asn1',
-       options='--sequence=MechTypeList',
+    options='--sequence=MechTypeList',
         includes='../heimdal/lib/asn1',
-       directory='lib/gssapi'
-       )
+    directory='lib/gssapi'
+    )
 
 
-bld.SAMBA_ASN1('HEIMDAL_GSSAPI_ASN1',
-       '../heimdal/lib/gssapi/mech/gssapi.asn1',
+bld.HEIMDAL_ASN1('HEIMDAL_GSSAPI_ASN1',
+    '../heimdal/lib/gssapi/mech/gssapi.asn1',
         includes='../heimdal/lib/asn1',
-       directory='lib/gssapi'
-       )
+    directory='lib/gssapi'
+    )
 
 
-bld.SAMBA_ASN1('HEIMDAL_KRB5_ASN1',
-       '../heimdal/lib/asn1/krb5.asn1',
-       option_file='../heimdal/lib/asn1/krb5.opt',
-       directory='lib/asn1'
-       )
+bld.HEIMDAL_ASN1('HEIMDAL_KRB5_ASN1',
+    '../heimdal/lib/asn1/krb5.asn1',
+    option_file='../heimdal/lib/asn1/krb5.opt',
+    directory='lib/asn1'
+    )
 
 
-bld.SAMBA_ASN1('HEIMDAL_DIGEST_ASN1',
-       '../heimdal/lib/asn1/digest.asn1',
-       directory='lib/asn1'
-       )
+bld.HEIMDAL_ASN1('HEIMDAL_DIGEST_ASN1',
+    '../heimdal/lib/asn1/digest.asn1',
+    directory='lib/asn1'
+    )
 
 
-bld.SAMBA_ASN1('HEIMDAL_PKCS8_ASN1',
-       '../heimdal/lib/asn1/pkcs8.asn1',
-       directory='lib/asn1'
-       )
+bld.HEIMDAL_ASN1('HEIMDAL_PKCS8_ASN1',
+    '../heimdal/lib/asn1/pkcs8.asn1',
+    directory='lib/asn1'
+    )
 
 
-bld.SAMBA_ASN1('HEIMDAL_PKCS9_ASN1',
-       '../heimdal/lib/asn1/pkcs9.asn1',
-       directory='lib/asn1'
-       )
+bld.HEIMDAL_ASN1('HEIMDAL_PKCS9_ASN1',
+    '../heimdal/lib/asn1/pkcs9.asn1',
+    directory='lib/asn1'
+    )
 
 
-bld.SAMBA_ASN1('HEIMDAL_PKCS12_ASN1',
-       '../heimdal/lib/asn1/pkcs12.asn1',
-       directory='lib/asn1'
-       )
+bld.HEIMDAL_ASN1('HEIMDAL_PKCS12_ASN1',
+    '../heimdal/lib/asn1/pkcs12.asn1',
+    directory='lib/asn1'
+    )
 
 
-bld.SAMBA_ASN1('HEIMDAL_RFC2459_ASN1',
-       '../heimdal/lib/asn1/rfc2459.asn1',
-       options='--preserve-binary=TBSCertificate --preserve-binary=TBSCRLCertList --preserve-binary=Name --sequence=GeneralNames --sequence=Extensions --sequence=CRLDistributionPoints',
-       directory='lib/asn1'
-       )
+bld.HEIMDAL_ASN1('HEIMDAL_RFC2459_ASN1',
+    '../heimdal/lib/asn1/rfc2459.asn1',
+    options='--preserve-binary=TBSCertificate --preserve-binary=TBSCRLCertList --preserve-binary=Name --sequence=GeneralNames --sequence=Extensions --sequence=CRLDistributionPoints',
+    directory='lib/asn1'
+    )
 
 
-bld.SAMBA_ASN1('HEIMDAL_PKINIT_ASN1',
-       '../heimdal/lib/asn1/pkinit.asn1',
-       directory='lib/asn1'
-       )
+bld.HEIMDAL_ASN1('HEIMDAL_PKINIT_ASN1',
+    '../heimdal/lib/asn1/pkinit.asn1',
+    directory='lib/asn1'
+    )
 
 
-bld.SAMBA_ASN1('HEIMDAL_CMS_ASN1',
-       '../heimdal/lib/asn1/cms.asn1',
-       option_file='../heimdal/lib/asn1/cms.opt',
-       directory='lib/asn1'
-       )
+bld.HEIMDAL_ASN1('HEIMDAL_CMS_ASN1',
+    '../heimdal/lib/asn1/cms.asn1',
+    option_file='../heimdal/lib/asn1/cms.opt',
+    directory='lib/asn1'
+    )
 
 
-bld.SAMBA_ASN1('HEIMDAL_OCSP_ASN1',
-       '../heimdal/lib/hx509/ocsp.asn1',
-       options='--preserve-binary=OCSPTBSRequest --preserve-binary=OCSPResponseData',
+bld.HEIMDAL_ASN1('HEIMDAL_OCSP_ASN1',
+    '../heimdal/lib/hx509/ocsp.asn1',
+    options='--preserve-binary=OCSPTBSRequest --preserve-binary=OCSPResponseData',
         includes='../heimdal/lib/asn1',
-       directory='lib/hx509'
-       )
+    directory='lib/hx509'
+    )
 
 
-bld.SAMBA_ASN1('HEIMDAL_KX509_ASN1',
-       '../heimdal/lib/asn1/kx509.asn1',
-       directory='lib/asn1'
-       )
+bld.HEIMDAL_ASN1('HEIMDAL_KX509_ASN1',
+    '../heimdal/lib/asn1/kx509.asn1',
+    directory='lib/asn1'
+    )
 
 
-bld.SAMBA_ASN1('HEIMDAL_PKCS10_ASN1',
-       '../heimdal/lib/hx509/pkcs10.asn1',
-       options='--preserve-binary=CertificationRequestInfo',
+bld.HEIMDAL_ASN1('HEIMDAL_PKCS10_ASN1',
+    '../heimdal/lib/hx509/pkcs10.asn1',
+    options='--preserve-binary=CertificationRequestInfo',
         includes='../heimdal/lib/asn1',
-       directory='lib/hx509'
-       )
+    directory='lib/hx509'
+    )
 
 
-bld.SAMBA_ASN1('HEIMDAL_HDB_ASN1',
-       '../heimdal/lib/hdb/hdb.asn1',
+bld.HEIMDAL_ASN1('HEIMDAL_HDB_ASN1',
+    '../heimdal/lib/hdb/hdb.asn1',
         includes='../heimdal/lib/asn1')
 
-bld.SAMBA_ERRTABLE('HEIMDAL_ASN1_ERR_ET',
-       '../heimdal/lib/asn1/asn1_err.et')
+bld.HEIMDAL_ERRTABLE('HEIMDAL_ASN1_ERR_ET',
+    '../heimdal/lib/asn1/asn1_err.et')
 
 
-bld.SAMBA_ERRTABLE('HEIMDAL_HDB_ERR_ET',
-       '../heimdal/lib/hdb/hdb_err.et')
+bld.HEIMDAL_ERRTABLE('HEIMDAL_HDB_ERR_ET',
+    '../heimdal/lib/hdb/hdb_err.et')
 
 
-bld.SAMBA_ERRTABLE('HEIMDAL_HEIM_ERR_ET',
-       '../heimdal/lib/krb5/heim_err.et')
+bld.HEIMDAL_ERRTABLE('HEIMDAL_HEIM_ERR_ET',
+    '../heimdal/lib/krb5/heim_err.et')
 
 
-bld.SAMBA_ERRTABLE('HEIMDAL_K524_ERR_ET',
-       '../heimdal/lib/krb5/k524_err.et')
+bld.HEIMDAL_ERRTABLE('HEIMDAL_K524_ERR_ET',
+    '../heimdal/lib/krb5/k524_err.et')
 
 
-bld.SAMBA_ERRTABLE('HEIMDAL_KRB_ERR_ET',
-       '../heimdal/lib/krb5/krb_err.et')
+bld.HEIMDAL_ERRTABLE('HEIMDAL_KRB_ERR_ET',
+    '../heimdal/lib/krb5/krb_err.et')
 
 
-bld.SAMBA_ERRTABLE('HEIMDAL_KRB5_ERR_ET',
-       '../heimdal/lib/krb5/krb5_err.et')
+bld.HEIMDAL_ERRTABLE('HEIMDAL_KRB5_ERR_ET',
+    '../heimdal/lib/krb5/krb5_err.et')
 
 
-bld.SAMBA_ERRTABLE('HEIMDAL_GKRB5_ERR_ET',
-       '../heimdal/lib/gssapi/krb5/gkrb5_err.et')
+bld.HEIMDAL_ERRTABLE('HEIMDAL_GKRB5_ERR_ET',
+    '../heimdal/lib/gssapi/krb5/gkrb5_err.et')
 
 
-bld.SAMBA_ERRTABLE('HEIMDAL_HX509_ERR_ET',
-       '../heimdal/lib/hx509/hx509_err.et')
+bld.HEIMDAL_ERRTABLE('HEIMDAL_HX509_ERR_ET',
+    '../heimdal/lib/hx509/hx509_err.et')
 
 
-bld.SAMBA_ERRTABLE('HEIMDAL_WIND_ERR_ET',
-       '../heimdal/lib/wind/wind_err.et')
+bld.HEIMDAL_ERRTABLE('WIND_ERR_ET',
+    '../heimdal/lib/wind/wind_err.et')
 
+ROKEN_HOSTCC_SOURCE = '''
+    ../heimdal/lib/roken/base64.c
+    ../heimdal/lib/roken/ct.c
+    ../heimdal/lib/roken/hex.c
+    ../heimdal/lib/roken/bswap.c
+    ../heimdal/lib/roken/dumpdata.c
+    ../heimdal/lib/roken/emalloc.c
+    ../heimdal/lib/roken/ecalloc.c
+    ../heimdal/lib/roken/getarg.c
+    ../heimdal/lib/roken/get_window_size.c
+    ../heimdal/lib/roken/getdtablesize.c
+    ../heimdal/lib/roken/h_errno.c
+    ../heimdal/lib/roken/issuid.c
+    ../heimdal/lib/roken/net_read.c
+    ../heimdal/lib/roken/net_write.c
+    ../heimdal/lib/roken/parse_time.c
+    ../heimdal/lib/roken/parse_units.c
+    ../heimdal/lib/roken/signal.c
+    ../heimdal/lib/roken/vis.c
+    ../heimdal/lib/roken/strlwr.c
+    ../heimdal/lib/roken/strsep_copy.c
+    ../heimdal/lib/roken/strsep.c
+    ../heimdal/lib/roken/strupr.c
+    ../heimdal/lib/roken/strpool.c
+    ../heimdal/lib/roken/estrdup.c
+    ../heimdal/lib/roken/erealloc.c
+    ../heimdal/lib/roken/simple_exec.c
+    ../heimdal/lib/roken/strcollect.c
+    ../heimdal/lib/roken/rtbl.c
+    ../heimdal/lib/roken/cloexec.c
+    ../heimdal/lib/roken/xfree.c
+    replace.c
+'''
+
+if not bld.CONFIG_SET('HAVE_GETPROGNAME'):
+    ROKEN_HOSTCC_SOURCE += '''
+        ../heimdal/lib/roken/getprogname.c
+        ../heimdal/lib/roken/setprogname.c
+    '''
+
+if not bld.CONFIG_SET('HAVE_CLOSEFROM'):
+    ROKEN_HOSTCC_SOURCE += '''
+        ../heimdal/lib/roken/closefrom.c
+    '''
+
+ROKEN_SOURCE = ROKEN_HOSTCC_SOURCE + '''
+    ../heimdal/lib/roken/resolve.c
+    ../heimdal/lib/roken/socket.c
+    ../heimdal/lib/roken/roken_gethostby.c
+'''
 
-bld.SAMBA_SUBSYSTEM('HEIMDAL_ROKEN',
-       '../heimdal/lib/roken/base64.c ../heimdal/lib/roken/ct.c ../heimdal/lib/roken/hex.c ../heimdal/lib/roken/bswap.c ../heimdal/lib/roken/dumpdata.c ../heimdal/lib/roken/emalloc.c ../heimdal/lib/roken/ecalloc.c ../heimdal/lib/roken/getarg.c ../heimdal/lib/roken/get_window_size.c ../heimdal/lib/roken/getdtablesize.c ../heimdal/lib/roken/h_errno.c ../heimdal/lib/roken/issuid.c ../heimdal/lib/roken/net_read.c ../heimdal/lib/roken/net_write.c ../heimdal/lib/roken/socket.c ../heimdal/lib/roken/parse_time.c ../heimdal/lib/roken/parse_units.c ../heimdal/lib/roken/resolve.c ../heimdal/lib/roken/roken_gethostby.c ../heimdal/lib/roken/signal.c ../heimdal/lib/roken/vis.c ../heimdal/lib/roken/strlwr.c ../heimdal/lib/roken/strsep_copy.c ../heimdal/lib/roken/strsep.c ../heimdal/lib/roken/strupr.c ../heimdal/lib/roken/strpool.c ../heimdal/lib/roken/estrdup.c ../heimdal/lib/roken/erealloc.c ../heimdal/lib/roken/simple_exec.c ../heimdal/lib/roken/strcollect.c ../heimdal/lib/roken/rtbl.c ../heimdal/lib/roken/cloexec.c ../heimdal/lib/roken/xfree.c replace.c',
-       includes='../heimdal/lib/roken ../heimdal/include ../../lib/socket_wrapper',
-       deps='HEIMDAL_ROKEN_PROGNAME HEIMDAL_ROKEN_CLOSEFROM resolv LIBREPLACE_NETWORK UID_WRAPPER util'
-       )
+bld.HEIMDAL_LIBRARY('roken',
+    ROKEN_SOURCE,
+    includes='../heimdal/lib/roken ../heimdal/include ../../lib/socket_wrapper',
+    deps='resolv UID_WRAPPER util',
+    )
 
 
-bld.SAMBA_SUBSYSTEM('HEIMDAL_KDC',
+bld.HEIMDAL_LIBRARY('kdc',
                     source='../heimdal/kdc/default_config.c ../heimdal/kdc/kerberos5.c ../heimdal/kdc/krb5tgs.c ../heimdal/kdc/pkinit.c ../heimdal/kdc/log.c ../heimdal/kdc/misc.c ../heimdal/kdc/kaserver.c ../heimdal/kdc/digest.c ../heimdal/kdc/process.c ../heimdal/kdc/windc.c ../heimdal/kdc/kx509.c',
                     includes='../heimdal/kdc',
                     heimdal_autoproto='../heimdal/kdc/kdc-protos.h',
                     heimdal_autoproto_private='../heimdal/kdc/kdc-private.h',
-                    deps='HEIMDAL_ROKEN HEIMDAL_KRB5 HEIMDAL_HDB HEIMDAL_HEIM_ASN1 HEIMDAL_DIGEST_ASN1 HEIMDAL_KX509_ASN1 HEIMDAL_NTLM HEIMDAL_HCRYPTO'
+                    deps='roken krb5 hdb HEIMDAL_HEIM_ASN1 HEIMDAL_DIGEST_ASN1 HEIMDAL_KX509_ASN1 heimntlm HEIMDAL_HCRYPTO',
                     )
 
 
-bld.SAMBA_SUBSYSTEM('HEIMDAL_NTLM',
+bld.HEIMDAL_LIBRARY('heimntlm',
                     source='../heimdal/lib/ntlm/ntlm.c',
                     includes='../heimdal/lib/ntlm',
                     heimdal_autoproto='../heimdal/lib/ntlm/heimntlm-protos.h',
-                    deps='HEIMDAL_ROKEN HEIMDAL_HCRYPTO HEIMDAL_KRB5'
-       )
+                    deps='roken HEIMDAL_HCRYPTO krb5',
+    )
 
 
 bld.SAMBA_SUBSYSTEM('HEIMDAL_HDB_KEYS',
-       '../heimdal/lib/hdb/keys.c',
-       includes='../heimdal/lib/hdb',
-       deps='HEIMDAL_ROKEN HEIMDAL_HCRYPTO HEIMDAL_KRB5 HEIMDAL_HDB_ASN1'
-       )
+    '../heimdal/lib/hdb/keys.c',
+    includes='../heimdal/lib/hdb',
+    deps='roken HEIMDAL_HCRYPTO krb5 HEIMDAL_HDB_ASN1'
+    )
 
 
-bld.SAMBA_SUBSYSTEM('HEIMDAL_HDB',
-                    source='''../heimdal/lib/hdb/db.c ../heimdal/lib/hdb/dbinfo.c ../heimdal/lib/hdb/hdb.c ../heimdal/lib/hdb/ext.c ../heimdal/lib/hdb/keytab.c
-                              ../heimdal/lib/hdb/mkey.c ../heimdal/lib/hdb/ndbm.c ../heimdal/lib/hdb/hdb_err.c hdb-glue.c''',
-                    includes='../heimdal/lib/hdb ../heimdal/lib/com_err',
+bld.HEIMDAL_LIBRARY('hdb',
+                    source='''../heimdal/lib/hdb/db.c ../heimdal/lib/hdb/dbinfo.c ../heimdal/lib/hdb/hdb.c
+                              ../heimdal/lib/hdb/ext.c ../heimdal/lib/hdb/keytab.c ../heimdal/lib/hdb/hdb-keytab.c
+                              ../heimdal/lib/hdb/mkey.c ../heimdal/lib/hdb/ndbm.c ../heimdal/lib/hdb/hdb_err.c
+                              hdb-glue.c''',
+                    includes='../heimdal/lib/hdb',
                     heimdal_autoproto='../heimdal/lib/hdb/hdb-protos.h',
                     heimdal_autoproto_private='../heimdal/lib/hdb/hdb-private.h',
-                    deps='HDB_LDB HEIMDAL_KRB5 HEIMDAL_HDB_KEYS HEIMDAL_ROKEN HEIMDAL_HCRYPTO HEIMDAL_COM_ERR HEIMDAL_HDB_ASN1'
-       )
+                    deps='HDB_LDB krb5 HEIMDAL_HDB_KEYS roken HEIMDAL_HCRYPTO com_err HEIMDAL_HDB_ASN1',
+    )
 
 
-bld.SAMBA_SUBSYSTEM('HEIMDAL_GSSAPI',
+bld.HEIMDAL_LIBRARY('gssapi',
                     '''
 ../heimdal/lib/gssapi/spnego/init_sec_context.c ../heimdal/lib/gssapi/spnego/external.c ../heimdal/lib/gssapi/spnego/compat.c
 ../heimdal/lib/gssapi/spnego/context_stubs.c ../heimdal/lib/gssapi/spnego/cred_stubs.c ../heimdal/lib/gssapi/spnego/accept_sec_context.c
@@ -246,14 +480,14 @@ bld.SAMBA_SUBSYSTEM('HEIMDAL_GSSAPI',
 ../heimdal/lib/gssapi/mech/gss_import_name.c ../heimdal/lib/gssapi/mech/gss_duplicate_name.c ../heimdal/lib/gssapi/mech/gss_unwrap.c
 ../heimdal/lib/gssapi/mech/gss_export_sec_context.c ../heimdal/lib/gssapi/mech/gss_inquire_context.c ../heimdal/lib/gssapi/mech/gss_release_name.c
 ../heimdal/lib/gssapi/mech/gss_set_cred_option.c  ../heimdal/lib/gssapi/mech/gss_pseudo_random.c gssapi-glue.c''',
-       includes='../heimdal/lib/gssapi ../heimdal/lib/gssapi/gssapi ../heimdal/lib/gssapi/spnego ../heimdal/lib/gssapi/krb5 ../heimdal/lib/gssapi/mech',
-       deps='HEIMDAL_HCRYPTO HEIMDAL_HEIM_ASN1 HEIMDAL_SPNEGO_ASN1 HEIMDAL_GSSAPI_ASN1 HEIMDAL_ROKEN HEIMDAL_KRB5'
-       )
+    includes='../heimdal/lib/gssapi ../heimdal/lib/gssapi/gssapi ../heimdal/lib/gssapi/spnego ../heimdal/lib/gssapi/krb5 ../heimdal/lib/gssapi/mech',
+    deps='HEIMDAL_HCRYPTO HEIMDAL_HEIM_ASN1 HEIMDAL_SPNEGO_ASN1 HEIMDAL_GSSAPI_ASN1 roken krb5',
+    )
 
 
 bld.SAMBA_GENERATOR(
     name="HEIMDAL_IFADDRS_H",
-    rule="ln -f ${SRC} ${TGT}",
+    rule="rm -f ${TGT} && ln ${SRC} ${TGT}",
     source = 'ifaddrs.hin',
     target = 'ifaddrs.h',
     enabled = not bld.CONFIG_SET('HAVE_IFADDRS_H')
@@ -262,13 +496,13 @@ bld.SAMBA_GENERATOR(
 bld.SAMBA_GENERATOR(
     group='build_compiler_source',
     name="HEIMDAL_ERR_H",
-    rule="ln -f ${SRC} ${TGT}",
+    rule="rm -f ${TGT} && ln ${SRC} ${TGT}",
     source = '../heimdal/lib/roken/err.hin',
     target = '../heimdal/lib/roken/err.h',
     enabled = not bld.CONFIG_SET('HAVE_ERR_H')
     )
 
-bld.SAMBA_SUBSYSTEM('HEIMDAL_KRB5',
+bld.HEIMDAL_LIBRARY('krb5',
                     bld.SUBDIR('../heimdal/lib/krb5/',
                                '''acache.c add_et_list.c
                                addr_families.c appdefault.c
@@ -279,6 +513,7 @@ bld.SAMBA_SUBSYSTEM('HEIMDAL_KRB5',
                                copy_host_realm.c crc.c creds.c
                                crypto.c data.c eai_to_heim_errno.c
                                error_string.c expand_hostname.c
+                               expand_path.c
                                fcache.c free.c free_host_realm.c
                                generate_seq_number.c generate_subkey.c
                                get_addrs.c get_cred.c
@@ -293,156 +528,133 @@ bld.SAMBA_SUBSYSTEM('HEIMDAL_KRB5',
                                mk_rep.c mk_req.c mk_req_ext.c
                                mit_glue.c n-fold.c padata.c pkinit.c
                                plugin.c principal.c prog_setup.c pac.c
-                               prompter_posix.c rd_cred.c rd_error.c
+                               pcache.c prompter_posix.c rd_cred.c rd_error.c
                                rd_priv.c rd_rep.c rd_req.c replay.c
                                send_to_kdc.c set_default_realm.c
                                store.c store_emem.c store_fd.c
                                store_mem.c ticket.c time.c transited.c
                                v4_glue.c version.c warn.c krb5_err.c
                                heim_err.c k524_err.c krb_err.c''') + ' krb5-glue.c',
-                    includes='../heimdal/lib/krb5 ../heimdal/lib/asn1 ../heimdal/lib/com_err',
-                    public_deps='HEIMDAL_COM_ERR',
+                    includes='../heimdal/lib/krb5 ../heimdal/lib/asn1',
+                    public_deps='com_err',
                     heimdal_autoproto='../heimdal/lib/krb5/krb5-protos.h',
                     heimdal_autoproto_options='-E KRB5_LIB -q -P comment -o',
                     heimdal_autoproto_private='../heimdal/lib/krb5/krb5-private.h',
-                    deps='HEIMDAL_ROKEN HEIMDAL_PKINIT_ASN1 HEIMDAL_WIND HEIMDAL_KRB5_ASN1 HEIMDAL_HX509 HEIMDAL_HCRYPTO LIBNETIF LIBSAMBA-HOSTCONFIG INTL'
+            cflags = bld.dynconfig_cflags(),
+            deps='roken HEIMDAL_PKINIT_ASN1 wind HEIMDAL_KRB5_ASN1 hx509 HEIMDAL_HCRYPTO LIBSAMBA-HOSTCONFIG intl',
                     )
 
 
 bld.SAMBA_SUBSYSTEM('HEIMDAL_HEIM_ASN1',
-       '../heimdal/lib/asn1/der_get.c ../heimdal/lib/asn1/der_put.c ../heimdal/lib/asn1/der_free.c ../heimdal/lib/asn1/der_format.c ../heimdal/lib/asn1/der_length.c ../heimdal/lib/asn1/der_copy.c ../heimdal/lib/asn1/der_cmp.c ../heimdal/lib/asn1/extra.c ../heimdal/lib/asn1/timegm.c ../heimdal/lib/asn1/asn1_err.c',
+    '../heimdal/lib/asn1/der_get.c ../heimdal/lib/asn1/der_put.c ../heimdal/lib/asn1/der_free.c ../heimdal/lib/asn1/der_format.c ../heimdal/lib/asn1/der_length.c ../heimdal/lib/asn1/der_copy.c ../heimdal/lib/asn1/der_cmp.c ../heimdal/lib/asn1/extra.c ../heimdal/lib/asn1/timegm.c ../heimdal/lib/asn1/asn1_err.c',
         includes='../heimdal/lib/asn1',
-       deps='HEIMDAL_ROKEN HEIMDAL_COM_ERR'
-       )
+    deps='roken com_err'
+    )
 
 
 bld.SAMBA_SUBSYSTEM('HEIMDAL_HCRYPTO_IMATH',
-       '../heimdal/lib/hcrypto/imath/imath.c ../heimdal/lib/hcrypto/imath/iprime.c',
+    '../heimdal/lib/hcrypto/imath/imath.c ../heimdal/lib/hcrypto/imath/iprime.c',
         includes='../heimdal/lib/hcrypto/imath',
-       deps='HEIMDAL_ROKEN'
-       )
-
+    deps='roken'
+    )
+bld.SAMBA_SUBSYSTEM('HEIMDAL_HCRYPTO_LTM',
+    '../heimdal/lib/hcrypto/libtommath/bncore.c ../heimdal/lib/hcrypto/libtommath/bn_mp_init.c ../heimdal/lib/hcrypto/libtommath/bn_mp_clear.c ../heimdal/lib/hcrypto/libtommath/bn_mp_exch.c ../heimdal/lib/hcrypto/libtommath/bn_mp_grow.c ../heimdal/lib/hcrypto/libtommath/bn_mp_shrink.c ../heimdal/lib/hcrypto/libtommath/bn_mp_clamp.c ../heimdal/lib/hcrypto/libtommath/bn_mp_zero.c ../heimdal/lib/hcrypto/libtommath/bn_mp_zero_multi.c ../heimdal/lib/hcrypto/libtommath/bn_mp_set.c ../heimdal/lib/hcrypto/libtommath/bn_mp_set_int.c ../heimdal/lib/hcrypto/libtommath/bn_mp_init_size.c ../heimdal/lib/hcrypto/libtommath/bn_mp_copy.c ../heimdal/lib/hcrypto/libtommath/bn_mp_init_copy.c ../heimdal/lib/hcrypto/libtommath/bn_mp_abs.c ../heimdal/lib/hcrypto/libtommath/bn_mp_neg.c ../heimdal/lib/hcrypto/libtommath/bn_mp_cmp_mag.c ../heimdal/lib/hcrypto/libtommath/bn_mp_cmp.c ../heimdal/lib/hcrypto/libtommath/bn_mp_cmp_d.c ../heimdal/lib/hcrypto/libtommath/bn_mp_rshd.c ../heimdal/lib/hcrypto/libtommath/bn_mp_lshd.c ../heimdal/lib/hcrypto/libtommath/bn_mp_mod_2d.c ../heimdal/lib/hcrypto/libtommath/bn_mp_div_2d.c ../heimdal/lib/hcrypto/libtommath/bn_mp_mul_2d.c ../heimdal/lib/hcrypto/libtommath/bn_mp_div_2.c ../heimdal/lib/hcrypto/libtommath/bn_mp_mul_2.c ../heimdal/lib/hcrypto/libtommath/bn_s_mp_add.c ../heimdal/lib/hcrypto/libtommath/bn_s_mp_sub.c ../heimdal/lib/hcrypto/libtommath/bn_fast_s_mp_mul_digs.c ../heimdal/lib/hcrypto/libtommath/bn_s_mp_mul_digs.c ../heimdal/lib/hcrypto/libtommath/bn_fast_s_mp_mul_high_digs.c ../heimdal/lib/hcrypto/libtommath/bn_s_mp_mul_high_digs.c ../heimdal/lib/hcrypto/libtommath/bn_fast_s_mp_sqr.c ../heimdal/lib/hcrypto/libtommath/bn_s_mp_sqr.c ../heimdal/lib/hcrypto/libtommath/bn_mp_add.c ../heimdal/lib/hcrypto/libtommath/bn_mp_sub.c ../heimdal/lib/hcrypto/libtommath/bn_mp_karatsuba_mul.c ../heimdal/lib/hcrypto/libtommath/bn_mp_mul.c ../heimdal/lib/hcrypto/libtommath/bn_mp_karatsuba_sqr.c ../heimdal/lib/hcrypto/libtommath/bn_mp_sqr.c ../heimdal/lib/hcrypto/libtommath/bn_mp_div.c ../heimdal/lib/hcrypto/libtommath/bn_mp_mod.c ../heimdal/lib/hcrypto/libtommath/bn_mp_add_d.c ../heimdal/lib/hcrypto/libtommath/bn_mp_sub_d.c ../heimdal/lib/hcrypto/libtommath/bn_mp_mul_d.c ../heimdal/lib/hcrypto/libtommath/bn_mp_div_d.c ../heimdal/lib/hcrypto/libtommath/bn_mp_mod_d.c ../heimdal/lib/hcrypto/libtommath/bn_mp_expt_d.c ../heimdal/lib/hcrypto/libtommath/bn_mp_addmod.c ../heimdal/lib/hcrypto/libtommath/bn_mp_submod.c ../heimdal/lib/hcrypto/libtommath/bn_mp_mulmod.c ../heimdal/lib/hcrypto/libtommath/bn_mp_sqrmod.c ../heimdal/lib/hcrypto/libtommath/bn_mp_gcd.c ../heimdal/lib/hcrypto/libtommath/bn_mp_lcm.c ../heimdal/lib/hcrypto/libtommath/bn_fast_mp_invmod.c ../heimdal/lib/hcrypto/libtommath/bn_mp_invmod.c ../heimdal/lib/hcrypto/libtommath/bn_mp_reduce.c ../heimdal/lib/hcrypto/libtommath/bn_mp_montgomery_setup.c ../heimdal/lib/hcrypto/libtommath/bn_fast_mp_montgomery_reduce.c ../heimdal/lib/hcrypto/libtommath/bn_mp_montgomery_reduce.c ../heimdal/lib/hcrypto/libtommath/bn_mp_exptmod_fast.c ../heimdal/lib/hcrypto/libtommath/bn_mp_exptmod.c ../heimdal/lib/hcrypto/libtommath/bn_mp_2expt.c ../heimdal/lib/hcrypto/libtommath/bn_mp_n_root.c ../heimdal/lib/hcrypto/libtommath/bn_mp_jacobi.c ../heimdal/lib/hcrypto/libtommath/bn_reverse.c ../heimdal/lib/hcrypto/libtommath/bn_mp_count_bits.c ../heimdal/lib/hcrypto/libtommath/bn_mp_read_unsigned_bin.c ../heimdal/lib/hcrypto/libtommath/bn_mp_read_signed_bin.c ../heimdal/lib/hcrypto/libtommath/bn_mp_to_unsigned_bin.c ../heimdal/lib/hcrypto/libtommath/bn_mp_to_signed_bin.c ../heimdal/lib/hcrypto/libtommath/bn_mp_unsigned_bin_size.c ../heimdal/lib/hcrypto/libtommath/bn_mp_signed_bin_size.c ../heimdal/lib/hcrypto/libtommath/bn_mp_xor.c ../heimdal/lib/hcrypto/libtommath/bn_mp_and.c ../heimdal/lib/hcrypto/libtommath/bn_mp_or.c ../heimdal/lib/hcrypto/libtommath/bn_mp_rand.c ../heimdal/lib/hcrypto/libtommath/bn_mp_montgomery_calc_normalization.c ../heimdal/lib/hcrypto/libtommath/bn_mp_prime_is_divisible.c ../heimdal/lib/hcrypto/libtommath/bn_prime_tab.c ../heimdal/lib/hcrypto/libtommath/bn_mp_prime_fermat.c ../heimdal/lib/hcrypto/libtommath/bn_mp_prime_miller_rabin.c ../heimdal/lib/hcrypto/libtommath/bn_mp_prime_is_prime.c ../heimdal/lib/hcrypto/libtommath/bn_mp_prime_next_prime.c ../heimdal/lib/hcrypto/libtommath/bn_mp_find_prime.c ../heimdal/lib/hcrypto/libtommath/bn_mp_isprime.c ../heimdal/lib/hcrypto/libtommath/bn_mp_dr_reduce.c ../heimdal/lib/hcrypto/libtommath/bn_mp_dr_is_modulus.c ../heimdal/lib/hcrypto/libtommath/bn_mp_dr_setup.c ../heimdal/lib/hcrypto/libtommath/bn_mp_reduce_setup.c ../heimdal/lib/hcrypto/libtommath/bn_mp_toom_mul.c ../heimdal/lib/hcrypto/libtommath/bn_mp_toom_sqr.c ../heimdal/lib/hcrypto/libtommath/bn_mp_div_3.c ../heimdal/lib/hcrypto/libtommath/bn_s_mp_exptmod.c ../heimdal/lib/hcrypto/libtommath/bn_mp_reduce_2k.c ../heimdal/lib/hcrypto/libtommath/bn_mp_reduce_is_2k.c ../heimdal/lib/hcrypto/libtommath/bn_mp_reduce_2k_setup.c ../heimdal/lib/hcrypto/libtommath/bn_mp_reduce_2k_l.c ../heimdal/lib/hcrypto/libtommath/bn_mp_reduce_is_2k_l.c ../heimdal/lib/hcrypto/libtommath/bn_mp_reduce_2k_setup_l.c ../heimdal/lib/hcrypto/libtommath/bn_mp_radix_smap.c ../heimdal/lib/hcrypto/libtommath/bn_mp_read_radix.c ../heimdal/lib/hcrypto/libtommath/bn_mp_toradix.c ../heimdal/lib/hcrypto/libtommath/bn_mp_radix_size.c ../heimdal/lib/hcrypto/libtommath/bn_mp_fread.c ../heimdal/lib/hcrypto/libtommath/bn_mp_fwrite.c ../heimdal/lib/hcrypto/libtommath/bn_mp_cnt_lsb.c ../heimdal/lib/hcrypto/libtommath/bn_error.c ../heimdal/lib/hcrypto/libtommath/bn_mp_init_multi.c ../heimdal/lib/hcrypto/libtommath/bn_mp_clear_multi.c ../heimdal/lib/hcrypto/libtommath/bn_mp_exteuclid.c ../heimdal/lib/hcrypto/libtommath/bn_mp_toradix_n.c ../heimdal/lib/hcrypto/libtommath/bn_mp_prime_random_ex.c ../heimdal/lib/hcrypto/libtommath/bn_mp_get_int.c ../heimdal/lib/hcrypto/libtommath/bn_mp_sqrt.c ../heimdal/lib/hcrypto/libtommath/bn_mp_is_square.c ../heimdal/lib/hcrypto/libtommath/bn_mp_init_set.c ../heimdal/lib/hcrypto/libtommath/bn_mp_init_set_int.c ../heimdal/lib/hcrypto/libtommath/bn_mp_invmod_slow.c ../heimdal/lib/hcrypto/libtommath/bn_mp_prime_rabin_miller_trials.c ../heimdal/lib/hcrypto/libtommath/bn_mp_to_signed_bin_n.c ../heimdal/lib/hcrypto/libtommath/bn_mp_to_unsigned_bin_n.c',
+        includes='../heimdal/lib/hcrypto/libtommath'
+    )
 
 bld.SAMBA_SUBSYSTEM('HEIMDAL_HCRYPTO',
-       '../heimdal/lib/hcrypto/aes.c ../heimdal/lib/hcrypto/bn.c ../heimdal/lib/hcrypto/dh.c ../heimdal/lib/hcrypto/dh-imath.c ../heimdal/lib/hcrypto/des.c ../heimdal/lib/hcrypto/dsa.c ../heimdal/lib/hcrypto/engine.c ../heimdal/lib/hcrypto/md2.c ../heimdal/lib/hcrypto/md4.c ../heimdal/lib/hcrypto/md5.c ../heimdal/lib/hcrypto/rsa.c ../heimdal/lib/hcrypto/rsa-imath.c ../heimdal/lib/hcrypto/rc2.c ../heimdal/lib/hcrypto/rc4.c ../heimdal/lib/hcrypto/rijndael-alg-fst.c ../heimdal/lib/hcrypto/rnd_keys.c ../heimdal/lib/hcrypto/sha.c ../heimdal/lib/hcrypto/sha256.c ../heimdal/lib/hcrypto/ui.c ../heimdal/lib/hcrypto/evp.c ../heimdal/lib/hcrypto/evp-hcrypto.c ../heimdal/lib/hcrypto/evp-cc.c ../heimdal/lib/hcrypto/pkcs5.c ../heimdal/lib/hcrypto/pkcs12.c ../heimdal/lib/hcrypto/rand.c ../heimdal/lib/hcrypto/rand-egd.c ../heimdal/lib/hcrypto/rand-unix.c ../heimdal/lib/hcrypto/rand-fortuna.c ../heimdal/lib/hcrypto/rand-timer.c ../heimdal/lib/hcrypto/hmac.c ../heimdal/lib/hcrypto/camellia.c ../heimdal/lib/hcrypto/camellia-ntt.c',
-       includes='../heimdal/lib/hcrypto ../heimdal/lib',
-       deps='HEIMDAL_ROKEN HEIMDAL_HEIM_ASN1 HEIMDAL_HCRYPTO_IMATH HEIMDAL_RFC2459_ASN1'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('HEIMDAL_HX509',
-       '../heimdal/lib/hx509/ca.c ../heimdal/lib/hx509/cert.c ../heimdal/lib/hx509/cms.c ../heimdal/lib/hx509/collector.c ../heimdal/lib/hx509/crypto.c ../heimdal/lib/hx509/error.c ../heimdal/lib/hx509/env.c ../heimdal/lib/hx509/file.c ../heimdal/lib/hx509/keyset.c ../heimdal/lib/hx509/ks_dir.c ../heimdal/lib/hx509/ks_file.c ../heimdal/lib/hx509/ks_keychain.c ../heimdal/lib/hx509/ks_mem.c ../heimdal/lib/hx509/ks_null.c ../heimdal/lib/hx509/ks_p11.c ../heimdal/lib/hx509/ks_p12.c ../heimdal/lib/hx509/lock.c ../heimdal/lib/hx509/name.c ../heimdal/lib/hx509/peer.c ../heimdal/lib/hx509/print.c ../heimdal/lib/hx509/req.c ../heimdal/lib/hx509/revoke.c ../heimdal/lib/hx509/sel.c ../heimdal/lib/hx509/hx509_err.c ../heimdal/lib/hx509/sel-lex.c ../heimdal/lib/hx509/sel-gram.c',
-       includes='../heimdal/lib/hx509',
-       deps='HEIMDAL_ROKEN HEIMDAL_COM_ERR HEIMDAL_HEIM_ASN1 HEIMDAL_HCRYPTO HEIMDAL_CMS_ASN1 HEIMDAL_RFC2459_ASN1 HEIMDAL_OCSP_ASN1 HEIMDAL_PKCS8_ASN1 HEIMDAL_PKCS9_ASN1 HEIMDAL_PKCS12_ASN1 HEIMDAL_PKINIT_ASN1 HEIMDAL_PKCS10_ASN1 HEIMDAL_WIND'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('HEIMDAL_WIND',
-       '../heimdal/lib/wind/wind_err.c ../heimdal/lib/wind/stringprep.c ../heimdal/lib/wind/errorlist.c ../heimdal/lib/wind/errorlist_table.c ../heimdal/lib/wind/normalize.c ../heimdal/lib/wind/normalize_table.c ../heimdal/lib/wind/combining.c ../heimdal/lib/wind/combining_table.c ../heimdal/lib/wind/utf8.c ../heimdal/lib/wind/bidi.c ../heimdal/lib/wind/bidi_table.c ../heimdal/lib/wind/ldap.c ../heimdal/lib/wind/map.c ../heimdal/lib/wind/map_table.c',
-       includes='../heimdal/lib/wind',
-       deps='HEIMDAL_ROKEN HEIMDAL_COM_ERR'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('HEIMDAL_ROKEN_PROGNAME',
-       '../heimdal/lib/roken/getprogname.c ../heimdal/lib/roken/setprogname.c',
-        includes='../heimdal/lib/roken',
-        enabled=not bld.CONFIG_SET('HAVE_GETPROGNAME')
-       )
-
-
-bld.SAMBA_SUBSYSTEM('HEIMDAL_ROKEN_CLOSEFROM',
-       '../heimdal/lib/roken/closefrom.c',
-        includes='../heimdal/lib/roken',
-        enabled=not bld.CONFIG_SET('HAVE_CLOSEFROM')
-       )
-
-
-bld.SAMBA_SUBSYSTEM('HEIMDAL_ROKEN_PROGNAME_H',
-       '../heimdal/lib/roken/getprogname.c ../heimdal/lib/roken/setprogname.c',
-        cflags='-DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1',
-        includes='../heimdal/lib/roken',
-        enabled=not bld.CONFIG_SET('HAVE_GETPROGNAME')
-       )
+    '../heimdal/lib/hcrypto/aes.c ../heimdal/lib/hcrypto/bn.c ../heimdal/lib/hcrypto/dh.c ../heimdal/lib/hcrypto/dh-ltm.c ../heimdal/lib/hcrypto/dh-imath.c ../heimdal/lib/hcrypto/des.c ../heimdal/lib/hcrypto/dsa.c ../heimdal/lib/hcrypto/engine.c ../heimdal/lib/hcrypto/md2.c ../heimdal/lib/hcrypto/md4.c ../heimdal/lib/hcrypto/md5.c ../heimdal/lib/hcrypto/rsa.c ../heimdal/lib/hcrypto/rsa-ltm.c ../heimdal/lib/hcrypto/rsa-imath.c ../heimdal/lib/hcrypto/rc2.c ../heimdal/lib/hcrypto/rc4.c ../heimdal/lib/hcrypto/rijndael-alg-fst.c ../heimdal/lib/hcrypto/rnd_keys.c ../heimdal/lib/hcrypto/sha.c ../heimdal/lib/hcrypto/sha256.c ../heimdal/lib/hcrypto/sha512.c ../heimdal/lib/hcrypto/ui.c ../heimdal/lib/hcrypto/evp.c ../heimdal/lib/hcrypto/evp-hcrypto.c ../heimdal/lib/hcrypto/pkcs5.c ../heimdal/lib/hcrypto/pkcs12.c ../heimdal/lib/hcrypto/rand.c ../heimdal/lib/hcrypto/rand-egd.c ../heimdal/lib/hcrypto/rand-unix.c ../heimdal/lib/hcrypto/rand-fortuna.c ../heimdal/lib/hcrypto/rand-timer.c ../heimdal/lib/hcrypto/hmac.c ../heimdal/lib/hcrypto/camellia.c ../heimdal/lib/hcrypto/camellia-ntt.c ../heimdal/lib/hcrypto/common.c ../heimdal/lib/hcrypto/validate.c',
+    includes='../heimdal/lib/hcrypto ../heimdal/lib',
+    deps='roken HEIMDAL_HEIM_ASN1 HEIMDAL_HCRYPTO_IMATH HEIMDAL_RFC2459_ASN1 HEIMDAL_HCRYPTO_LTM'
+    )
 
 
-bld.SAMBA_SUBSYSTEM('HEIMDAL_ROKEN_CLOSEFROM_H',
-       '../heimdal/lib/roken/closefrom.c',
-        cflags='-DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1',
-        includes='../heimdal/lib/roken',
-        enabled=not bld.CONFIG_SET('HAVE_CLOSEFROM')
-       )
-
+bld.HEIMDAL_LIBRARY('hx509',
+    '../heimdal/lib/hx509/ca.c ../heimdal/lib/hx509/cert.c ../heimdal/lib/hx509/cms.c ../heimdal/lib/hx509/collector.c ../heimdal/lib/hx509/crypto.c ../heimdal/lib/hx509/error.c ../heimdal/lib/hx509/env.c ../heimdal/lib/hx509/file.c ../heimdal/lib/hx509/keyset.c ../heimdal/lib/hx509/ks_dir.c ../heimdal/lib/hx509/ks_file.c ../heimdal/lib/hx509/ks_keychain.c ../heimdal/lib/hx509/ks_mem.c ../heimdal/lib/hx509/ks_null.c ../heimdal/lib/hx509/ks_p11.c ../heimdal/lib/hx509/ks_p12.c ../heimdal/lib/hx509/lock.c ../heimdal/lib/hx509/name.c ../heimdal/lib/hx509/peer.c ../heimdal/lib/hx509/print.c ../heimdal/lib/hx509/req.c ../heimdal/lib/hx509/revoke.c ../heimdal/lib/hx509/sel.c ../heimdal/lib/hx509/hx509_err.c ../heimdal/lib/hx509/sel-lex.c ../heimdal/lib/hx509/sel-gram.c',
+    includes='../heimdal/lib/hx509',
+    deps='roken com_err HEIMDAL_HEIM_ASN1 HEIMDAL_HCRYPTO HEIMDAL_CMS_ASN1 HEIMDAL_RFC2459_ASN1 HEIMDAL_OCSP_ASN1 HEIMDAL_PKCS8_ASN1 HEIMDAL_PKCS9_ASN1 HEIMDAL_PKCS12_ASN1 HEIMDAL_PKINIT_ASN1 HEIMDAL_PKCS10_ASN1 wind',
+    )
 
-bld.SAMBA_SUBSYSTEM('HEIMDAL_ROKEN_H',
-       '../heimdal/lib/roken/base64.c ../heimdal/lib/roken/ct.c ../heimdal/lib/roken/hex.c ../heimdal/lib/roken/bswap.c ../heimdal/lib/roken/dumpdata.c ../heimdal/lib/roken/emalloc.c ../heimdal/lib/roken/ecalloc.c ../heimdal/lib/roken/getarg.c ../heimdal/lib/roken/get_window_size.c ../heimdal/lib/roken/getdtablesize.c ../heimdal/lib/roken/h_errno.c ../heimdal/lib/roken/issuid.c ../heimdal/lib/roken/net_read.c ../heimdal/lib/roken/net_write.c ../heimdal/lib/roken/socket.c ../heimdal/lib/roken/parse_time.c ../heimdal/lib/roken/parse_units.c ../heimdal/lib/roken/resolve.c ../heimdal/lib/roken/roken_gethostby.c ../heimdal/lib/roken/signal.c ../heimdal/lib/roken/vis.c ../heimdal/lib/roken/strlwr.c ../heimdal/lib/roken/strsep_copy.c ../heimdal/lib/roken/strsep.c ../heimdal/lib/roken/strupr.c ../heimdal/lib/roken/strpool.c ../heimdal/lib/roken/estrdup.c ../heimdal/lib/roken/erealloc.c ../heimdal/lib/roken/simple_exec.c ../heimdal/lib/roken/strcollect.c ../heimdal/lib/roken/rtbl.c ../heimdal/lib/roken/cloexec.c ../heimdal/lib/roken/xfree.c replace.c',
-       includes='../heimdal/lib/roken',
-        cflags='-DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1',
-       deps='HEIMDAL_ROKEN_PROGNAME_H HEIMDAL_ROKEN_CLOSEFROM_H resolv LIBREPLACE_NETWORK'
-       )
 
+bld.HEIMDAL_LIBRARY('wind',
+    '../heimdal/lib/wind/wind_err.c ../heimdal/lib/wind/stringprep.c ../heimdal/lib/wind/errorlist.c ../heimdal/lib/wind/errorlist_table.c ../heimdal/lib/wind/normalize.c ../heimdal/lib/wind/normalize_table.c ../heimdal/lib/wind/combining.c ../heimdal/lib/wind/combining_table.c ../heimdal/lib/wind/utf8.c ../heimdal/lib/wind/bidi.c ../heimdal/lib/wind/bidi_table.c ../heimdal/lib/wind/ldap.c ../heimdal/lib/wind/map.c ../heimdal/lib/wind/map_table.c',
+    includes='../heimdal/lib/wind',
+    deps='roken com_err',
+    )
 
-bld.SAMBA_SUBSYSTEM('HEIMDAL_COM_ERR',
-       '../heimdal/lib/com_err/com_err.c ../heimdal/lib/com_err/error.c',
-       includes='../heimdal/lib/com_err',
-       deps='HEIMDAL_ROKEN',
-        enabled=not bld.CONFIG_SET('HAVE_COM_ERR')
-       )
+bld.SAMBA_SUBSYSTEM('ROKEN_HOSTCC',
+    ROKEN_HOSTCC_SOURCE,
+    use_hostcc=True,
+    use_global_deps=False,
+    includes='../heimdal/lib/roken',
+    cflags='-DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1 -D_SAMBA_HOSTCC_',
+    group='compiler_libraries',
+    deps='LIBREPLACE_HOSTCC',
+    )
 
+if not bld.CONFIG_SET('USING_SYSTEM_COM_ERR'):
+    bld.HEIMDAL_LIBRARY('com_err',
+        '../heimdal/lib/com_err/com_err.c ../heimdal/lib/com_err/error.c',
+        includes='../heimdal/lib/com_err',
+        deps='roken',
+        )
 
 # here is the asn1 compiler build rule
 bld.SAMBA_BINARY('asn1_compile',
-       '../heimdal/lib/asn1/main.c ../heimdal/lib/asn1/gen.c ../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/gen_seq.c ../heimdal/lib/asn1/hash.c ../heimdal/lib/asn1/symbol.c ../heimdal/lib/asn1/asn1parse.c ../heimdal/lib/asn1/lex.c ../heimdal/lib/vers/print_version.c',
-       use_hostcc=True,
+    '../heimdal/lib/asn1/main.c ../heimdal/lib/asn1/gen.c ../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/gen_seq.c ../heimdal/lib/asn1/gen_template.c ../heimdal/lib/asn1/hash.c ../heimdal/lib/asn1/symbol.c ../heimdal/lib/asn1/asn1parse.c ../heimdal/lib/asn1/lex.c ../heimdal/lib/vers/print_version.c',
+    use_hostcc=True,
+        use_global_deps=False,
         cflags='-DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1 -D_SAMBA_HOSTCC_',
         includes='../heimdal/lib/asn1 ../heimdal/lib/roken',
         group='build_compilers',
-       deps='HEIMDAL_ROKEN_H replace',
+        deps='ROKEN_HOSTCC',
         install=False
-       )
+    )
 
 
-bld.SAMBA_BINARY('compile_et',
-       '../heimdal/lib/vers/print_version.c ../heimdal/lib/com_err/parse.c ../heimdal/lib/com_err/lex.c ../heimdal/lib/com_err/compile_et.c',
-       use_hostcc=True,
-       includes='../heimdal/lib/com_err',
+if not bld.CONFIG_SET('USING_SYSTEM_COMPILE_ET'):
+    bld.SAMBA_BINARY('compile_et',
+        '../heimdal/lib/vers/print_version.c ../heimdal/lib/com_err/parse.c ../heimdal/lib/com_err/lex.c ../heimdal/lib/com_err/compile_et.c',
+        use_hostcc=True,
+        use_global_deps=False,
+        includes='../heimdal/lib/com_err',
         group='build_compilers',
         cflags='-DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1 -D_SAMBA_HOSTCC_',
-       deps='HEIMDAL_ROKEN_H replace',
+        deps='ROKEN_HOSTCC',
         install=False
-       )
-
+        )
+    bld.env['COMPILE_ET'] = os.path.join(bld.env['BUILD_DIRECTORY'], 'compile_et')
 
 bld.SAMBA_BINARY('samba4kinit',
-       '../heimdal/kuser/kinit.c ../heimdal/lib/vers/print_version.c',
+    '../heimdal/kuser/kinit.c ../heimdal/lib/vers/print_version.c',
         includes='../heimdal/lib/roken',
-       deps='HEIMDAL_KRB5 HEIMDAL_NTLM',
+        deps='krb5 heimntlm',
         install=False
-       )
+    )
 
 
 bld.SAMBA_BINARY('samba4kpasswd',
-       '../heimdal/kpasswd/kpasswd.c ../heimdal/lib/vers/print_version.c',
+    '../heimdal/kpasswd/kpasswd.c ../heimdal/lib/vers/print_version.c',
         includes='../heimdal/lib/roken',
-       deps='HEIMDAL_KRB5 HEIMDAL_NTLM',
+        deps='krb5 heimntlm',
         install=False
-       )
+    )
 
 
 bld.SAMBA_BINARY('rkpty',
-       '../heimdal/lib/roken/rkpty.c ../../lib/socket_wrapper/socket_wrapper.c',
-       deps='HEIMDAL_ROKEN OPENPTY',
+    '../heimdal/lib/roken/rkpty.c',
+        deps='roken OPENPTY',
         cflags='-DPACKAGE="Samba"',
         install=False
-       )
+    )
 
 HEIMDAL_GSSAPI_SPNEGO_SOURCE = '''
-       ../heimdal/lib/gssapi/spnego/init_sec_context.c
-       ../heimdal/lib/gssapi/spnego/external.c
-       ../heimdal/lib/gssapi/spnego/compat.c
-       ../heimdal/lib/gssapi/spnego/context_stubs.c
-       ../heimdal/lib/gssapi/spnego/cred_stubs.c
-       ../heimdal/lib/gssapi/spnego/accept_sec_context.c
+    ../heimdal/lib/gssapi/spnego/init_sec_context.c
+    ../heimdal/lib/gssapi/spnego/external.c
+    ../heimdal/lib/gssapi/spnego/compat.c
+    ../heimdal/lib/gssapi/spnego/context_stubs.c
+    ../heimdal/lib/gssapi/spnego/cred_stubs.c
+    ../heimdal/lib/gssapi/spnego/accept_sec_context.c
 '''
 
 bld.HEIMDAL_AUTOPROTO_PRIVATE('../heimdal/lib/gssapi/spnego/spnego-private.h',
@@ -450,54 +662,54 @@ bld.HEIMDAL_AUTOPROTO_PRIVATE('../heimdal/lib/gssapi/spnego/spnego-private.h',
 
 
 HEIMDAL_GSSAPI_KRB5_SOURCE = '''
-       ../heimdal/lib/gssapi/krb5/copy_ccache.c
-       ../heimdal/lib/gssapi/krb5/delete_sec_context.c
-       ../heimdal/lib/gssapi/krb5/init_sec_context.c
-       ../heimdal/lib/gssapi/krb5/context_time.c
-       ../heimdal/lib/gssapi/krb5/init.c
-       ../heimdal/lib/gssapi/krb5/address_to_krb5addr.c
-       ../heimdal/lib/gssapi/krb5/get_mic.c
-       ../heimdal/lib/gssapi/krb5/inquire_context.c
-       ../heimdal/lib/gssapi/krb5/add_cred.c
-       ../heimdal/lib/gssapi/krb5/inquire_cred.c
-       ../heimdal/lib/gssapi/krb5/inquire_cred_by_oid.c
-       ../heimdal/lib/gssapi/krb5/inquire_cred_by_mech.c
-       ../heimdal/lib/gssapi/krb5/inquire_mechs_for_name.c
-       ../heimdal/lib/gssapi/krb5/inquire_names_for_mech.c
-       ../heimdal/lib/gssapi/krb5/indicate_mechs.c
-       ../heimdal/lib/gssapi/krb5/inquire_sec_context_by_oid.c
-       ../heimdal/lib/gssapi/krb5/export_sec_context.c
-       ../heimdal/lib/gssapi/krb5/import_sec_context.c
-       ../heimdal/lib/gssapi/krb5/duplicate_name.c
-       ../heimdal/lib/gssapi/krb5/import_name.c
-       ../heimdal/lib/gssapi/krb5/compare_name.c
-       ../heimdal/lib/gssapi/krb5/export_name.c
-       ../heimdal/lib/gssapi/krb5/canonicalize_name.c
-       ../heimdal/lib/gssapi/krb5/unwrap.c
-       ../heimdal/lib/gssapi/krb5/wrap.c
-       ../heimdal/lib/gssapi/krb5/release_name.c
-       ../heimdal/lib/gssapi/krb5/cfx.c
-       ../heimdal/lib/gssapi/krb5/8003.c
-       ../heimdal/lib/gssapi/krb5/arcfour.c
-       ../heimdal/lib/gssapi/krb5/encapsulate.c
-       ../heimdal/lib/gssapi/krb5/display_name.c
-       ../heimdal/lib/gssapi/krb5/sequence.c
-       ../heimdal/lib/gssapi/krb5/display_status.c
-       ../heimdal/lib/gssapi/krb5/release_buffer.c
-       ../heimdal/lib/gssapi/krb5/external.c
-       ../heimdal/lib/gssapi/krb5/compat.c
-       ../heimdal/lib/gssapi/krb5/creds.c
-       ../heimdal/lib/gssapi/krb5/acquire_cred.c
-       ../heimdal/lib/gssapi/krb5/release_cred.c
-       ../heimdal/lib/gssapi/krb5/store_cred.c
-       ../heimdal/lib/gssapi/krb5/set_cred_option.c
-       ../heimdal/lib/gssapi/krb5/decapsulate.c
-       ../heimdal/lib/gssapi/krb5/verify_mic.c
-       ../heimdal/lib/gssapi/krb5/accept_sec_context.c
-       ../heimdal/lib/gssapi/krb5/set_sec_context_option.c
-       ../heimdal/lib/gssapi/krb5/process_context_token.c
-       ../heimdal/lib/gssapi/krb5/prf.c
-       ../heimdal/lib/gssapi/krb5/aeap.c
+    ../heimdal/lib/gssapi/krb5/copy_ccache.c
+    ../heimdal/lib/gssapi/krb5/delete_sec_context.c
+    ../heimdal/lib/gssapi/krb5/init_sec_context.c
+    ../heimdal/lib/gssapi/krb5/context_time.c
+    ../heimdal/lib/gssapi/krb5/init.c
+    ../heimdal/lib/gssapi/krb5/address_to_krb5addr.c
+    ../heimdal/lib/gssapi/krb5/get_mic.c
+    ../heimdal/lib/gssapi/krb5/inquire_context.c
+    ../heimdal/lib/gssapi/krb5/add_cred.c
+    ../heimdal/lib/gssapi/krb5/inquire_cred.c
+    ../heimdal/lib/gssapi/krb5/inquire_cred_by_oid.c
+    ../heimdal/lib/gssapi/krb5/inquire_cred_by_mech.c
+    ../heimdal/lib/gssapi/krb5/inquire_mechs_for_name.c
+    ../heimdal/lib/gssapi/krb5/inquire_names_for_mech.c
+    ../heimdal/lib/gssapi/krb5/indicate_mechs.c
+    ../heimdal/lib/gssapi/krb5/inquire_sec_context_by_oid.c
+    ../heimdal/lib/gssapi/krb5/export_sec_context.c
+    ../heimdal/lib/gssapi/krb5/import_sec_context.c
+    ../heimdal/lib/gssapi/krb5/duplicate_name.c
+    ../heimdal/lib/gssapi/krb5/import_name.c
+    ../heimdal/lib/gssapi/krb5/compare_name.c
+    ../heimdal/lib/gssapi/krb5/export_name.c
+    ../heimdal/lib/gssapi/krb5/canonicalize_name.c
+    ../heimdal/lib/gssapi/krb5/unwrap.c
+    ../heimdal/lib/gssapi/krb5/wrap.c
+    ../heimdal/lib/gssapi/krb5/release_name.c
+    ../heimdal/lib/gssapi/krb5/cfx.c
+    ../heimdal/lib/gssapi/krb5/8003.c
+    ../heimdal/lib/gssapi/krb5/arcfour.c
+    ../heimdal/lib/gssapi/krb5/encapsulate.c
+    ../heimdal/lib/gssapi/krb5/display_name.c
+    ../heimdal/lib/gssapi/krb5/sequence.c
+    ../heimdal/lib/gssapi/krb5/display_status.c
+    ../heimdal/lib/gssapi/krb5/release_buffer.c
+    ../heimdal/lib/gssapi/krb5/external.c
+    ../heimdal/lib/gssapi/krb5/compat.c
+    ../heimdal/lib/gssapi/krb5/creds.c
+    ../heimdal/lib/gssapi/krb5/acquire_cred.c
+    ../heimdal/lib/gssapi/krb5/release_cred.c
+    ../heimdal/lib/gssapi/krb5/store_cred.c
+    ../heimdal/lib/gssapi/krb5/set_cred_option.c
+    ../heimdal/lib/gssapi/krb5/decapsulate.c
+    ../heimdal/lib/gssapi/krb5/verify_mic.c
+    ../heimdal/lib/gssapi/krb5/accept_sec_context.c
+    ../heimdal/lib/gssapi/krb5/set_sec_context_option.c
+    ../heimdal/lib/gssapi/krb5/process_context_token.c
+    ../heimdal/lib/gssapi/krb5/prf.c
+    ../heimdal/lib/gssapi/krb5/aeap.c
 '''
 
 bld.HEIMDAL_AUTOPROTO_PRIVATE('../heimdal/lib/gssapi/krb5/gsskrb5-private.h',
@@ -505,30 +717,30 @@ bld.HEIMDAL_AUTOPROTO_PRIVATE('../heimdal/lib/gssapi/krb5/gsskrb5-private.h',
 
 
 HEIMDAL_HX509_OBJH_SOURCE = '''
-       ../heimdal/lib/hx509/ca.c
-       ../heimdal/lib/hx509/cert.c
-       ../heimdal/lib/hx509/cms.c
-       ../heimdal/lib/hx509/collector.c
-       ../heimdal/lib/hx509/crypto.c
-       ../heimdal/lib/hx509/error.c
-       ../heimdal/lib/hx509/env.c
-       ../heimdal/lib/hx509/file.c
-       ../heimdal/lib/hx509/keyset.c
-       ../heimdal/lib/hx509/ks_dir.c
-       ../heimdal/lib/hx509/ks_file.c
-       ../heimdal/lib/hx509/ks_keychain.c
-       ../heimdal/lib/hx509/ks_mem.c
-       ../heimdal/lib/hx509/ks_null.c
-       ../heimdal/lib/hx509/ks_p11.c
-       ../heimdal/lib/hx509/ks_p12.c
-       ../heimdal/lib/hx509/lock.c
-       ../heimdal/lib/hx509/name.c
-       ../heimdal/lib/hx509/peer.c
-       ../heimdal/lib/hx509/print.c
-       ../heimdal/lib/hx509/req.c
-       ../heimdal/lib/hx509/revoke.c
-       ../heimdal/lib/hx509/sel.c
-       ../heimdal/lib/hx509/hx509_err.c
+    ../heimdal/lib/hx509/ca.c
+    ../heimdal/lib/hx509/cert.c
+    ../heimdal/lib/hx509/cms.c
+    ../heimdal/lib/hx509/collector.c
+    ../heimdal/lib/hx509/crypto.c
+    ../heimdal/lib/hx509/error.c
+    ../heimdal/lib/hx509/env.c
+    ../heimdal/lib/hx509/file.c
+    ../heimdal/lib/hx509/keyset.c
+    ../heimdal/lib/hx509/ks_dir.c
+    ../heimdal/lib/hx509/ks_file.c
+    ../heimdal/lib/hx509/ks_keychain.c
+    ../heimdal/lib/hx509/ks_mem.c
+    ../heimdal/lib/hx509/ks_null.c
+    ../heimdal/lib/hx509/ks_p11.c
+    ../heimdal/lib/hx509/ks_p12.c
+    ../heimdal/lib/hx509/lock.c
+    ../heimdal/lib/hx509/name.c
+    ../heimdal/lib/hx509/peer.c
+    ../heimdal/lib/hx509/print.c
+    ../heimdal/lib/hx509/req.c
+    ../heimdal/lib/hx509/revoke.c
+    ../heimdal/lib/hx509/sel.c
+    ../heimdal/lib/hx509/hx509_err.c
 '''
 
 bld.HEIMDAL_AUTOPROTO('../heimdal/lib/hx509/hx509-protos.h',
@@ -540,17 +752,23 @@ bld.HEIMDAL_AUTOPROTO('../heimdal/lib/hx509/hx509-private.h',
                       options="-q -P comment -p")
 
 HEIMDAL_HEIM_ASN1_DER_SOURCE = '''
-       ../heimdal/lib/asn1/der_get.c
-       ../heimdal/lib/asn1/der_put.c
-       ../heimdal/lib/asn1/der_free.c
-       ../heimdal/lib/asn1/der_format.c
-       ../heimdal/lib/asn1/der_length.c
-       ../heimdal/lib/asn1/der_copy.c
-       ../heimdal/lib/asn1/der_cmp.c
+    ../heimdal/lib/asn1/der_get.c
+    ../heimdal/lib/asn1/der_put.c
+    ../heimdal/lib/asn1/der_free.c
+    ../heimdal/lib/asn1/der_format.c
+    ../heimdal/lib/asn1/der_length.c
+    ../heimdal/lib/asn1/der_copy.c
+    ../heimdal/lib/asn1/der_cmp.c
 '''
 
 bld.HEIMDAL_AUTOPROTO('../heimdal/lib/asn1/der-protos.h',
                       HEIMDAL_HEIM_ASN1_DER_SOURCE,
-                      group = 'build_compilers',
+                      group = 'compiler_prototypes',
                       options="-q -P comment -o")
 
+
+bld.HEIMDAL_AUTOPROTO('../heimdal/lib/asn1/der-private.h',
+                      HEIMDAL_HEIM_ASN1_DER_SOURCE,
+                      group = 'compiler_prototypes',
+                      options="-q -P comment -p")
+