Modify Makefile and rules file