Merge "Fix dependency from phony targets to real files to remove need for m or mma"