From 5058f4b9e82ca8b9f2405930db3a46b8c37f06ed Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
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/SConscript | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'source4/lib/SConscript')

diff --git a/source4/lib/SConscript b/source4/lib/SConscript
index a184eecd10..be77e8621d 100644
--- a/source4/lib/SConscript
+++ b/source4/lib/SConscript
@@ -13,29 +13,29 @@ basic_files = ['version.c', 'xfile.c', 'debug.c', 'fault.c',
 
 proto_files = basic_files
 
-basic = hostenv.StaticLibrary('basic', [dynconfig,charset,talloc,basic_files,charset])
+basic = hostenv.Library('basic', [dynconfig,charset,talloc,basic_files])
 Export('basic')
 
-hostenv.StaticLibrary('tdr', ['tdr/tdr.c'])
-hostenv.StaticLibrary('crypto', 
+hostenv.Library('tdr', ['tdr/tdr.c'])
+hostenv.Library('crypto', 
 		['crypto/crc32.c','crypto/md5.c','crypto/hmacmd5.c',
 		'crypto/md4.c','crypto/arcfour.c'])
-hostenv.StaticLibrary('compression', ['compression/mszip.c'])
-hostenv.StaticLibrary('gencache',['gencache.c'])
-hostenv.StaticLibrary('pidfile',['pidfile.c'])
-hostenv.StaticLibrary('unix_privs',['unix_privs.c'])
+hostenv.Library('compression', ['compression/mszip.c'])
+hostenv.Library('gencache',['gencache.c'])
+hostenv.Library('pidfile',['pidfile.c'])
+hostenv.Library('unix_privs',['unix_privs.c'])
 
 SConscript(dirs=['ldb'])
 
 Import('ldb')
 gendb_files = ['gendb.c']
 proto_files += gendb_files
-gendb = hostenv.StaticLibrary('gendb', [gendb_files,ldb])
+gendb = hostenv.Library('gendb', [gendb_files,ldb])
 Export('gendb')
 
 credentials_files = ['credentials.c']
 proto_files += credentials_files
-credentials = hostenv.StaticLibrary('credentials',[credentials_files,basic,gendb])
+credentials = hostenv.Library('credentials',[credentials_files,basic,gendb])
 Export('credentials')
 
 hostenv.proto_headers += hostenv.CProtoHeader('proto.h', proto_files)
-- 
cgit