revised makefiles