More Makefile fiddling. This is not going well