Rectified Makefiles. Should solve compiling problem on Ubuntu.