make makefile less convoluted