More makefile fixes…