summaryrefslogtreecommitdiff
path: root/source4/lib
diff options
context:
space:
mode:
Diffstat (limited to 'source4/lib')
-rw-r--r--source4/lib/ldb/SConscript6
-rw-r--r--source4/lib/tdb/SConscript10
2 files changed, 5 insertions, 11 deletions
diff --git a/source4/lib/ldb/SConscript b/source4/lib/ldb/SConscript
index 52d6b87d02..ef89132ab2 100644
--- a/source4/lib/ldb/SConscript
+++ b/source4/lib/ldb/SConscript
@@ -1,6 +1,4 @@
-# tastes like -*- python -*-
-
-Import('hostenv', 'talloc', 'defines', 'proto_files')
+Import('hostenv', 'talloc', 'defines')
hostenv.StaticLibrary('modules/timestamps.c')
hostenv.StaticLibrary('modules/rdn_name.c')
@@ -23,7 +21,6 @@ ldb_tdb_source = ['ldb_tdb/ldb_tdb.c', 'ldb_tdb/ldb_search.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',
@@ -31,7 +28,6 @@ ldb_source = ['common/ldb.c','common/ldb_ldif.c','common/ldb_parse.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]
Export('ldb')
diff --git a/source4/lib/tdb/SConscript b/source4/lib/tdb/SConscript
index a7a477d7bc..09d0cf538a 100644
--- a/source4/lib/tdb/SConscript
+++ b/source4/lib/tdb/SConscript
@@ -1,17 +1,15 @@
-Import('hostenv', 'proto_files')
+Import('hostenv')
+
tdbenv = hostenv.Copy()
tdbenv.Append(CPPPATH=['include'])
-tdb_files = ['common/tdb.c','common/dump.c','common/io.c','common/lock.c',
+tdb_source = ['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/transaction.c', 'common/tdbutil.c']
-tdb = tdbenv.StaticLibrary('tdb', tdb_files)
-
-proto_files += [File(x) for x in tdb_files]
+tdb = tdbenv.StaticLibrary('tdb', tdb_source)
tdbtool = tdbenv.Program('bin/tdbtool', ['tools/tdbtool.c',tdb])
tdbtorture = tdbenv.Program('bin/tdbtorture', ['tools/tdbtorture.c',tdb])
tdbdump = tdbenv.Program('bin/tdbdump', ['tools/tdbdump.c',tdb])
tdbbackup = tdbenv.Program('bin/tdbbackup', ['tools/tdbbackup.c',tdb])
-