Merge zee/Makefile.am into top-level Makefile.am