Fix the stupid makefile bug. Now always links all objects properly.

Conflicts:
	demosrc/Makefile