Makefile: complet re-write (clean up)
Makefile: post complet Makefile re-write edit