Updated Makefiles so that there is no dependancy on ELIBS.