Adapted make system to templates