Fix LIBADDSUFFIX support

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

diff --git a/SConstruct b/SConstruct
index 1fd2ac8..a898d6c 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -198,7 +198,7 @@ SENFSCons.DoxyXRef(env,
 SENFSCons.InstallIncludeFiles(env, [ 'config.hh' ])
 
 # Build combined library 'libsenf'
-libsenf = env.Library(env['LIBSENF'], env['ALLOBJECTS'])
+libsenf = env.Library(env.subst("$LIBSENF$LIBADDSUFFIX"), env['ALLOBJECTS'])
 env.Default(libsenf)
 env.Clean('all', libsenf)
 env.Alias('default', libsenf)

diff --git a/senfscons/SENFSCons.py b/senfscons/SENFSCons.py
index a16251e..32a5cc7 100644 (file)
--- a/senfscons/SENFSCons.py
+++ b/senfscons/SENFSCons.py
@@ -356,7 +356,7 @@ def Test(env, sources, LIBS = [], OBJECTS = []):
         target = 'test',
         objects = [],
         test_sources = sources,
-        LIBS = [ '$LIBSENF' ],
+        LIBS = [ '$LIBSENF$LIBADDSUFFIX' ],
         OBJECTS = OBJECTS,
         DEPENDS = [ env.File(LibPath(env['LIBSENF'])) ]) ]
     compileTestSources = [ src for src in sources
@@ -408,7 +408,7 @@ def Objects(env, sources, testSources = None, OBJECTS = []):
             target = 'test',
             objects = objects,
             test_sources = testSources,
-            LIBS = [ '$LIBSENF' ],
+            LIBS = [ '$LIBSENF$LIBADDSUFFIX' ],
             OBJECTS = OBJECTS,
             DEPENDS = [ env.File(LibPath(env['LIBSENF'])) ]) ]
         compileTestSources = [ src for src in testSources
@@ -668,7 +668,7 @@ def Binary(env, binary, sources, testSources = None, OBJECTS = []):
     program = None
     if objects:
         progEnv = env.Clone()
-        progEnv.Prepend(LIBS = [ '$LIBSENF' ])
+        progEnv.Prepend(LIBS = [ '$LIBSENF$LIBADDSUFFIX' ])
         program = progEnv.ProgramNoScan(target=binary,source=objects+OBJECTS)
         env.Default(program)
         env.Depends(program, [ env.File(LibPath(env['LIBSENF'])) ])