Makefile is smarter now