Fix some build problems

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

diff --git a/HowTos/SConscript b/HowTos/SConscript
index 54a5098..86793ee 100644 (file)
--- a/HowTos/SConscript
+++ b/HowTos/SConscript
@@ -2,7 +2,6 @@
 
 Import('env')
 import SENFSCons, glob, sys
-sys.path.append(env.Dir('#/doclib').abspath)
 import yaptu
 
 ###########################################################################

diff --git a/SConstruct b/SConstruct
index 5eee730..e4f8dd1 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -1,7 +1,8 @@
 # -*- python -*-
 
 import sys, glob, os.path, datetime, pwd, time, fnmatch, string
-sys.path.append('senfscons')
+sys.path.append(Dir('#/senfscons').abspath)
+sys.path.append(Dir('#/doclib').abspath)
 import SENFSCons
 
 ###########################################################################

diff --git a/senfscons/SENFSCons.py b/senfscons/SENFSCons.py
index edecb11..812c30e 100644 (file)
--- a/senfscons/SENFSCons.py
+++ b/senfscons/SENFSCons.py
@@ -284,7 +284,7 @@ def MakeEnvironment():
 
     env.Append(CPPDEFINES = [ '$EXTRA_DEFINES' ],
                LIBS = [ '$EXTRA_LIBS' ],
-               ALLLIBS = [])
+               ALLOBJECTS = [])
 
     return env
 
@@ -343,7 +343,7 @@ def Test(env, sources, LIBS = [], OBJECTS = []):
         test_sources = sources,
         LIBS = [ '$LIBSENF' ],
         OBJECTS = OBJECTS,
-        DEPENDS = [ env.File(LibPath(x)) for x in LIBS ]) ]
+        DEPENDS = [ env.File(LibPath(env['LIBSENF'])) ]) ]
     compileTestSources = [ src for src in sources
                            if 'COMPILE_CHECK' in file(src).read() ]
     if compileTestSources:
@@ -395,7 +395,7 @@ def Objects(env, sources, testSources = None, LIBS = [], OBJECTS = [], no_includ
             test_sources = testSources,
             LIBS = [ '$LIBSENF' ],
             OBJECTS = OBJECTS,
-            DEPENDS = [ env.File(LibPath(x)) for x in LIBS ]) ]
+            DEPENDS = [ env.File(LibPath(env['LIBSENF'])) ]) ]
         compileTestSources = [ src for src in testSources
                                if 'COMPILE_CHECK' in file(src).read() ]
         if compileTestSources:
@@ -686,7 +686,7 @@ def Binary(env, binary, sources, testSources = None, LIBS = [], OBJECTS = [], no
         progEnv.Prepend(LIBS = [ '$LIBSENF' ])
         program = progEnv.ProgramNoScan(target=binary,source=objects+OBJECTS)
         env.Default(program)
-        env.Depends(program, [ '$LIBSENF' ])
+        env.Depends(program, [ env.File(LibPath(env['LIBSENF'])) ])
         env.Alias('default', program)
         InstallWithSources(env, program, '$BININSTALLDIR', sources, testSources, no_includes)
     return program