Accidentally added a 2nd _LIBADD in a prior commit. This commit merges them back into a single _LIBADD.