Adapt to ../Makefile changes.
Adapt to ../Makefile changes.

typetools/annotation-tools,typetools/annotation-tools,eisop/annotation-tools,eisop/annotation-tools,typetools/annotation-tools,eisop/annotation-tools