Improve makefile to avoid need for updates with new sources, dependencies, etc.