Enhance the makefile