X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=site_scons%2FSENFSCons.py;h=fb3d6c98161a226a03ea4e9a28b84ef5fdcc2c0d;hb=2017d34cab7de03c786310b3a08424a339f4476d;hp=e64e8449e6d4b807e43ce451a14e3fd5a0438c36;hpb=0d88f940c093ff9c34099c9ab5c43e340f60a1f0;p=senf.git

diff --git a/site_scons/SENFSCons.py b/site_scons/SENFSCons.py
index e64e844..fb3d6c9 100644
--- a/site_scons/SENFSCons.py
+++ b/site_scons/SENFSCons.py
@@ -58,7 +58,7 @@ def Doxygen(env, doxyfile = "Doxyfile", extra_sources = [], output_directory = "
                  };
     opts = [ '--tagfile-name', '"${MODULE}.tag"',
              '--output-dir', '$OUTPUT_DIRECTORY' ]
-
+    
     # Rule to generate tagfile
     # (need to exclude the 'clean' case, otherwise we'll have duplicate nodes)
     if not env.GetOption('clean'):
@@ -150,7 +150,6 @@ def AutoRules(env, exclude=[], subdirs=[], doc_extra_sources = []):
     sources, tests, includes = SENFSCons.Glob(env, exclude=((exclude)), subdirs=((subdirs)) )
     subscripts               = sorted(env.Glob("*/SConscript", strings=True))
     doxyfile                 = env.Glob("Doxyfile")
-    objects                  = []
 
     if sources               : env.Append(ALLOBJECTS = env.Object(sources))
     if tests                 : env.BoostUnitTest('test', tests)
@@ -166,10 +165,10 @@ def AutoPacketBundle(env, name, exclude=[], subdirs=[], doc_extra_sources=[]):
     subscripts               = sorted(env.Glob("*/SConscript", strings=True))
     doxyfile                 = env.Glob("Doxyfile")
 
-    objects = env.Object(sources)
-    cobject = env.CombinedObject('${LOCALLIBDIR}/${NAME}${OBJADDSUFFIX}', objects, NAME=((name)))
-    sobundle = env.SharedLibrary('${LOCALLIBDIR}/${NAME}${OBJADDSUFFIX}', sources, NAME=((name)),
-                                 LIBS=[], SHLIBPREFIX='')
+    objects  = env.Object         (sources)
+    cobject  = env.CombinedObject ('${LOCALLIBDIR}/${NAME}${OBJADDSUFFIX}', objects, NAME=((name)))
+    sobundle = env.SharedLibrary  ('${LOCALLIBDIR}/${NAME}${OBJADDSUFFIX}', sources, NAME=((name)),
+                                   LIBS=[], SHLIBPREFIX='')
 
     env.Default(cobject)
     env.Default(sobundle)