More changes to Makefile.