Various Makefile corrections

Corrected various Makefile.am files so that necessary header files
are included when "make dist" is executed. More work is still needed
on the doc and contribs sub-directories.