Further improvements on the Makefile.