Correct makefile naming

Change-Id: I121192ac0a89b553b18774d0ff87cbb3481fe22c
Use a jf-like extract-files scheme

Change-Id: If7022277087349a5b28595540f4c8e53297ab169