This commit also removes the Makefile introduced in 80236e6130 as make doesn't seem to like $().
80236e6130