Merge working/Makefile into Makefile.