Changes makefile structure