Makefile improvements
Rebuild