Makefile consolidation