Fix src/Makefile.am after merge