Revise makefile structure.