Use $(MAKE) in Makefile
Fix weird bug with reuse of internal state