Fixing the Makefile somwehat.
Fixed the Makefile so that we build properly.