Merged Makefile-64