Updated Makefile with rules