Updated Makefile to hopefully support C as well as C++