Almost done switching to the Makefile-driven development environment