[MRG] Makefile improvements