Merge OSV make into tex
Merge Makefile and some changes by chen.