update makefile to reflect change from FungType to VWType and FungType2 to FungType
Authored by: thao 2010-06-24
Parent: [r2112]
Child: [r2114]