Reworked Makefile/configure