diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2011-07-26 13:29:00 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2011-07-26 14:45:26 +0200 |
| commit | ac57cfda9d9a530b8759c65986c9e5a7f1105d3c (patch) | |
| tree | fecc1362ca2096ab656da5411aab076a8a67833c | |
| parent | 221a79ad008f839dae892e4b7f1a396c50442ecb (diff) | |
| download | samba-ac57cfda9d9a530b8759c65986c9e5a7f1105d3c.tar.gz samba-ac57cfda9d9a530b8759c65986c9e5a7f1105d3c.tar.bz2 samba-ac57cfda9d9a530b8759c65986c9e5a7f1105d3c.zip | |
libsamba-util: Build in libbitmap.
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Tue Jul 26 14:45:27 CEST 2011 on sn-devel-104
| -rwxr-xr-x | lib/util/wscript_build | 9 | ||||
| -rwxr-xr-x | source3/wscript_build | 2 | ||||
| -rw-r--r-- | source4/param/wscript_build | 4 |
3 files changed, 4 insertions, 11 deletions
diff --git a/lib/util/wscript_build b/lib/util/wscript_build index 659cb5455c..ee963ad971 100755 --- a/lib/util/wscript_build +++ b/lib/util/wscript_build @@ -7,7 +7,7 @@ bld.SAMBA_LIBRARY('samba-util', signal.c system.c params.c util.c util_id.c util_net.c util_strlist.c util_paths.c idtree.c debug.c fault.c base64.c util_str.c util_str_common.c substitute.c ms_fnmatch.c - server_id.c dprintf.c parmlist.c''', + server_id.c dprintf.c parmlist.c bitmap.c''', deps='DYNCONFIG', public_deps='talloc execinfo uid_wrapper pthread LIBCRYPTO charset', public_headers='debug.h attr.h byteorder.h data_blob.h memory.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h util.h string_wrappers.h', @@ -85,10 +85,3 @@ bld.SAMBA_LIBRARY('tdb-wrap', private_library=True, local_include=False ) - -bld.SAMBA_LIBRARY('bitmap', - source='bitmap.c', - deps='talloc samba-util', - local_include=False, - private_library=True) - diff --git a/source3/wscript_build b/source3/wscript_build index 06d81f69f1..40a1d9be3a 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -880,7 +880,7 @@ bld.SAMBA3_LIBRARY('smbconf', bld.SAMBA3_LIBRARY('smbd_conn', source='smbd/conn.c', - deps='string_init bitmap namearray', + deps='string_init samba-util namearray', private_library=True) bld.SAMBA3_LIBRARY('smbd_base', diff --git a/source4/param/wscript_build b/source4/param/wscript_build index d5ca60d207..9a455124b0 100644 --- a/source4/param/wscript_build +++ b/source4/param/wscript_build @@ -15,10 +15,10 @@ bld.SAMBA_LIBRARY('samba-hostconfig', pc_files='samba-hostconfig.pc', vnum='0.0.1', deps='DYNCONFIG', - public_deps='samba-util bitmap param_local_h', + public_deps='samba-util param_local_h', public_headers='param.h', autoproto='param_proto.h', - autoproto_extra_source='../../lib/param/param_functions.c' + autoproto_extra_source='../../lib/param/param_functions.c' ) |