diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-10-03 06:58:39 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-10-03 16:25:37 +0200 |
| commit | beed95e3a2ae4460e80294fc43ef3d916c7f7454 (patch) | |
| tree | 4c1810f882e56f803b4656606a14802579aab6e5 /buildtools/wafsamba | |
| parent | e2eae17961ef7fd3457c126bc19b3ef54149be00 (diff) | |
| download | samba-beed95e3a2ae4460e80294fc43ef3d916c7f7454.tar.gz samba-beed95e3a2ae4460e80294fc43ef3d916c7f7454.tar.bz2 samba-beed95e3a2ae4460e80294fc43ef3d916c7f7454.zip | |
heimdal: convert some subsystems to libraries, consistent with upstream heimdal.
Diffstat (limited to 'buildtools/wafsamba')
| -rw-r--r-- | buildtools/wafsamba/wafsamba.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 11de9d5dcc..db5445c774 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -117,6 +117,9 @@ def SAMBA_LIBRARY(bld, libname, source, hide_symbols=False, is_bundled=False, manpages=None, + heimdal_autoproto=None, + heimdal_autoproto_options=None, + heimdal_autoproto_private=None, enabled=True): '''define a Samba library''' @@ -217,6 +220,11 @@ def SAMBA_LIBRARY(bld, libname, source, if manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']: bld.MANPAGES(manpages) + if heimdal_autoproto is not None: + bld.HEIMDAL_AUTOPROTO(heimdal_autoproto, source, options=heimdal_autoproto_options) + if heimdal_autoproto_private is not None: + bld.HEIMDAL_AUTOPROTO_PRIVATE(heimdal_autoproto_private, source) + Build.BuildContext.SAMBA_LIBRARY = SAMBA_LIBRARY @@ -394,9 +402,6 @@ def SAMBA_SUBSYSTEM(bld, modname, source, cflags_end=None, group='main', init_function_sentinal=None, - heimdal_autoproto=None, - heimdal_autoproto_options=None, - heimdal_autoproto_private=None, autoproto=None, autoproto_extra_source='', depends_on='', @@ -452,10 +457,6 @@ def SAMBA_SUBSYSTEM(bld, modname, source, if cflags_end is not None: t.samba_cflags.extend(TO_LIST(cflags_end)) - if heimdal_autoproto is not None: - bld.HEIMDAL_AUTOPROTO(heimdal_autoproto, source, options=heimdal_autoproto_options) - if heimdal_autoproto_private is not None: - bld.HEIMDAL_AUTOPROTO_PRIVATE(heimdal_autoproto_private, source) if autoproto is not None: bld.SAMBA_AUTOPROTO(autoproto, source + TO_LIST(autoproto_extra_source)) if public_headers is not None: |