Makefile: subpkg refactor