From c520b6caec4591e46c0fdb6ed731ae8853848eb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils=20O=2E=20Sel=C3=A5sdal?= Date: Mon, 14 Mar 2016 12:18:31 +0100 Subject: [PATCH] Leave to SConscript files to decide default targets --- SConstruct | 1 - src/SConscript | 2 ++ test/SConscript | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/SConstruct b/SConstruct index 1e0aaca..1ecc470 100644 --- a/SConstruct +++ b/SConstruct @@ -175,4 +175,3 @@ env.Package(target = 'libucore-' + version_info['version_str'] + '.tar.gz', X_RPM_GROUP = 'Development/Libraries' ) -env.Default('src') diff --git a/src/SConscript b/src/SConscript index 7d060a3..ed74ad0 100644 --- a/src/SConscript +++ b/src/SConscript @@ -21,3 +21,5 @@ ucore_env.Alias('install', ucore_env.Install(os.path.join(prefix, 'lib'), [ucore_staticlib])) ucore_env.Alias('install', ucore_env.InstallVersionedLib(os.path.join(prefix, 'lib'), [ucore_sharedlib])) + +ucore_env.Default([ucore_staticlib, ucore_sharedlib]) diff --git a/test/SConscript b/test/SConscript index 2e42446..680c23d 100644 --- a/test/SConscript +++ b/test/SConscript @@ -32,4 +32,4 @@ cmd = test_env.Command(target='test_phony' , action= test_env.Dir('.').abspath + '/' + test_executable) test_env.Depends(cmd, prog) test_env.AlwaysBuild(cmd) - +test_env.Default(test_executable)