GNUmakefile more fixes