Log Message:
Move some things from Makefile.common to both Makefiles, and remove the options
for the gnome-console, wx-console and tray-monitor: they will become separate
packages in the next minute.  Ok with wiz.