X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=SConstruct;h=b0f7742e87d138f3f901eb2e56530f70bdcb5e16;hb=164fe477094d42463722584e527a02379ab5d985;hp=7cf0362731cd802a138a7d6112d6fc59adcb8ab1;hpb=6b43243d9b1a3b9720efdacc6f02364877ebe2aa;p=senf.git diff --git a/SConstruct b/SConstruct index 7cf0362..b0f7742 100644 --- a/SConstruct +++ b/SConstruct @@ -1,8 +1,6 @@ # -*- python -*- -import sys, glob, os.path, datetime, pwd, time, fnmatch, string -sys.path.append(Dir('#/senfscons').abspath) -sys.path.append(Dir('#/doclib').abspath) +import sys, glob, os.path, fnmatch import SENFSCons, senfutil ########################################################################### @@ -11,14 +9,14 @@ import SENFSCons, senfutil env = Environment() # Load all the local SCons tools -env.Tool('Doxygen', [ 'senfscons' ]) -env.Tool('Dia2Png', [ 'senfscons' ]) -env.Tool('PkgDraw', [ 'senfscons' ]) -env.Tool('InstallSubdir', [ 'senfscons' ]) -env.Tool('CopyToDir', [ 'senfscons' ]) -env.Tool('Boost', [ 'senfscons' ]) -env.Tool('CombinedObject', [ 'senfscons' ]) -env.Tool('PhonyTarget', [ 'senfscons' ]) +env.Tool('Doxygen') +env.Tool('Dia2Png') +env.Tool('PkgDraw') +env.Tool('InstallSubdir') +env.Tool('CopyToDir') +env.Tool('Boost') +env.Tool('CombinedObject') +env.Tool('PhonyTarget') env.Help(""" Additional top-level build targets: @@ -172,7 +170,7 @@ env.PhonyTarget('valgrind', [ 'all_tests' ], [ """ #### clean env.Clean('all', '.prepare-stamp') env.Clean('all', libsenf) -env.Clean('all', 'linklint') +env.Clean('all', env.Dir('linklint')) # env.Dir to disambiguate from linklint PhonyTarget if env.GetOption('clean'): env.Clean('all', [ os.path.join(path,f)