summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-02-17 15:42:10 +1100
committerAndrew Tridgell <tridge@samba.org>2011-02-18 15:09:47 +1100
commit324270ee572c86d48ff1ee84cc16924ef18ee2b9 (patch)
tree3c3f753fd903cbd421bb4cf64fc1a4c5e73fdb05
parent13bffa02d8a349b21bace8d96d0ae5af6d75e00b (diff)
downloadsamba-324270ee572c86d48ff1ee84cc16924ef18ee2b9.tar.gz
samba-324270ee572c86d48ff1ee84cc16924ef18ee2b9.tar.xz
samba-324270ee572c86d48ff1ee84cc16924ef18ee2b9.zip
libutil: make waf rules usable by s3 waf build
we need samba-util to be s4 only for now, because of the debug system differences Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
-rw-r--r--lib/util/wscript_build77
1 files changed, 39 insertions, 38 deletions
diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index 6930b65b379..5180c8c2a4c 100644
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -1,43 +1,44 @@
#!/usr/bin/env python
-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
- ''',
- 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') ],
- local_include=False,
- vnum='0.0.1',
- pc_files='samba-util.pc'
- )
+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
+ ''',
+ 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') ],
+ local_include=False,
+ vnum='0.0.1',
+ pc_files='samba-util.pc'
+ )
bld.SAMBA_SUBSYSTEM('ASN1_UTIL',