[makefile] minor fixes/cleanup for joystick