more Makefile tweaks