diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-02-15 16:13:05 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-02-18 15:09:46 +1100 |
| commit | 433f68efaab8418f44cde29c6c857680719dda79 (patch) | |
| tree | 5a5ac639533883ad292d063c331af80921879866 /buildtools | |
| parent | 41b1f9794335ed2308d366a323bc44d1d7b23329 (diff) | |
| download | samba-433f68efaab8418f44cde29c6c857680719dda79.tar.gz samba-433f68efaab8418f44cde29c6c857680719dda79.tar.bz2 samba-433f68efaab8418f44cde29c6c857680719dda79.zip | |
waf: library_flags() doesn't only operate on conf objects
use a better name for the first argument
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'buildtools')
| -rw-r--r-- | buildtools/wafsamba/samba_autoconf.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py index ec0ed16e52..299b380a1a 100644 --- a/buildtools/wafsamba/samba_autoconf.py +++ b/buildtools/wafsamba/samba_autoconf.py @@ -463,21 +463,22 @@ Build.BuildContext.CONFIG_SET = CONFIG_SET Build.BuildContext.CONFIG_GET = CONFIG_GET -def library_flags(conf, libs): +def library_flags(self, libs): '''work out flags from pkg_config''' ccflags = [] ldflags = [] for lib in TO_LIST(libs): - inc_path = getattr(conf.env, 'CPPPATH_%s' % lib.upper(), []) - lib_path = getattr(conf.env, 'LIBPATH_%s' % lib.upper(), []) + inc_path = getattr(self.env, 'CPPPATH_%s' % lib.upper(), []) + lib_path = getattr(self.env, 'LIBPATH_%s' % lib.upper(), []) ccflags.extend(['-I%s' % i for i in inc_path]) ldflags.extend(['-L%s' % l for l in lib_path]) - extra_ccflags = TO_LIST(getattr(conf.env, 'CCFLAGS_%s' % lib.upper(), [])) - extra_ldflags = TO_LIST(getattr(conf.env, 'LDFLAGS_%s' % lib.upper(), [])) + extra_ccflags = TO_LIST(getattr(self.env, 'CCFLAGS_%s' % lib.upper(), [])) + extra_ldflags = TO_LIST(getattr(self.env, 'LDFLAGS_%s' % lib.upper(), [])) ccflags.extend(extra_ccflags) ldflags.extend(extra_ldflags) - if 'EXTRA_LDFLAGS' in conf.env: - ldflags.extend(conf.env['EXTRA_LDFLAGS']) + if 'EXTRA_LDFLAGS' in self.env: + ldflags.extend(self.env['EXTRA_LDFLAGS']) + ccflags = unique_list(ccflags) ldflags = unique_list(ldflags) return (ccflags, ldflags) |