Updated makefiles to reflect ./configure changes.