2) Makefile cleanup Submitted by: kuriyama (1)
and input class. PR: 23614 Submitted by: Ying-Chieh Liao <ijliao@csie.nctu.edu.tw>