diff options
| -rw-r--r-- | buildtools/wafsamba/samba_deps.py | 12 | ||||
| -rw-r--r-- | buildtools/wafsamba/samba_python.py | 6 | ||||
| -rw-r--r-- | buildtools/wafsamba/wafsamba.py | 2 | ||||
| -rw-r--r-- | source4/scripting/python/wscript_build | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/buildtools/wafsamba/samba_deps.py b/buildtools/wafsamba/samba_deps.py index 51b7da9493..f073e41433 100644 --- a/buildtools/wafsamba/samba_deps.py +++ b/buildtools/wafsamba/samba_deps.py @@ -214,7 +214,7 @@ def add_init_functions(self): if m is not None: modules.append(m) - sentinal = getattr(self, 'init_function_sentinal', 'NULL') + sentinel = getattr(self, 'init_function_sentinel', 'NULL') targets = LOCAL_CACHE(bld, 'TARGET_TYPE') cflags = getattr(self, 'samba_cflags', [])[:] @@ -222,8 +222,8 @@ def add_init_functions(self): if modules == []: sname = sname.replace('-','_') sname = sname.replace('/','_') - cflags.append('-DSTATIC_%s_MODULES=%s' % (sname, sentinal)) - if sentinal == 'NULL': + cflags.append('-DSTATIC_%s_MODULES=%s' % (sname, sentinel)) + if sentinel == 'NULL': cflags.append('-DSTATIC_%s_MODULES_PROTO' % sname) self.ccflags = cflags return @@ -236,11 +236,11 @@ def add_init_functions(self): if targets[d['TARGET']] != 'DISABLED': init_fn_list.append(d['INIT_FUNCTION']) if init_fn_list == []: - cflags.append('-DSTATIC_%s_MODULES=%s' % (m, sentinal)) - if sentinal == 'NULL': + cflags.append('-DSTATIC_%s_MODULES=%s' % (m, sentinel)) + if sentinel == 'NULL': cflags.append('-DSTATIC_%s_MODULES_PROTO' % m) else: - cflags.append('-DSTATIC_%s_MODULES=%s' % (m, ','.join(init_fn_list) + ',' + sentinal)) + cflags.append('-DSTATIC_%s_MODULES=%s' % (m, ','.join(init_fn_list) + ',' + sentinel)) proto='' for f in init_fn_list: proto = proto + '_MODULE_PROTO(%s)' % f diff --git a/buildtools/wafsamba/samba_python.py b/buildtools/wafsamba/samba_python.py index 503fa75185..6bc32f00b6 100644 --- a/buildtools/wafsamba/samba_python.py +++ b/buildtools/wafsamba/samba_python.py @@ -21,7 +21,7 @@ def SAMBA_PYTHON(bld, name, realname=None, cflags='', includes='', - init_function_sentinal=None, + init_function_sentinel=None, local_include=True, vars=None, enabled=True): @@ -29,8 +29,8 @@ def SAMBA_PYTHON(bld, name, # when we support static python modules we'll need to gather # the list from all the SAMBA_PYTHON() targets - if init_function_sentinal is not None: - cflags += '-DSTATIC_LIBPYTHON_MODULES=%s' % init_function_sentinal + if init_function_sentinel is not None: + cflags += '-DSTATIC_LIBPYTHON_MODULES=%s' % init_function_sentinel source = bld.EXPAND_VARIABLES(source, vars=vars) diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index fd72cf3229..317bca1275 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -477,7 +477,7 @@ def SAMBA_SUBSYSTEM(bld, modname, source, cflags='', cflags_end=None, group='main', - init_function_sentinal=None, + init_function_sentinel=None, autoproto=None, autoproto_extra_source='', depends_on='', diff --git a/source4/scripting/python/wscript_build b/source4/scripting/python/wscript_build index 8879f759ba..9c23a96f8c 100644 --- a/source4/scripting/python/wscript_build +++ b/source4/scripting/python/wscript_build @@ -10,7 +10,7 @@ bld.SAMBA_LIBRARY('samba_python', bld.SAMBA_SUBSYSTEM('LIBPYTHON', source='modules.c', public_deps='', - init_function_sentinal='{NULL,NULL}', + init_function_sentinel='{NULL,NULL}', deps='talloc', pyext=True, ) |