+ Makefile: Improved in general