Makefile updated

Simplier rules are better.