makefile simplifications