More Makefile tweaking