Use new ZD no Makefile style