Initial attempt at improving makefile.