* Makefile update and fix.