Modified Makefile and source code.