diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-04-21 17:19:29 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-04-26 11:37:46 +1000 |
| commit | 26a0ba7ee9ee0700746759c046a7e12edb8ecdd9 (patch) | |
| tree | 075a83b95b0b4351bc3657872782c1487190d185 | |
| parent | ad6ee6d55abaeb0eb4373b148fd7e000bfbff194 (diff) | |
| download | samba-26a0ba7ee9ee0700746759c046a7e12edb8ecdd9.tar.gz samba-26a0ba7ee9ee0700746759c046a7e12edb8ecdd9.tar.bz2 samba-26a0ba7ee9ee0700746759c046a7e12edb8ecdd9.zip | |
lib/util Define samba-util-common only for s3-waf
It causes too much trouble in the top level build.
Andrew Bartlett
| -rwxr-xr-x | lib/util/wscript_build | 35 |
1 files changed, 11 insertions, 24 deletions
diff --git a/lib/util/wscript_build b/lib/util/wscript_build index aad386ef2a..f1bb9e7493 100755 --- a/lib/util/wscript_build +++ b/lib/util/wscript_build @@ -15,7 +15,7 @@ s4_util_public_deps = 'talloc CHARSET execinfo uid_wrapper' s4_util_public_headers = 'attr.h byteorder.h data_blob.h memory.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h util.h' s4_util_header_path = [ ('dlinklist.h util.h', '.'), ('*', 'util') ] -if bld.env.enable_s3build or bld.env._SAMBA_BUILD_ == 3: +if bld.env._SAMBA_BUILD_ == 3: # as we move files into common between samba-util and samba-util3, move them here. # Both samba-util and samba-util3 depend on this private library bld.SAMBA_LIBRARY('samba-util-common', @@ -30,30 +30,17 @@ if bld.env.enable_s3build or bld.env._SAMBA_BUILD_ == 3: private_library=True ) - if bld.env._SAMBA_BUILD_ == 4: - bld.SAMBA_LIBRARY('samba-util', - source=s4_util_sources, - deps=s4_util_deps + ' samba-util-common', - public_deps=s4_util_public_deps, - public_headers=s4_util_public_headers, - header_path= s4_util_header_path, - local_include=False, - vnum='0.0.1', - pc_files='samba-util.pc' - ) - else: - if bld.env._SAMBA_BUILD_ == 4: - bld.SAMBA_LIBRARY('samba-util', - source=s4_util_sources + " " + common_util_sources, - deps=s4_util_deps, - public_deps=s4_util_public_deps + ' ' + common_util_public_deps, - public_headers=s4_util_public_headers + ' ' + common_util_headers, - header_path= s4_util_header_path, - local_include=False, - vnum='0.0.1', - pc_files='samba-util.pc' - ) + bld.SAMBA_LIBRARY('samba-util', + source=s4_util_sources + " " + common_util_sources, + deps=s4_util_deps, + public_deps=s4_util_public_deps + ' ' + common_util_public_deps, + public_headers=s4_util_public_headers + ' ' + common_util_headers, + header_path= s4_util_header_path, + local_include=False, + vnum='0.0.1', + pc_files='samba-util.pc' + ) # dummy subsystem for avoid wider deps changes. bld.SAMBA_SUBSYSTEM('samba-util-common', |