vchoi_fork

[svn-r21017] This is a follow-up checkin for r21015 (bug fix for Issue 2598).  I added two minor changes: 1. put the output file for 
vfd.c test in the list for cleanup in Makefile.am; 2. put the data file in the list in CMakeLists.txt.

Tested on jam - simple change.