Merge "Make modules depend on their makefile."