diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-02-28 18:52:36 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-03-15 12:22:18 +1100 |
| commit | 59be7265ad8e0d923ab3856fed41ab43ffdf1269 (patch) | |
| tree | 2557e3229aadfdc39bb4544118a3db7db00de2cc /buildtools/wafsamba/samba_deps.py | |
| parent | 4f52becec1769e9378cf8de1ec13ee83d9b96f55 (diff) | |
| download | samba-59be7265ad8e0d923ab3856fed41ab43ffdf1269.tar.gz samba-59be7265ad8e0d923ab3856fed41ab43ffdf1269.tar.bz2 samba-59be7265ad8e0d923ab3856fed41ab43ffdf1269.zip | |
wafsamba: added global_include option
this allows you to disable the global include additions. We will use
this for testing our public headers without including any of the
source tree directories
Diffstat (limited to 'buildtools/wafsamba/samba_deps.py')
| -rw-r--r-- | buildtools/wafsamba/samba_deps.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/buildtools/wafsamba/samba_deps.py b/buildtools/wafsamba/samba_deps.py index a3968ada83..adeb3645ce 100644 --- a/buildtools/wafsamba/samba_deps.py +++ b/buildtools/wafsamba/samba_deps.py @@ -137,7 +137,7 @@ def build_includes(self): includes.extend(self.samba_includes_extended) - if 'EXTRA_INCLUDES' in bld.env: + if 'EXTRA_INCLUDES' in bld.env and getattr(self, 'global_include', True): includes.extend(bld.env['EXTRA_INCLUDES']) includes.append('#') @@ -958,7 +958,8 @@ def show_object_duplicates(bld, tgt_list): # this provides a way to save our dependency calculations between runs savedeps_version = 3 savedeps_inputs = ['samba_deps', 'samba_includes', 'local_include', 'local_include_first', 'samba_cflags', - 'source', 'grouping_library', 'samba_ldflags', 'allow_undefined_symbols' ] + 'source', 'grouping_library', 'samba_ldflags', 'allow_undefined_symbols', + 'use_global_deps', 'global_include' ] savedeps_outputs = ['uselib', 'uselib_local', 'add_objects', 'includes', 'ccflags', 'ldflags', 'samba_deps_extended'] savedeps_outenv = ['INC_PATHS'] savedeps_envvars = ['NONSHARED_BINARIES', 'GLOBAL_DEPENDENCIES', 'EXTRA_CFLAGS', 'EXTRA_LDFLAGS', 'EXTRA_INCLUDES' ] |