Additional refinements to Makefile

WARNING: it mus be tested!