Sorry for the double post, hit the button too fast. The second one has the syntactically correct Makefile changes.