Fix the makefile once and for all; lib deps work, `make demos` works.
Make demos compile.  Fix the library dep.