ordering cleanup of Makefile.am