Resource file makefile rule tweaked to obey naming convention
Merge branch 'pure-asm'