Split up Makefile library list handling with separate entries for