summaryrefslogtreecommitdiff
path: root/source4/lib
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2005-09-21 07:20:58 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:38:34 -0500
commit3e4f47aaff41b5bb6d1d86025915a3a63dc1ea73 (patch)
treec8c4921e8798e9aeeaf2b614e66596cf748d1fa7 /source4/lib
parent5e4c8b8cd375131094e0fe40bd4c048539206ac2 (diff)
downloadsamba-3e4f47aaff41b5bb6d1d86025915a3a63dc1ea73.tar.gz
samba-3e4f47aaff41b5bb6d1d86025915a3a63dc1ea73.tar.bz2
samba-3e4f47aaff41b5bb6d1d86025915a3a63dc1ea73.zip
r10379: Add files for ldb and tdb to proto_files. The tool for building proto.h
is busted though. (This used to be commit 54882f88cad1427b6adcb4c956a63e534e7d13e4)
Diffstat (limited to 'source4/lib')
-rw-r--r--source4/lib/ldb/SConscript28
-rw-r--r--source4/lib/tdb/SConscript14
2 files changed, 26 insertions, 16 deletions
diff --git a/source4/lib/ldb/SConscript b/source4/lib/ldb/SConscript
index b726d0ebc9..52d6b87d02 100644
--- a/source4/lib/ldb/SConscript
+++ b/source4/lib/ldb/SConscript
@@ -1,6 +1,6 @@
-Import('hostenv')
-Import('talloc')
-Import('defines')
+# tastes like -*- python -*-
+
+Import('hostenv', 'talloc', 'defines', 'proto_files')
hostenv.StaticLibrary('modules/timestamps.c')
hostenv.StaticLibrary('modules/rdn_name.c')
@@ -18,15 +18,21 @@ if hostenv['configure']:
if defines.has_key('HAVE_SQLITE3'):
hostenv.StaticLibrary('ldb_sqlite3/ldb_sqlite3.c')
-hostenv.StaticLibrary('ldb_tdb',
- ['ldb_tdb/ldb_tdb.c','ldb_tdb/ldb_search.c','ldb_tdb/ldb_pack.c',
- 'ldb_tdb/ldb_index.c','ldb_tdb/ldb_cache.c','ldb_tdb/ldb_tdb_wrap.c'])
+ldb_tdb_source = ['ldb_tdb/ldb_tdb.c', 'ldb_tdb/ldb_search.c',
+ 'ldb_tdb/ldb_pack.c', 'ldb_tdb/ldb_index.c',
+ 'ldb_tdb/ldb_cache.c', 'ldb_tdb/ldb_tdb_wrap.c']
+
+hostenv.StaticLibrary('ldb_tdb', ldb_tdb_source)
+proto_files += [File(x) for x in ldb_tdb_source]
+
+ldb_source = ['common/ldb.c','common/ldb_ldif.c','common/ldb_parse.c',
+ 'common/ldb_parse.c','common/ldb_msg.c','common/ldb_utf8.c',
+ 'common/ldb_debug.c','common/ldb_modules.c','common/ldb_match.c',
+ 'common/attrib_handlers.c','common/ldb_dn.c']
+
+ldb = hostenv.StaticLibrary('ldb', ldb_source + talloc)
+proto_files += [File(x) for x in ldb_source]
-ldb = hostenv.StaticLibrary('ldb',
- [talloc,'common/ldb.c','common/ldb_ldif.c','common/ldb_parse.c',
- 'common/ldb_parse.c','common/ldb_msg.c','common/ldb_utf8.c',
- 'common/ldb_debug.c','common/ldb_modules.c','common/ldb_match.c',
- 'common/attrib_handlers.c','common/ldb_dn.c'])
Export('ldb')
hostenv.StaticLibrary('samba/ldif_handlers.c')
diff --git a/source4/lib/tdb/SConscript b/source4/lib/tdb/SConscript
index 01f5bbe7c7..728160f959 100644
--- a/source4/lib/tdb/SConscript
+++ b/source4/lib/tdb/SConscript
@@ -1,10 +1,14 @@
-Import('hostenv')
+Import('hostenv', 'proto_files')
tdbenv = hostenv.Copy()
tdbenv.Append(CPPPATH=['include'])
-tdb = tdbenv.StaticLibrary('tdb',
- ['common/tdb.c','common/dump.c','common/io.c','common/lock.c',
- 'common/open.c','common/traverse.c','common/freelist.c',
- 'common/error.c','common/tdbutil.c'])
+
+tdb_files = ['common/tdb.c','common/dump.c','common/io.c','common/lock.c',
+ 'common/open.c','common/traverse.c','common/freelist.c',
+ 'common/error.c','common/tdbutil.c']
+
+tdb = tdbenv.StaticLibrary('tdb', tdb_files)
+
+proto_files += [File(x) for x in tdb_files]
tdbtool = tdbenv.Program('bin/tdbtool', ['tools/tdbtool.c',tdb])
tdbtorture = tdbenv.Program('bin/tdbtorture', ['tools/tdbtorture.c',tdb])