Makefile: complet re-write (clean up)