Author: tpot Date: 2005-09-22 06:38:26 +0000 (Thu, 22 Sep 2005) New Revision: 10415
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10415 Log: 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. Modified: branches/SAMBA_4_0/source/lib/ldb/SConscript branches/SAMBA_4_0/source/lib/tdb/SConscript Changeset: Modified: branches/SAMBA_4_0/source/lib/ldb/SConscript =================================================================== --- branches/SAMBA_4_0/source/lib/ldb/SConscript 2005-09-22 06:20:53 UTC (rev 10414) +++ branches/SAMBA_4_0/source/lib/ldb/SConscript 2005-09-22 06:38:26 UTC (rev 10415) @@ -1,7 +1,5 @@ -# tastes like -*- python -*- +Import('hostenv', 'talloc', 'defines') -Import('hostenv', 'talloc', 'defines', 'proto_files') - hostenv.StaticLibrary('modules/timestamps.c') hostenv.StaticLibrary('modules/rdn_name.c') hostenv.StaticLibrary('modules/schema.c') @@ -23,7 +21,6 @@ '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 @@ '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') Modified: branches/SAMBA_4_0/source/lib/tdb/SConscript =================================================================== --- branches/SAMBA_4_0/source/lib/tdb/SConscript 2005-09-22 06:20:53 UTC (rev 10414) +++ branches/SAMBA_4_0/source/lib/tdb/SConscript 2005-09-22 06:38:26 UTC (rev 10415) @@ -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) +tdb = tdbenv.StaticLibrary('tdb', tdb_source) -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]) tdbdump = tdbenv.Program('bin/tdbdump', ['tools/tdbdump.c',tdb]) tdbbackup = tdbenv.Program('bin/tdbbackup', ['tools/tdbbackup.c',tdb]) -
