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/ntvfs/SConscript | 14 +++++++------- source4/ntvfs/posix/SConscript | 2 +- source4/ntvfs/unixuid/SConscript | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'source4/ntvfs') diff --git a/source4/ntvfs/SConscript b/source4/ntvfs/SConscript index 16047eb4ae..362eb8df2f 100644 --- a/source4/ntvfs/SConscript +++ b/source4/ntvfs/SConscript @@ -1,11 +1,11 @@ Import('hostenv') -hostenv.StaticLibrary('ntvfs_cifs',['cifs/vfs_cifs.c']) -hostenv.StaticLibrary('ntvfs_simple',['simple/vfs_simple.c','simple/svfs_util.c']) -hostenv.StaticLibrary('ntvfs_print',['print/vfs_print.c']) -hostenv.StaticLibrary('ntvfs_ipc',['ipc/vfs_ipc.c','ipc/ipc_rap.c','ipc/rap_server.c']) -hostenv.StaticLibrary('ntvfs_nbench',['nbench/vfs_nbench.c']) -hostenv.StaticLibrary('ntvfs_common',['common/brlock.c','common/opendb.c','common/sidmap.c']) -hostenv.StaticLibrary('ntvfs',['ntvfs_base.c','ntvfs_generic.c','ntvfs_interface.c','ntvfs_util.c']) +hostenv.Library('ntvfs_cifs',['cifs/vfs_cifs.c']) +hostenv.Library('ntvfs_simple',['simple/vfs_simple.c','simple/svfs_util.c']) +hostenv.Library('ntvfs_print',['print/vfs_print.c']) +hostenv.Library('ntvfs_ipc',['ipc/vfs_ipc.c','ipc/ipc_rap.c','ipc/rap_server.c']) +hostenv.Library('ntvfs_nbench',['nbench/vfs_nbench.c']) +hostenv.Library('ntvfs_common',['common/brlock.c','common/opendb.c','common/sidmap.c']) +hostenv.Library('ntvfs',['ntvfs_base.c','ntvfs_generic.c','ntvfs_interface.c','ntvfs_util.c']) SConscript(dirs=['unixuid','posix'],exports='hostenv') diff --git a/source4/ntvfs/posix/SConscript b/source4/ntvfs/posix/SConscript index a781fe26ea..fc89530fcc 100644 --- a/source4/ntvfs/posix/SConscript +++ b/source4/ntvfs/posix/SConscript @@ -1,6 +1,6 @@ Import('hostenv') -hostenv.StaticLibrary('ntvfs_posix', +hostenv.Library('ntvfs_posix', ['vfs_posix.c', 'pvfs_util.c', 'pvfs_search.c', 'pvfs_dirlist.c', 'pvfs_fileinfo.c', 'pvfs_unlink.c', 'pvfs_mkdir.c', 'pvfs_open.c', 'pvfs_read.c', 'pvfs_flush.c', 'pvfs_write.c', 'pvfs_fsinfo.c', diff --git a/source4/ntvfs/unixuid/SConscript b/source4/ntvfs/unixuid/SConscript index 7e1b304c3f..d3134c3183 100644 --- a/source4/ntvfs/unixuid/SConscript +++ b/source4/ntvfs/unixuid/SConscript @@ -1,3 +1,3 @@ Import('hostenv') -hostenv.StaticLibrary('ntvfs_unixuid',['vfs_unixuid.c']) +hostenv.Library('ntvfs_unixuid',['vfs_unixuid.c']) -- cgit