X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=site_scons%2FSENFSCons.py;h=e64e8449e6d4b807e43ce451a14e3fd5a0438c36;hb=e108afcb12ecd5d9d8fdc35149c8a097e56185dd;hp=01681e4c5c899644dad477bc220d818eda3f6d9e;hpb=0cf6e472479e1ac54c061f80a2f1b3b9bc6a84c8;p=senf.git diff --git a/site_scons/SENFSCons.py b/site_scons/SENFSCons.py index 01681e4..e64e844 100644 --- a/site_scons/SENFSCons.py +++ b/site_scons/SENFSCons.py @@ -5,13 +5,15 @@ 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) + sources = [ x + 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) + sources += [ x + 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 ]: @@ -63,7 +65,7 @@ def Doxygen(env, doxyfile = "Doxyfile", extra_sources = [], output_directory = " tagfile = env.Doxygen(doxyfile, DOXYOPTS = opts + [ '--tagfile' ], **vars(generate_tagfile='${OUTPUT_DIRECTORY}/${MODULE}.tag')) env.Append(ALL_TAGFILES = [ tagfile[0].abspath ]) - env.Depends(tagfile, [ env.File('#/site_scons/lib/doxygen.sh'), + env.Depends(tagfile, [ env.File('#/site_scons/lib/doxygen.sh'), env.File('#/site_scons/lib/tag-munge.xsl') ]) env.Install(env.Dir('$DOCINSTALLDIR').Dir(tagfile[0].dir.get_path(env.Dir('#'))), @@ -100,7 +102,7 @@ def AllIncludesHH(env, exclude=[]): if f.name not in exclude and not f.name.endswith('.test.hh') ] headers.sort(key=lambda x:x.name) target = env.File("all_includes.hh") - allinch = env.CreateFile(target, + allinch = env.CreateFile(target, env.Value("".join([ '#include <%s>\n' % f.srcnode().get_path(env.Dir('#')) for f in headers ]))) env.Default(allinch)