Getting convolution demo working and fixing Makefile.