summaryrefslogtreecommitdiff
path: root/lib/util
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-02-22 14:10:38 +1100
committerAndrew Tridgell <tridge@samba.org>2011-02-23 00:45:21 +0100
commit457025eee75591e6e468c2ade1b63feb92deb85a (patch)
tree9a5ed32be44660b33af1b44f611b48d3a90fef49 /lib/util
parent9652cceb081b888e8f769a37f9b094237f7c9d4f (diff)
downloadsamba-457025eee75591e6e468c2ade1b63feb92deb85a.tar.gz
samba-457025eee75591e6e468c2ade1b63feb92deb85a.tar.bz2
samba-457025eee75591e6e468c2ade1b63feb92deb85a.zip
build: created samba-util-common library
this library will contain files that can be built in common between s3 and s4. Both samba-util and samba-util3 depend on it. Currently this library needs to be marked as allow_undefined_symbols, in order to allow s4 to build it. We can remove that flag once we have all the needed symbols in common Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'lib/util')
-rw-r--r--lib/util/wscript_build51
1 files changed, 21 insertions, 30 deletions
diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index dfb5623b15..2fbb8a6390 100644
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -1,37 +1,28 @@
#!/usr/bin/env python
+# 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',
+ source='''talloc_stack.c smb_threads.c xfile.c util_file.c time.c
+ rbtree.c rfc1738.c select.c''',
+ public_deps='talloc pthread',
+ # until we get all the dependencies in this library in common
+ # we need to allow this library to be built with unresolved symbols
+ allow_undefined_symbols=True,
+ local_include=False,
+ private_library=True
+ )
+
if bld.env._SAMBA_BUILD_ == 4:
bld.SAMBA_LIBRARY('samba-util',
- source='''
- become_daemon.c
- blocking.c
- data_blob.c
- debug.c
- dprintf.c
- fault.c
- fsusage.c
- genrand.c
- idtree.c
- ms_fnmatch.c
- params.c
- parmlist.c
- rbtree.c
- rfc1738.c
- select.c
- signal.c
- smb_threads.c
- substitute.c
- system.c
- talloc_stack.c
- time.c
- util.c
- util_file.c
- util_id.c
- util_net.c
- util_str.c
- util_strlist.c
- xfile.c
- ''',
+ source=''' become_daemon.c blocking.c
+ data_blob.c debug.c dprintf.c fault.c fsusage.c
+ genrand.c idtree.c ms_fnmatch.c params.c
+ parmlist.c signal.c
+ substitute.c system.c
+ util.c util_id.c util_net.c util_str.c
+ util_strlist.c xfile.c ''',
+ deps='samba-util-common',
public_deps='talloc LIBCRYPTO CHARSET execinfo uid_wrapper',
public_headers='attr.h byteorder.h data_blob.h debug.h memory.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h util.h',
header_path= [ ('dlinklist.h util.h', '.'), ('*', 'util') ],