Revise Makefile structures