Issue #12: Refine the top Makefile