merged makefiles into one