contrib: further consolidate Makefile