Adjust Makefiles
Adjust Makefiles