(PDB-1034) Makefile run consolidation

Signed-off-by: Ken Barber <ken@bob.sh>