Merge pull request #1072 from JoesCat/master

more makefile stuff