Makefile modified to match with actual configuration