improved, simplified make build rules