X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=site_scons%2FSENFSCons.py;h=e1321513cd13e50b49d7360e50bbc436ba1f68bd;hb=b2e4357d68ec6788b4b336171a9c613d3b2416c7;hp=e64e8449e6d4b807e43ce451a14e3fd5a0438c36;hpb=7661548b20e6c7627f54bff87e0758396fd523ef;p=senf.git diff --git a/site_scons/SENFSCons.py b/site_scons/SENFSCons.py index e64e844..e132151 100644 --- a/site_scons/SENFSCons.py +++ b/site_scons/SENFSCons.py @@ -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)