diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-06-10 13:02:59 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-06-15 13:15:50 +0200 |
| commit | 419928b8dfec9b055fc2bb775c40ee57108892e6 (patch) | |
| tree | d9470fbc03da7887349c1ce45c30ecc9fb66933b | |
| parent | 6c9336110c75b9c14739c772f96147af5cea1eac (diff) | |
| download | samba-419928b8dfec9b055fc2bb775c40ee57108892e6.tar.gz samba-419928b8dfec9b055fc2bb775c40ee57108892e6.tar.bz2 samba-419928b8dfec9b055fc2bb775c40ee57108892e6.zip | |
wafsamba: Only add init function if not building module as shared library.
| -rw-r--r-- | buildtools/wafsamba/wafsamba.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 4b0580daeb..183253665e 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -327,11 +327,6 @@ def SAMBA_MODULE(bld, modname, source, enabled=True): '''define a Samba module.''' - # we add the init function regardless of whether the module - # is enabled or not, as we need to generate a null list if - # all disabled - bld.ADD_INIT_FUNCTION(subsystem, modname, init_function) - if internal_module or BUILTIN_LIBRARY(bld, modname): # treat internal modules as subsystems for now SAMBA_SUBSYSTEM(bld, modname, source, @@ -342,6 +337,7 @@ def SAMBA_MODULE(bld, modname, source, cflags=cflags, local_include=local_include, enabled=enabled) + bld.ADD_INIT_FUNCTION(subsystem, modname, init_function) return if not enabled: @@ -363,14 +359,19 @@ def SAMBA_MODULE(bld, modname, source, deps += ' ' + subsystem bld.SET_BUILD_GROUP('main') - bld( - features = 'cc', + t = bld( + features = 'cc cshlib install_lib', source = source, target = modname, samba_cflags = CURRENT_CFLAGS(bld, modname, cflags), samba_includes = includes, local_include = local_include, - samba_deps = TO_LIST(deps) + samba_deps = TO_LIST(deps), + install_path = None, + samba_inst_path= "${MODULESDIR}/%s" % subsystem, + samba_realname = None, + vnum = None, + samba_install = True, ) if autoproto is not None: |