Changing the structure of the Makefile.