diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2012-03-10 21:33:11 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2012-03-10 23:13:01 +0100 |
| commit | ce4531ee312c1171fcffcdbe9e214ae43384cdfd (patch) | |
| tree | 30de1cb84b321fdcd815e7456bbf5743ce458a8b /lib | |
| parent | f076186d3ab95c4d4c4d3d7b66f283881ac1fbbb (diff) | |
| download | samba-ce4531ee312c1171fcffcdbe9e214ae43384cdfd.tar.gz samba-ce4531ee312c1171fcffcdbe9e214ae43384cdfd.tar.bz2 samba-ce4531ee312c1171fcffcdbe9e214ae43384cdfd.zip | |
tdb_wrap: Move to specific directory.
It's a bit confusing to mix low-level and high-level libraries. We had
multiple libraries in one directory, and there were have circular
dependencies with other libraries outside that directory (in this case,
samba-hostconfig).
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Sat Mar 10 23:13:01 CET 2012 on sn-devel-104
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/tdb_wrap/tdb_wrap.c (renamed from lib/util/tdb_wrap.c) | 2 | ||||
| -rw-r--r-- | lib/tdb_wrap/tdb_wrap.h (renamed from lib/util/tdb_wrap.h) | 0 | ||||
| -rw-r--r-- | lib/tdb_wrap/wscript_build | 8 | ||||
| -rwxr-xr-x | lib/util/wscript_build | 7 |
4 files changed, 9 insertions, 8 deletions
diff --git a/lib/util/tdb_wrap.c b/lib/tdb_wrap/tdb_wrap.c index 7c3318bcad..0994b1b79c 100644 --- a/lib/util/tdb_wrap.c +++ b/lib/tdb_wrap/tdb_wrap.c @@ -21,7 +21,7 @@ #include "includes.h" #include "lib/util/dlinklist.h" -#include "lib/util/tdb_wrap.h" +#include "lib/tdb_wrap/tdb_wrap.h" #include "lib/param/param.h" /* FIXME: TDB2 does this internally, so no need to wrap multiple opens! */ diff --git a/lib/util/tdb_wrap.h b/lib/tdb_wrap/tdb_wrap.h index 81e77e76a4..81e77e76a4 100644 --- a/lib/util/tdb_wrap.h +++ b/lib/tdb_wrap/tdb_wrap.h diff --git a/lib/tdb_wrap/wscript_build b/lib/tdb_wrap/wscript_build new file mode 100644 index 0000000000..0811bc5a2d --- /dev/null +++ b/lib/tdb_wrap/wscript_build @@ -0,0 +1,8 @@ +#!/usr/bin/python + +bld.SAMBA_LIBRARY('tdb-wrap', + source='tdb_wrap.c', + deps='tdb_compat talloc samba-util samba-hostconfig', + private_library=True, + local_include=False + ) diff --git a/lib/util/wscript_build b/lib/util/wscript_build index 1dc65fab5e..79b9f02050 100755 --- a/lib/util/wscript_build +++ b/lib/util/wscript_build @@ -85,10 +85,3 @@ bld.SAMBA_SUBSYSTEM('UTIL_PW', public_deps='talloc' ) - -bld.SAMBA_LIBRARY('tdb-wrap', - source='tdb_wrap.c', - deps='tdb_compat talloc samba-util samba-hostconfig', - private_library=True, - local_include=False - ) |