merged two makefiles into 1