More work on makefile.