Makefile reworking