More monkeying around with the makefiles, fixed a bug where some targets would get compiled twice