Resolved Makefile