minor fixes for clang++

[senf.git] / site_scons / SENFSCons.py

diff --git a/site_scons/SENFSCons.py b/site_scons/SENFSCons.py
index 09e4c4d..fb3d6c9 100644 (file)
--- a/site_scons/SENFSCons.py
+++ b/site_scons/SENFSCons.py
@@ -6,12 +6,14 @@ from SCons.Script import *
 def Glob(env, exclude=[], subdirs=[]):
     testSources = env.Glob("*.test.cc",strings=True)
     sources = [ x
-                for x in env.Glob("*.cc",strings=True)
+                for x in env.Glob("*.cc",strings=True) \
+                    + env.Glob("*.c",strings=True)
                 if x not in testSources and x not in exclude ]
     for subdir in subdirs:
         testSources += env.Glob(os.path.join(subdir,"*.test.cc"),strings=True)
         sources += [ x
-                     for x in env.Glob(os.path.join(subdir,"*.cc"),strings=True)
+                     for x in env.Glob(os.path.join(subdir,"*.cc"),strings=True) \
+                         + env.Glob(os.path.join(subdir,"*.c"),strings=True)
                      if x not in testSources and x not in exclude ]
     includes = []
     for d in [ '' ] + [ x+'/' for x in subdirs ]:
@@ -56,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'):
@@ -148,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)
@@ -164,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)