more Makefile changes