Updated makefile, now also for figures