Update Makefile
Make ByHand consistent with library definitions