diff options
| -rw-r--r-- | buildtools/wafsamba/wafsamba.py | 6 | ||||
| -rw-r--r-- | source4/heimdal_build/wscript_build | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 3559cc196f..2ef68b1123 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -110,7 +110,7 @@ def SAMBA_LIBRARY(bld, libname, source, realname=None, autoproto=None, autoproto_extra_source='', - group='libraries', + group='main', depends_on='', local_include=True, global_include=True, @@ -306,7 +306,7 @@ def SAMBA_BINARY(bld, binname, source, use_hostcc=False, use_global_deps=True, compiler=None, - group='binaries', + group='main', manpages=None, local_include=True, global_include=True, @@ -629,8 +629,6 @@ def SETUP_BUILD_GROUPS(bld): bld.add_group('headers') bld.add_group('main') bld.add_group('symbolcheck') - bld.add_group('libraries') - bld.add_group('binaries') bld.add_group('syslibcheck') bld.add_group('final') Build.BuildContext.SETUP_BUILD_GROUPS = SETUP_BUILD_GROUPS diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build index f4471159eb..44634b4d83 100644 --- a/source4/heimdal_build/wscript_build +++ b/source4/heimdal_build/wscript_build @@ -243,7 +243,7 @@ def HEIMDAL_LIBRARY(libname, source, deps, vnum, version_script, includes=''): features = 'cc cshlib symlink_lib install_lib' - bld.set_group('libraries') + bld.set_group('main') t = bld( features = features, source = [], @@ -298,7 +298,7 @@ def HEIMDAL_BINARY(binname, source, use_hostcc=False, use_global_deps=True, compiler=None, - group='binaries', + group='main', install=True, install_path=None): '''define a Samba binary''' |