Reworking of Makefile