simplify makefile again