diff options
| author | Tim Potter <tpot@samba.org> | 2005-09-22 06:38:26 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:38:43 -0500 |
| commit | 7e8372f253b298cd9fd041ab7bab50323963154d (patch) | |
| tree | 63a2c9de49ebeb0ea358fa51b0a9ea8bc6377b7e /source4 | |
| parent | e42a619b8ab5b315c0119c62606a93a8bf372417 (diff) | |
| download | samba-7e8372f253b298cd9fd041ab7bab50323963154d.tar.gz samba-7e8372f253b298cd9fd041ab7bab50323963154d.tar.bz2 samba-7e8372f253b298cd9fd041ab7bab50323963154d.zip | |
r10415: The ldb and tdb libraries are bad examples to test out the make proto
code as they are marked as NOPROTO in the config.mk files.
(This used to be commit 5f530eacbae073e9df6adde316404f70ecfe9122)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/lib/ldb/SConscript | 6 | ||||
| -rw-r--r-- | source4/lib/tdb/SConscript | 10 |
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]) - |