Merged Makefile