Makefile revision for standardization