fixed makefile
inconsistencies with the build system eliminated