svn commit: samba r10379 - in branches/SAMBA_4_0/source/lib: ldb tdb

[tpot at samba.org]

Author: tpot
Date: 2005-09-21 07:20:58 +0000 (Wed, 21 Sep 2005)
New Revision: 10379

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10379

Log:
Add files for ldb and tdb to proto_files.  The tool for building proto.h
is busted though.

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-21 07:12:23 UTC (rev 10378)
+++ branches/SAMBA_4_0/source/lib/ldb/SConscript	2005-09-21 07:20:58 UTC (rev 10379)
@@ -1,7 +1,7 @@
-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')
 hostenv.StaticLibrary('modules/schema.c')
@@ -18,15 +18,21 @@
 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']
 
-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'])
+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]
+
 Export('ldb')
 
 hostenv.StaticLibrary('samba/ldif_handlers.c')

Modified: branches/SAMBA_4_0/source/lib/tdb/SConscript
===================================================================
--- branches/SAMBA_4_0/source/lib/tdb/SConscript	2005-09-21 07:12:23 UTC (rev 10378)
+++ branches/SAMBA_4_0/source/lib/tdb/SConscript	2005-09-21 07:20:58 UTC (rev 10379)
@@ -1,11 +1,15 @@
-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])
 tdbdump = tdbenv.Program('bin/tdbdump', ['tools/tdbdump.c',tdb])