more Makefile simplification