This is an intermediate step forward removing usage of unsupported options. Most packages didn't build but at least "make clean" now works.
