Commits


simplify the makefile bit more


rework the makefile