PARTIAL: Begin fixing Makefile