improve the Makefiles