Simplify needless makefile complexity -- this is working for me, but apparently it might have issues on some systems?