f4e8fe4817
LIBADD instead of appending to the existing one. Also removed some more Makefile.options whitespace, and I think emacs removed some tabs (i.e., replaced them with whitespace). This commit was SVN r7399.