fix/clean some define and makefile
fix/clean some define and makefile