simplify makefiles, more logic in Makefile.inc