further improved dependencies that hopefully address Ubuntu 12.10 needs
reverted $@ improvement as it has proven inconsistent