rewrite the makefile
rewrite the makefile
some slight modifications