Happy with the makefile now