GLDemo Makefile improved too