From 2370789d672bce109217bda6de21a2ccb6250213 Mon Sep 17 00:00:00 2001 From: Christopher Dunn Date: Fri, 23 Mar 2007 08:57:57 +0000 Subject: [PATCH] Renamed buildLibary to buildLibrary and added SharedLibrary rule. --- SConstruct | 7 +++++-- src/lib_json/sconscript | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/SConstruct b/SConstruct index d73b629..e820659 100644 --- a/SConstruct +++ b/SConstruct @@ -125,14 +125,17 @@ def buildJSONTests( env, target_sources, target_name ): check_alias_target = env.Alias( 'check', jsontests_node, RunJSONTests( jsontests_node, jsontests_node ) ) env.AlwaysBuild( check_alias_target ) -def buildLibary( env, target_sources, target_name ): +def buildLibrary( env, target_sources, target_name ): static_lib = env.StaticLibrary( target=target_name + '_${LIB_NAME_SUFFIX}', source=target_sources ) + shared_lib = env.SharedLibrary( target=target_name + '_${LIB_NAME_SUFFIX}', + source=target_sources ) global lib_dir env.Install( lib_dir, static_lib ) + env.Install( lib_dir, shared_lib ) env['SRCDIST_ADD']( source=[target_sources] ) -Export( 'env env_testing buildJSONExample buildLibary buildJSONTests' ) +Export( 'env env_testing buildJSONExample buildLibrary buildJSONTests' ) def buildProjectInDirectory( target_directory ): global build_dir diff --git a/src/lib_json/sconscript b/src/lib_json/sconscript index cc044fb..f6520d1 100644 --- a/src/lib_json/sconscript +++ b/src/lib_json/sconscript @@ -1,6 +1,6 @@ -Import( 'env buildLibary' ) +Import( 'env buildLibrary' ) -buildLibary( env, Split( """ +buildLibrary( env, Split( """ json_reader.cpp json_value.cpp json_writer.cpp