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/librpc/SConscript | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source4/librpc/SConscript') diff --git a/source4/librpc/SConscript b/source4/librpc/SConscript index 9c9965eaaa..083a84fc36 100644 --- a/source4/librpc/SConscript +++ b/source4/librpc/SConscript @@ -4,17 +4,17 @@ Import('hostenv') ndr_base_files = ['ndr/ndr.c', 'ndr/ndr_basic.c', 'ndr/ndr_string.c', 'ndr/ndr_obfuscate.c', 'ndr/ndr_misc.c'] -hostenv.StaticLibrary('ndr_base', ndr_base_files) +hostenv.Library('ndr_base', ndr_base_files) hostenv.proto_headers += hostenv.CProtoHeader('ndr/proto.h', ndr_base_files) -hostenv.StaticLibrary('ndr_compression', +hostenv.Library('ndr_compression', ['ndr/ndr_compression.c']) rpc_base_files = ['rpc/dcerpc.c', 'rpc/dcerpc_auth.c', 'rpc/dcerpc_schannel.c', 'rpc/dcerpc_util.c', 'rpc/dcerpc_error.c', 'rpc/dcerpc_smb.c', 'rpc/dcerpc_sock.c'] -hostenv.StaticLibrary('rpc_base', rpc_base_files) +hostenv.Library('rpc_base', rpc_base_files) hostenv.proto_headers += hostenv.CProtoHeader('rpc/proto.h', rpc_base_files) from glob import glob -- cgit