Moving the subdir makefile into the main one lets us more easily track dependencies for reliable builds. Previously we tended to build against old versions of the static library when running the tests.
