X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senfscons%2FSENFSCons.py;h=d2a170a4dd63c3aa889514d922a18d6522b3738e;hb=05fab45b5f96c457d3c6b359f66ce1506c6ad510;hp=623c9d7b81c2b8de2cce81a67b43b425e650b8ff;hpb=54fe6b70dd2c783a37f4bbd62a166160adae0e0f;p=senf.git

diff --git a/senfscons/SENFSCons.py b/senfscons/SENFSCons.py
index 623c9d7..d2a170a 100644
--- a/senfscons/SENFSCons.py
+++ b/senfscons/SENFSCons.py
@@ -51,6 +51,7 @@ SCONS_TOOLS = [
     "Dia2Png",
     "CopyToDir",
     "InstallIncludes",
+    "ProgramNoScan",
 ]
 
 opts = None
@@ -363,8 +364,7 @@ def InstallWithSources(env, targets, dir, sources, testSources = [], no_includes
     if type(testSources) is not type([]):
         testSources = [ testSources ]
 
-    installs = []
-    installs.append( env.Install(dir, targets) )
+    installs = [ env.Install(dir, targets) ]
 
     if not no_includes:
         target = env.Dir(env['INCLUDEINSTALLDIR']).Dir(
@@ -500,8 +500,8 @@ def Doxygen(env, doxyfile = "Doxyfile", extra_sources = []):
     l = len(env.Dir('#').abspath)
     if htmlnode:
         env.Alias('install_all',
-                  env.Install( '$DOCINSTALLDIR' + htmlnode.dir.dir.abspath[l:],
-                               htmlnode.dir ))
+                  env.Command('$DOCINSTALLDIR' + htmlnode.dir.abspath[l:], htmlnode.dir,
+                              [ SCons.Defaults.Copy('$TARGET','$SOURCE') ]))
     if tagnode:
         env.Alias('install_all',
                   env.Install( '$DOCINSTALLDIR' + tagnode.dir.abspath[l:],
@@ -620,7 +620,7 @@ def Binary(env, binary, sources, testSources = None, LIBS = [], OBJECTS = [], no
     if objects:
         progEnv = env.Copy()
         progEnv.Prepend(LIBS = LIBS)
-        program = progEnv.Program(target=binary,source=objects+OBJECTS)
+        program = progEnv.ProgramNoScan(target=binary,source=objects+OBJECTS)
         env.Default(program)
         env.Depends(program, [ env.File(LibPath(x)) for x in LIBS ])
         env.Alias('default', program)
@@ -631,8 +631,7 @@ def Binary(env, binary, sources, testSources = None, LIBS = [], OBJECTS = [], no
 
 def AllIncludesHH(env, headers):
     headers.sort()
-    file(env.File("all_includes.hh").abspath,"w").write("".join([ '#include "%s"\n' % f
-                                                                       for f in headers ]))
-    env.Alias('all', 'all_includes.hh')
-    env.Clean('all', 'all_includes.hh')
-    
+    target = env.File("all_includes.hh")
+    file(target.abspath,"w").write("".join([ '#include "%s"\n' % f
+                                             for f in headers ]))
+    env.Clean('all', target)