X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senfscons%2FSENFSCons.py;h=aa5efa2e93b36cebf592429b7047e3554db421ca;hb=41fe0d795abca302db24e7a955df6ef15ffed722;hp=40939cb23a65d8849c0e22cf976bdb4083c52b7b;hpb=a479735a65e334af538b895f182f8efd36a541c5;p=senf.git

diff --git a/senfscons/SENFSCons.py b/senfscons/SENFSCons.py
index 40939cb..aa5efa2 100644
--- a/senfscons/SENFSCons.py
+++ b/senfscons/SENFSCons.py
@@ -150,6 +150,7 @@ def FinalizeBoost(env):
 
     env['BOOSTTESTLIB'] = 'libboost_unit_test_framework' + env['BOOST_VARIANT']
     env['BOOSTREGEXLIB'] = 'libboost_regex' + env['BOOST_VARIANT']
+    env['BOOSTFSLIB'] = 'libboost_filesystem' + env['BOOST_VARIANT']
 
     env.Append(LIBPATH = [ '$BOOST_LIBDIR' ],
                CPPPATH = [ '$BOOST_INCLUDES' ])
@@ -324,14 +325,14 @@ def Objects(env, sources, testSources = None, LIBS = [], OBJECTS = []):
 
     objects = None
     if sources:
-        objects = env.Object([
-            source
-            for source in sources
-            if not str(source).endswith('.o') ]) + [
-            source
-            for source in sources
-            if str(source).endswith('.o') ]
-        
+        obsources = [ source
+                      for source in sources
+                      if not str(source).endswith('.o') ]
+        objects = [ source
+                    for source in sources
+                    if str(source).endswith('.o') ]
+        if obsources:
+            objects += env.Object(obsources)
 
     if testSources:
         test = env.BoostUnitTests(
@@ -350,6 +351,9 @@ def Objects(env, sources, testSources = None, LIBS = [], OBJECTS = []):
     return objects
 
 def InstallIncludeFiles(env, files):
+    # Hrmpf ... why do I need this in 0.97??
+    if env.GetOption('clean'):
+        return
     target = env.Dir(env['INCLUDEINSTALLDIR'])
     base = env.Dir(env['INSTALL_BASE'])
     for f in files:
@@ -500,8 +504,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:],