More modular Makefile
Drop error handling from yo_read_token()