Further makefile cleanup.

New programs will be added automatically.
Also reduced the number of rules significantly.