Makefille consolidated