From 5058f4b9e82ca8b9f2405930db3a46b8c37f06ed Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 28 Sep 2005 18:18:09 +0000 Subject: r10586: Add MergedObject() builder. Default to Library() rather then StaticLibrary() (This used to be commit b53313dc517986c69a4e4cb8fe3885b696f8faa1) --- source4/lib/ldb/SConscript | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'source4/lib/ldb') diff --git a/source4/lib/ldb/SConscript b/source4/lib/ldb/SConscript index 6dfb53f789..8e246d1961 100644 --- a/source4/lib/ldb/SConscript +++ b/source4/lib/ldb/SConscript @@ -12,32 +12,32 @@ if hostenv['configure']: conf.Finish() if defines.has_key('HAVE_SQLITE3'): - hostenv.StaticLibrary('ldb_sqlite3/ldb_sqlite3.c') + hostenv.Library('ldb_sqlite3/ldb_sqlite3.c') # LDB modules modules = [] -modules.append(hostenv.StaticLibrary('modules/timestamps.c')) -modules.append(hostenv.StaticLibrary('modules/rdn_name.c')) -modules.append(hostenv.StaticLibrary('modules/schema.c')) -modules.append(hostenv.StaticLibrary('ldb_ildap/ldb_ildap.c')) -#modules.append(hostenv.StaticLibrary('modules/ldb_map.c')) +modules.append(hostenv.Library('modules/timestamps.c')) +modules.append(hostenv.Library('modules/rdn_name.c')) +modules.append(hostenv.Library('modules/schema.c')) +modules.append(hostenv.Library('ldb_ildap/ldb_ildap.c')) +#modules.append(hostenv.Library('modules/ldb_map.c')) Import('dsdb_ldb_modules') modules += dsdb_ldb_modules -modules.append(hostenv.StaticLibrary( +modules.append(hostenv.Library( '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'])) -#modules.append(hostenv.StaticLibrary('ldb_ildap', ['ldb_ildap/ldb_ildap.c'])) +#modules.append(hostenv.Library('ldb_ildap', ['ldb_ildap/ldb_ildap.c'])) # Export the ldb base plus modules for other parts of the build system # to enjoy. -ldb = hostenv.StaticLibrary( +ldb = hostenv.Library( 'ldb', ['common/ldb.c', 'common/ldb_ldif.c', 'common/ldb_parse.c', 'common/ldb_parse.c', 'common/ldb_msg.c', 'common/ldb_utf8.c', @@ -46,8 +46,8 @@ ldb = hostenv.StaticLibrary( Export('ldb') -hostenv.StaticLibrary('samba/ldif_handlers.c') -ldb_cmdline = hostenv.StaticLibrary('ldb_cmdline', 'tools/cmdline.c') +hostenv.Library('samba/ldif_handlers.c') +ldb_cmdline = hostenv.Library('ldb_cmdline', 'tools/cmdline.c') # Tools -- cgit