more Makefile tweaking