Combining src/ and bld/ makefiles for tests