Converting to makefile usage