refactored makefile to use master makefile