remove no-longer-needed Makefile hackery

8 jobs for master in 21 minutes and 20 seconds (queued for 41 seconds)