Updated makefiles and scripts to work with the new command line options.