fixed Makefile
fixed Makefile2