Toplevel directory cleanup

[senf.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index d498ef0..5e14e7d 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -3,17 +3,14 @@
 import sys, glob, os.path, fnmatch
 import SENFSCons, senfutil
 
-# Fix for SCons 0.97 compatibility
-try:
-    BoolVariable
-except NameError:
-    BoolVariable = BoolOption
-
 ###########################################################################
 # Load utilities and setup libraries and configure build
 
 env = Environment()
 
+env.Decider('MD5-timestamp')
+env.EnsureSConsVersion(1,2)
+
 # Load all the local SCons tools
 env.Tool('Doxygen')
 env.Tool('Dia2Png')
@@ -157,7 +154,7 @@ env.Install('${SCONSINSTALLDIR}', [ 'site_scons/__init__.py',
                                     'site_scons/senfutil.py',
                                     'site_scons/yaptu.py' ])
 env.InstallDir('${SCONSINSTALLDIR}', [ 'site_scons/site_tools', 'site_scons/lib' ],
-               FILTER_SUFFIXES=[ '', '.css', '.pl', '.py', '.sh', '.xml', '.xsl', '.yap' ])
+               FILTER_SUFFIXES=[ '','.css','.pl','.py','.sh','.sty','.xml','.xsl','.yap' ])
 env.Install('${INCLUDEINSTALLDIR}', 'boost')
 
 env.Alias('install_all', env.FindInstalledFiles())
@@ -175,7 +172,7 @@ env.PhonyTarget('valgrind', [ 'all_tests' ], [ """
             echo;
             echo "Running $$test";
             echo;
-            valgrind --tool=memcheck --error-exitcode=99 --suppressions=valgrind.sup 
+            valgrind --tool=memcheck --error-exitcode=99 --suppressions=tools/valgrind.sup 
                 $$test $BOOSTTESTARGS;
             [ $$? -ne 99 ] || exit 1;
         done