Updated Makefile (real Makefile this time)