further simplification of makefile