Add additional specific sub-family parts to the ModuleTest build test as these may have minor header file differences to their standard family cousins.

Clean up of main library Makefile to extract out the library version once into a make variable for easy reference.