Update rules
Update Makefile