Hopefully simpler Makefile..