moved all relevant configuration options out of Makefile.configure
cleaned up the make file.