Remove ProgramNoScan builder

git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@1308 270642c3-0616-0410-b53a-bc976706d245

diff --git a/SConstruct b/SConstruct
index df9190b..92a4078 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -15,7 +15,6 @@ env.Tool('Doxygen', [ 'senfscons' ])
 env.Tool('Dia2Png', [ 'senfscons' ])
 env.Tool('PkgDraw', [ 'senfscons' ])
 env.Tool('CopyToDir', [ 'senfscons' ])
-env.Tool('ProgramNoScan', [ 'senfscons' ])
 env.Tool('CompileCheck', [ 'senfscons' ])
 env.Tool('Boost', [ 'senfscons' ])
 env.Tool('BoostUnitTests', [ 'senfscons' ])

diff --git a/senfscons/ProgramNoScan.py b/senfscons/ProgramNoScan.py
deleted file mode 100644 (file)
index edcf355..0000000
--- a/senfscons/ProgramNoScan.py
+++ /dev/null
@@ -1,28 +0,0 @@
-## \file
-# \brief CopyToDir builder
-
-## \package senfscons.ProgramNoScan
-# \brief Program builder without target scanner
-#
-# This build is like env.Program() but does not scan for library dependencies.
-# This is needed if library dependencies are added explicitly, which is needed
-# when libraries are built in the same build and therefore might not exist
-# before builting the program (and will therefore not be found by the target
-# scanner)
-#
-# \ingroup builder
-
-import SCons.Builder, SCons.Defaults
-
-ProgramNoScan = SCons.Builder.Builder(action = SCons.Defaults.LinkAction,
-                                      emitter = '$PROGEMITTER',
-                                      prefix = '$PROGPREFIX',
-                                      suffix = '$PROGSUFFIX',
-                                      src_suffix = '$OBJSUFFIX',
-                                      src_builder = 'Object')
-
-def generate(env):
-    env['BUILDERS']['ProgramNoScan'] = ProgramNoScan
-
-def exists(env):
-    return 1

diff --git a/senfscons/SENFSCons.py b/senfscons/SENFSCons.py
index 767c031..78add3a 100644 (file)
--- a/senfscons/SENFSCons.py
+++ b/senfscons/SENFSCons.py
@@ -279,9 +279,8 @@ def Binary(env, binary, sources, testSources = None, OBJECTS = []):
     if objects:
         progEnv = env.Clone()
         progEnv.Prepend(LIBS = [ '$LIBSENF$LIBADDSUFFIX' ])
-        program = progEnv.ProgramNoScan(target=binary,source=objects+OBJECTS)
+        program = progEnv.Program(target=binary,source=objects+OBJECTS)
         env.Default(program)
-        env.Depends(program, [ env.File(LibPath(env['LIBSENF'])) ])
         env.Alias('default', program)
         env.Alias('install_all', env.Install('$BININSTALLDIR', program))
     return program