More work on Makefile structure and plotting routine.