Make rock bootstrap again - use additionals instead of ugly .o hack in Makefile