Reduced Makefile complexity

Reduced Makefile complexity