Rework the makefile