Pull in makefile fixes from @asomers
Pull in makefile fixes from @asomers

shivrai/smoketestsuite,shivrai/smoketestsuite,shivansh/smoketestsuite,shivansh/smoketestsuite,shivrai/smoketestsuite,shivansh/smoketestsuite