gnm: GNUMakefile and makefile.vc fixed