waf: Move python build instructions to wscript

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlet <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/python/wscript b/python/wscript
index 714d649219d16f9db67bb3d23c8ad31e4b3f0ea9..687a268412f20ab3dd7d840aa1bb05d7aba29bdd 100644 (file)
--- a/python/wscript
+++ b/python/wscript
@@ -43,3 +43,47 @@ kdc_default_config_dir = "{1}"
             f.write(data.format(modulesdir, kdc_path))
     finally:
         f.close()
+
+def build(bld):
+    bld.SAMBA_LIBRARY('samba_python',
+                      source=[],
+                      deps='''
+                           LIBPYTHON
+                           pytalloc-util
+                           pyrpc_util
+                           ''',
+                      grouping_library=True,
+                      private_library=True,
+                      pyembed=True,
+                      enabled=bld.PYTHON_BUILD_IS_ENABLED())
+
+    bld.SAMBA_SUBSYSTEM('LIBPYTHON',
+                        source='modules.c',
+                        public_deps='',
+                        init_function_sentinel='{NULL,NULL}',
+                        deps='talloc',
+                        pyext=True,
+                        enabled=bld.PYTHON_BUILD_IS_ENABLED())
+
+    for env in bld.gen_python_environments():
+        pytalloc_util = bld.pyembed_libname('pytalloc-util')
+        pyparam_util = bld.pyembed_libname('pyparam_util')
+
+        bld.SAMBA_PYTHON('python_glue',
+                         source='pyglue.c',
+                         deps='''
+                              %s
+                              samba-util
+                              netif
+                              %s
+                              ''' % (pyparam_util, pytalloc_util),
+                         realname='samba/_glue.so')
+
+    if bld.PYTHON_BUILD_IS_ENABLED():
+        for env in bld.gen_python_environments():
+            # install out various python scripts for use by make test
+            bld.SAMBA_SCRIPT('samba_python_files',
+                             pattern='samba/**/*.py',
+                             installdir='python')
+
+            bld.INSTALL_WILDCARD('${PYTHONARCHDIR}', 'samba/**/*.py', flat=False)

diff --git a/python/wscript_build b/python/wscript_build
deleted file mode 100644 (file)
index 87da26f..0000000
--- a/python/wscript_build
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env python
-
-bld.SAMBA_LIBRARY('samba_python',
-       source=[],
-       deps='LIBPYTHON pytalloc-util pyrpc_util',
-       grouping_library=True,
-       private_library=True,
-       pyembed=True,
-       enabled=bld.PYTHON_BUILD_IS_ENABLED())
-
-bld.SAMBA_SUBSYSTEM('LIBPYTHON',
-       source='modules.c',
-       public_deps='',
-       init_function_sentinel='{NULL,NULL}',
-       deps='talloc',
-       pyext=True,
-       enabled=bld.PYTHON_BUILD_IS_ENABLED())
-
-for env in bld.gen_python_environments():
-       pytalloc_util = bld.pyembed_libname('pytalloc-util')
-       pyparam_util = bld.pyembed_libname('pyparam_util')
-
-       bld.SAMBA_PYTHON('python_glue',
-               source='pyglue.c',
-               deps='%s samba-util netif %s' % (pyparam_util, pytalloc_util),
-               realname='samba/_glue.so'
-               )
-
-if bld.PYTHON_BUILD_IS_ENABLED():
-    for env in bld.gen_python_environments():
-       # install out various python scripts for use by make test
-       bld.SAMBA_SCRIPT('samba_python_files',
-                        pattern='samba/**/*.py',
-                        installdir='python')
-
-       bld.INSTALL_WILDCARD('${PYTHONARCHDIR}', 'samba/**/*.py', flat=False)