Updated and fixed the build issue with the Makefile.