python-samba3: Secrets file loaded from private dir, not lib dir

[idra/samba.git] / source4 / scripting / python / wscript_build

diff --git a/source4/scripting/python/wscript_build b/source4/scripting/python/wscript_build
index 9c12ca7b4b88b2b61940b81f8a47ee0038500391..540f3b7bb7e7f4282f8879233beb241c67fb1d94 100644 (file)
--- a/source4/scripting/python/wscript_build
+++ b/source4/scripting/python/wscript_build
@@ -1,40 +1,39 @@
 #!/usr/bin/env python
 
-bld.SAMBA_PYTHON('LIBPYTHON',
-                 source='modules.c',
-                 public_deps='EXT_LIB_PYTHON',
-                 init_function_sentinal='{NULL,NULL}',
-                 deps='PYTALLOC',
+bld.SAMBA_LIBRARY('samba_python',
+       source=[],
+       deps='LIBPYTHON pytalloc-util pyrpc_util',
+       grouping_library=True,
+       private_library=True,
+       pyext=True)
+
+bld.SAMBA_SUBSYSTEM('LIBPYTHON',
+       source='modules.c',
+       public_deps='',
+       init_function_sentinal='{NULL,NULL}',
+       deps='talloc',
+       pyext=True,
        )
 
 
-bld.SAMBA_PYTHON('PYTALLOC',
-                 source='../../../lib/talloc/pytalloc.c',
-                 public_deps='EXT_LIB_PYTHON talloc'
-                 )
-
-
 bld.SAMBA_PYTHON('python_uuid',
-                 source='uuidmodule.c',
-                 deps='LIBNDR',
-                 realname='uuid.so'
-                 )
+       source='uuidmodule.c',
+       deps='ndr',
+       realname='uuid.so',
+       enabled = float(bld.env.PYTHON_VERSION) <= 2.4
+       )
 
 
 bld.SAMBA_PYTHON('python_glue',
-                 source='pyglue.c',
-                 deps='LIBNDR ldb SAMDB CREDENTIALS pyldb python_dcerpc_misc python_dcerpc_security pyauth pyldb_util pyparam_util',
-                 realname='samba/_glue.so'
+       source='pyglue.c',
+       deps='pyparam_util samba-util netif pytalloc-util',
+       realname='samba/_glue.so'
        )
 
 
-# create a dummy subsystem for EXT_LIB_PYTHON
-bld.SAMBA_SUBSYSTEM('EXT_LIB_PYTHON', '')
-
-
 # install out various python scripts for use by make test
 bld.SAMBA_SCRIPT('samba_python',
                  pattern='samba/**/*.py',
                  installdir='python')
 
-bld.INSTALL_WILDCARD('${PYTHONDIR}', 'samba/**/*.py', flat=False)
+bld.INSTALL_WILDCARD('${PYTHONARCHDIR}', 'samba/**/*.py', flat=False)