Fixing the build system again

SConstruct

@@ -76,16 +76,12 @@ charles_lib = env.SConscript(os.path.join(src_dir.path, 'SConscript'),
                              exports='env',
                              variant_dir=os.path.join('build', src_dir.path),
                              duplicate=0)
-charles = env.Program(os.path.join('build', 'charles'), charles_lib)
 
 # Build test
 test_dir = Dir('#test')
-test_lib = env.SConscript(os.path.join(test_dir.path, 'SConscript'),
-                          exports='env',
-                          variant_dir=os.path.join('build', test_dir.path),
-                          duplicate=0)
-test_charles = env.Program(os.path.join('build', 'test_charles'), [charles_lib, test_lib])
+env.SConscript(os.path.join(test_dir.path, 'SConscript'),
+               exports=['env', 'charles_lib'],
+               variant_dir=os.path.join('build', test_dir.path),
+               duplicate=0)
 
-env.Alias('charles', charles)
-env.Alias('test', test_charles)
-env.Default(charles)
+env.Default('charles')

src/SConscript

@@ -7,7 +7,6 @@ Import('env')
 files = Split("""
     basics.c
     camera.c
-    charles.c
     object.c
     scene.c
     texture.c
@@ -15,4 +14,7 @@ files = Split("""
 """)
 
 lib = env.Library('charles', files)
+prog = env.Program('charles', [lib, 'charles.c'])
+env.Alias('charles', prog)
+
 Return('lib')

test/SConscript

@@ -6,6 +6,7 @@
 # Eryn Wells <eryn@erynwells.me>
 
 Import('env')
+Import('charles_lib')
 
 files = Split("""
     test_basics.c
@@ -14,5 +15,5 @@ files = Split("""
 
 test_env = env.Clone()
 test_env.Append(LIBS=['check'])
-lib = test_env.Library('test_charles', files, libs=['check'])
-Return('lib')
+prog = test_env.Program('test_charles', [charles_lib, files])
+env.Alias('test', prog)