Update Makefile generation and ensure everything works with Borland 5.5