diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2016-06-02 17:17:19 +1000 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2016-06-06 12:26:19 +0200 |
| commit | 2082c0c3b5b62286d111d91c56541710ecc0ffa1 (patch) | |
| tree | 616c42d2ad7eeb7c779aa0f1042aa9e68a537361 /lib | |
| parent | 4d26210806419ef5710f38d0fa478e9f52243484 (diff) | |
| download | samba-2082c0c3b5b62286d111d91c56541710ecc0ffa1.tar.gz | |
lib/util: Avoid splitting tevent-unix-util as public library
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11946
Commit 670db6ac1d678babd25dd82c4467c0f094cfabc5 split tevent-util public
library to create tevent-unix-util public library for standalone ctdb
use. This created a public library dependency between samba and ctdb
for packaging.
Bundle tevent_unix.c in public library tevent-util as before. However,
to avoid the dependencies for packaging, standalone ctdb build will
build tevent-util as a private library with only tevent_unix.c
This simplifies any new subsystems (or libraries) which need tevent-util
and are linked in both samba and ctdb.
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Volker Lendecke <vl@samba.org>
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/util/wscript_build | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/lib/util/wscript_build b/lib/util/wscript_build index aa0586ca6e3..713946d27a5 100755 --- a/lib/util/wscript_build +++ b/lib/util/wscript_build @@ -70,16 +70,15 @@ bld.SAMBA_SUBSYSTEM('samba-util-core', tevent execinfo pthread strv''', local_include=False) -bld.SAMBA_LIBRARY('tevent-unix-util', - source='tevent_unix.c', - local_include=False, - deps='tevent', - public_headers='tevent_unix.h', - header_path=[ ('*', 'util') ], - pc_files=[], - vnum='0.0.1') +if bld.env.SAMBA_UTIL_CORE_ONLY: + + bld.SAMBA_LIBRARY('tevent-util', + source='tevent_unix.c', + local_include=False, + deps='tevent', + private_library=True) -if not bld.env.SAMBA_UTIL_CORE_ONLY: +else: bld.env.public_headers_skip.append('charset_compat.h') @@ -143,10 +142,10 @@ if not bld.env.SAMBA_UTIL_CORE_ONLY: ) bld.SAMBA_LIBRARY('tevent-util', - source='tevent_ntstatus.c tevent_werror.c', + source='tevent_unix.c tevent_ntstatus.c tevent_werror.c', local_include=False, - public_deps='tevent samba-errors tevent-unix-util', - public_headers='tevent_ntstatus.h tevent_werror.h', + public_deps='tevent samba-errors', + public_headers='tevent_ntstatus.h tevent_unix.h tevent_werror.h', header_path=[ ('*', 'util') ], pc_files=[], vnum='0.0.1' |