@@ -23,30 +23,31 @@ tskit_lib = static_library('tskit',
2323
2424# We don't specify extra C args here as CUnit won't pass the checks.
2525test_lib = static_library (' testlib' ,
26- sources : [' testlib.c' ], dependencies : cunit_dep)
26+ sources : [' tests/ testlib.c' ], dependencies : cunit_dep)
2727
2828executable (' test_core' ,
29- sources : [' test_core.c' ],
29+ sources : [' tests/ test_core.c' ],
3030 link_with : [tskit_lib, test_lib], c_args : extra_c_args)
3131executable (' test_tables' ,
32- sources : [' test_tables.c' ],
32+ sources : [' tests/ test_tables.c' ],
3333 link_with : [tskit_lib, test_lib], c_args : extra_c_args)
3434executable (' test_trees' ,
35- sources : [' test_trees.c' ],
35+ sources : [' tests/ test_trees.c' ],
3636 link_with : [tskit_lib, test_lib], c_args : extra_c_args)
3737executable (' test_genotypes' ,
38- sources : [' test_genotypes.c' ],
38+ sources : [' tests/ test_genotypes.c' ],
3939 link_with : [tskit_lib, test_lib], c_args : extra_c_args)
4040executable (' test_convert' ,
41- sources : [' test_convert.c' ],
41+ sources : [' tests/ test_convert.c' ],
4242 link_with : [tskit_lib, test_lib], c_args : extra_c_args)
4343executable (' test_stats' ,
44- sources : [' test_stats.c' ],
44+ sources : [' tests/ test_stats.c' ],
4545 link_with : [tskit_lib, test_lib], c_args : extra_c_args)
4646
4747# The development CLI. Don't use extra C args because argtable code won't pass
48- executable (' main' ,
49- sources : [' main.c' , ' argtable3.c' ], link_with : [tskit_lib], c_args :[' -Dlint' ])
48+ executable (' dev-cli' ,
49+ sources : [' dev-tools/dev-cli.c' , ' dev-tools/argtable3.c' ],
50+ link_with : [tskit_lib], c_args :[' -Dlint' ])
5051
5152
5253# Example programs.
@@ -56,6 +57,6 @@ executable('haploid_wright_fisher',
5657 dependencies : [gsl_dep])
5758
5859# TMP: until we've ported all the tests, keep this compilable.
59- #gsl_dep = dependency('gsl')
60- #executable('old_tests', sources: ['old_tests.c'], link_with: tskit_lib,
61- # dependencies: [cunit_dep, gsl_dep])
60+ # gsl_dep = dependency('gsl')
61+ # executable('old_tests', sources: ['tests/ old_tests.c'], link_with: tskit_lib,
62+ # dependencies: [cunit_dep, gsl_dep])
0 commit comments