fix parser build
clean up Makefile and merge parser targets