refactored Makefile to new style