moved includes to include
make dist more sensible
Minor dist fix
Removed automake stuff from "inert" subdirs. And there was much rejoicing.
improved automake config. make dist, VPATH builds, ...
This commit was generated by cvs2svn to compensate for changes in r2, which included commits to RCS files with non-trunk default branches.