summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2011-02-08 01:04:57 +0100
committerGünther Deschner <gd@samba.org>2011-02-11 14:14:23 +0100
commit3eb7e125ab2488221a70fdf5fb7ddcb9194a5b6a (patch)
tree260c2a20aa8f57674e44ef6788d8e87253017705
parent8015514c5b19acf37e6121eefdc8464fb89e60c2 (diff)
downloadsamba-3eb7e125ab2488221a70fdf5fb7ddcb9194a5b6a.tar.gz
samba-3eb7e125ab2488221a70fdf5fb7ddcb9194a5b6a.tar.bz2
samba-3eb7e125ab2488221a70fdf5fb7ddcb9194a5b6a.zip
waf: pure cosmetic reformatting of the two samba-util object lists (to ease comparing).
Guenther
-rw-r--r--lib/util/wscript_build31
-rw-r--r--source3/wscript_build37
2 files changed, 55 insertions, 13 deletions
diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index 375a1483f6..6930b65b37 100644
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -1,7 +1,36 @@
#!/usr/bin/env python
bld.SAMBA_LIBRARY('samba-util',
- source='xfile.c debug.c fault.c signal.c system.c time.c genrand.c dprintf.c util_str.c rfc1738.c substitute.c util_strlist.c util_file.c data_blob.c util.c blocking.c util_net.c fsusage.c ms_fnmatch.c idtree.c become_daemon.c rbtree.c talloc_stack.c smb_threads.c params.c parmlist.c util_id.c select.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
+ 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') ],
diff --git a/source3/wscript_build b/source3/wscript_build
index a201979ba8..2acb6b6698 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -53,18 +53,31 @@ LIBREPLACE_SRC = '''${LIBREPLACE_SRCS}'''
LIBSAMBAUTIL_SRC = '''${LIBREPLACE_SRC}'''
-UTIL_SRC = '''../lib/util/rbtree.c ../lib/util/signal.c ../lib/util/time.c
- ../lib/util/xfile.c ../lib/util/util_strlist.c
- ../lib/util/util_file.c ../lib/util/data_blob.c
- ../lib/util/util.c ../lib/util/fsusage.c
- ../lib/util/params.c ../lib/util/talloc_stack.c
- ../lib/util/genrand.c ../lib/util/util_net.c
- ../lib/util/become_daemon.c ../lib/util/system.c
- ../lib/util/tevent_unix.c ../lib/util/tevent_ntstatus.c
- ../lib/util/tevent_werror.c
- ../lib/util/smb_threads.c ../lib/util/util_id.c
- ../lib/util/blocking.c ../lib/util/rfc1738.c
- ../lib/util/select.c'''
+UTIL_SRC = '''
+ ../lib/util/become_daemon.c
+ ../lib/util/blocking.c
+ ../lib/util/data_blob.c
+ ../lib/util/fsusage.c
+ ../lib/util/genrand.c
+ ../lib/util/params.c
+ ../lib/util/rbtree.c
+ ../lib/util/rfc1738.c
+ ../lib/util/select.c
+ ../lib/util/signal.c
+ ../lib/util/smb_threads.c
+ ../lib/util/system.c
+ ../lib/util/talloc_stack.c
+ ../lib/util/tevent_ntstatus.c
+ ../lib/util/tevent_unix.c
+ ../lib/util/tevent_werror.c
+ ../lib/util/time.c
+ ../lib/util/util.c
+ ../lib/util/util_file.c
+ ../lib/util/util_id.c
+ ../lib/util/util_net.c
+ ../lib/util/util_strlist.c
+ ../lib/util/xfile.c
+ '''
LIBTEVENT_SRC0 = ''