Continued makefile updates.