First recut of Makefile to accommodate multiple master files