Regenerate the targets makefiles

Commit f38111d76ba127b4045e6a9899cbb753457c7384 updated these files
manually (based on older versions of them) to something not generated
by the current mktargets.py/sh, losing the compact pattern rules.