more work on Makefiles