Add Makefile

Unfortunately, due to other changes, it's a bit difficult to test at the moment.  Initial output seems good, though.