Makefile fixes, directory re-org, autoconf fixes
Makefile fixes for depends
This commit was generated by cvs2svn to compensate for changes in r377, which included commits to RCS files with non-trunk default branches.