Fixed dependency problems in Makefile