rejig Makefile