more Makefile improvements