Adapt to use makefile...