Update Makefile output and separate mysql and base code