Added number parameters in config.mak, updated Makefile accordingly