lib:crypto: Merge wscript_build into wscript

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/lib/crypto/wscript b/lib/crypto/wscript
index 040718d42df13e925e5b839fceedcfec8109d765..9089123be544b2d4ee5a15be36f2611aabcc35be 100644 (file)
--- a/lib/crypto/wscript
+++ b/lib/crypto/wscript
@@ -27,3 +27,58 @@ def configure(conf):
         raise Errors.WafError("--aes-accel=%s is not a valid option. Valid "
                               "options are [none|intelaesni]" %
                               Options.options.accel_aes)
+
+
+def build(bld):
+    extra_deps = ""
+
+    if (bld.CONFIG_SET("HAVE_AESNI_INTEL")
+            and not bld.CONFIG_SET('HAVE_GNUTLS_AES_CMAC')):
+        extra_deps += ' aesni-intel'
+
+    bld.SAMBA_SUBSYSTEM("GNUTLS_HELPERS",
+                        source='''
+                        gnutls_error.c
+                        gnutls_arcfour_confounded_md5.c
+                        gnutls_weak_crypto.c
+                        ''',
+                        deps="gnutls samba-errors")
+
+    bld.SAMBA_SUBSYSTEM("LIBCRYPTO_AES",
+                        source='aes.c rijndael-alg-fst.c',
+                        deps='talloc',
+                        enabled=not bld.CONFIG_SET('HAVE_GNUTLS_AES_CMAC'))
+
+    bld.SAMBA_SUBSYSTEM('LIBCRYPTO_AES_CMAC',
+                        source='aes_cmac_128.c',
+                        deps='talloc',
+                        enabled=not bld.CONFIG_SET('HAVE_GNUTLS_AES_CMAC'))
+
+    bld.SAMBA_SUBSYSTEM('LIBCRYPTO',
+                        source='''
+                        md4.c
+                        ''',
+                        deps='''
+                        talloc
+                        LIBCRYPTO_AES
+                        LIBCRYPTO_AES_CMAC
+                        ''' + extra_deps)
+
+    bld.SAMBA_SUBSYSTEM('TORTURE_LIBCRYPTO_AES_CMAC',
+                        source='aes_cmac_128_test.c',
+                        autoproto='aes_cmac_test_proto.h',
+                        deps='talloc',
+                        enabled=not bld.CONFIG_SET('HAVE_GNUTLS_AES_CMAC'))
+
+    bld.SAMBA_SUBSYSTEM('TORTURE_LIBCRYPTO',
+                        source='md4test.c',
+                        autoproto='test_proto.h',
+                        deps='''
+                        LIBCRYPTO
+                        TORTURE_LIBCRYPTO_AES_CMAC
+                        ''')
+
+    bld.SAMBA_PYTHON('python_crypto',
+                     source='py_crypto.c',
+                     deps='gnutls talloc',
+                     realname='samba/crypto.so')

diff --git a/lib/crypto/wscript_build b/lib/crypto/wscript_build
deleted file mode 100644 (file)
index e576604..0000000
--- a/lib/crypto/wscript_build
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/env python
-
-extra_deps = ''
-
-if (bld.CONFIG_SET("HAVE_AESNI_INTEL") and
-    not bld.CONFIG_SET('HAVE_GNUTLS_AES_CMAC')):
-        extra_deps += ' aesni-intel'
-
-bld.SAMBA_SUBSYSTEM('GNUTLS_HELPERS',
-                    source='''
-                    gnutls_error.c
-                    gnutls_arcfour_confounded_md5.c
-                    gnutls_weak_crypto.c
-                    ''',
-                    deps='gnutls samba-errors');
-
-bld.SAMBA_SUBSYSTEM('LIBCRYPTO_AES',
-                    source='aes.c rijndael-alg-fst.c',
-                    deps='talloc',
-                    enabled=not bld.CONFIG_SET('HAVE_GNUTLS_AES_CMAC'))
-
-bld.SAMBA_SUBSYSTEM('LIBCRYPTO_AES_CMAC',
-                    source='aes_cmac_128.c',
-                    deps='talloc',
-                    enabled=not bld.CONFIG_SET('HAVE_GNUTLS_AES_CMAC'))
-
-bld.SAMBA_SUBSYSTEM('LIBCRYPTO',
-        source='''
-               md4.c
-               ''',
-        deps='''
-             talloc
-             LIBCRYPTO_AES
-             LIBCRYPTO_AES_CMAC
-             ''' + extra_deps)
-
-bld.SAMBA_SUBSYSTEM('TORTURE_LIBCRYPTO_AES_CMAC',
-                    source='aes_cmac_128_test.c',
-                    autoproto='aes_cmac_test_proto.h',
-                    deps='talloc',
-                    enabled=not bld.CONFIG_SET('HAVE_GNUTLS_AES_CMAC'))
-
-bld.SAMBA_SUBSYSTEM('TORTURE_LIBCRYPTO',
-        source='md4test.c',
-        autoproto='test_proto.h',
-        deps='''
-             LIBCRYPTO
-             TORTURE_LIBCRYPTO_AES_CMAC
-             ''')
-
-bld.SAMBA_PYTHON('python_crypto',
-                 source='py_crypto.c',
-                 deps='gnutls talloc',
-                 realname='samba/crypto.so')