Simplify the top-level SConstruct a bit by transfering responsibility for ensuring the dependency on the configuration files to the SConscript files.

This commit is contained in:
Russel Winder
2009-08-27 16:59:52 +01:00
parent 6ca0f2607a
commit 673b41c3a6
8 changed files with 13 additions and 10 deletions

View File

@@ -32,10 +32,11 @@ e.Append(CPPPATH = ['include', 'include/sys-' + variant + '/arch-' + environment
objects = e.StaticObject(source)
Depends (objects, e['configFiles'])
library = e.StaticLibrary('c-' + variant, objects)
Depends (library, e['configFiles'])
runTime = e.StaticObject('crt/sys-' + variant + '/arch-' + e['ARCH'] + '/crt0.S')
Depends (runTime, e['configFiles'])
result = (
e.StaticLibrary('c-' + variant, objects),
e.StaticObject('crt/sys-' + variant + '/arch-' + e['ARCH'] + '/crt0.S')
)
result = (library, runTime)
Return('result')

View File

@@ -25,5 +25,6 @@ e.Append(CPPPATH = ['include', '#libs/c/include', '#libs/c/include/arch/' + e['A
objects = e.StaticObject(Glob('src/*.c'))
Depends(objects, e['configFiles'])
library = e.StaticLibrary('elf', objects)
Depends(library, e['configFiles'])
Return('library')