fixed Makefile to deal with unified src/