makefile refactoring

Signed-off-by: Vance Miller <vbmiller@cs.unc.edu>