Restored advertised behaviour of Makefile and fixed target dependencies.