Update Makefile.am to take additions into account