MSM: Makefile prep