Switch to unified view

a/Makefile.am b/Makefile.am